upgrade to terraform 0.13
Signed-off-by: Jakub Sokołowski <jakub@status.im>
This commit is contained in:
parent
3705157812
commit
9ebfd5d205
16
Makefile
16
Makefile
|
@ -10,20 +10,15 @@ endif
|
|||
|
||||
PLUGIN_DIR = ~/.terraform.d/plugins
|
||||
|
||||
PROVIDER_NAME = terraform-provider-ansible
|
||||
PROVIDER_VERSION = v1.0.3
|
||||
PROVIDER_ARCHIVE = $(PROVIDER_NAME)-$(ARCH).zip
|
||||
PROVIDER_URL = https://github.com/nbering/terraform-provider-ansible/releases/download/$(PROVIDER_VERSION)/$(PROVIDER_ARCHIVE)
|
||||
|
||||
PROVISIONER_NAME = terraform-provisioner-ansible
|
||||
PROVISIONER_VERSION = v2.3.0
|
||||
PROVISIONER_ARCHIVE = $(PROVISIONER_NAME)-$(subst _,-,$(ARCH))_$(PROVISIONER_VERSION)
|
||||
PROVISIONER_URL = https://github.com/radekg/terraform-provisioner-ansible/releases/download/$(PROVISIONER_VERSION)/$(PROVISIONER_ARCHIVE)
|
||||
|
||||
all: requirements install-provider install-provisioner secrets init-terraform
|
||||
all: requirements install-provisioner secrets init-terraform
|
||||
@echo "Success!"
|
||||
|
||||
plugins: install-provider install-provisioner
|
||||
plugins: install-provisioner
|
||||
|
||||
requirements:
|
||||
ansible-galaxy install --ignore-errors --force -r ansible/requirements.yml
|
||||
|
@ -33,13 +28,6 @@ ifeq (, $(shell which unzip))
|
|||
$(error "No unzip in PATH, consider doing apt install unzip")
|
||||
endif
|
||||
|
||||
install-provider: check-unzip
|
||||
if [ ! -e $(PLUGIN_DIR)/$(ARCH)/$(PROVIDER_NAME)_$(PROVIDER_VERSION) ]; then \
|
||||
mkdir -p $(PLUGIN_DIR); \
|
||||
wget $(PROVIDER_URL) -P $(PLUGIN_DIR); \
|
||||
unzip -o $(PLUGIN_DIR)/$(PROVIDER_ARCHIVE) -d $(PLUGIN_DIR); \
|
||||
fi
|
||||
|
||||
install-provisioner:
|
||||
if [ ! -e $(PLUGIN_DIR)/$(ARCH)/$(PROVISIONER_NAME)_$(PROVISIONER_VERSION) ]; then \
|
||||
mkdir -p $(PLUGIN_DIR); \
|
||||
|
|
12
versions.tf
12
versions.tf
|
@ -1,7 +1,13 @@
|
|||
terraform {
|
||||
required_version = ">= 0.12"
|
||||
required_version = ">= 0.13"
|
||||
required_providers {
|
||||
cloudflare = " = 2.3.0"
|
||||
aws = " = 2.46.0"
|
||||
cloudflare = {
|
||||
source = "cloudflare/cloudflare"
|
||||
version = " = 2.10.1"
|
||||
}
|
||||
aws = {
|
||||
source = "hashicorp/aws"
|
||||
version = " = 2.46.0"
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue