aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBartek Grzybowski <b.grzybowski@partner.samsung.com>2020-09-04 13:39:56 +0200
committerBartek Grzybowski <b.grzybowski@partner.samsung.com>2020-09-10 06:39:47 +0000
commit8e49e9261a4aa68670937f88d44b26a129ec2b4f (patch)
treef86efbd71564a134c747cce0bea0a286426e2b38
parent58e7339a10e4f69792d30ddfc69624fe66a9fa09 (diff)
Upgrade Terraform modules to v0.13
Allows seamless installation of 'rke' provider which in other case has to be pulled in manually. Change-Id: Ic3af33a481666bd22ec1af2913fbe38061750fad Issue-ID: INT-1713 Signed-off-by: Bartek Grzybowski <b.grzybowski@partner.samsung.com>
-rw-r--r--README.md7
-rw-r--r--openlab/modules/kubernetes/kubernetes/versions.tf14
-rw-r--r--openlab/modules/kubernetes/rancher/versions.tf17
-rw-r--r--openlab/modules/openstack/compute/versions.tf8
-rw-r--r--openlab/modules/openstack/keypair/versions.tf8
-rw-r--r--openlab/modules/openstack/network/versions.tf8
-rw-r--r--openlab/modules/openstack/securitygroup/versions.tf8
7 files changed, 65 insertions, 5 deletions
diff --git a/README.md b/README.md
index f3ba03b..5a23f82 100644
--- a/README.md
+++ b/README.md
@@ -51,11 +51,8 @@ Please, refer to the following [link](https://docs.openstack.org/ocata/user-guid
#### Building all modules for an environment
Move to an environmental level folder, e.g stage.
Then run `terragrunt apply-all` followed by `terraform init`
-If you run the command above for the first time and your version of Terraform is <= 0.13-beta, You may end up the error below
-`Provider "rke" not available for installation.`
-You have to manually download the `rke` provider and copy it under a Terraform's cached plug-in directory.
-After copying the rke provider, move to the `rancher` directory and run `terragrunt init`.
-Please, refer to the following [link](https://github.com/rancher/terraform-provider-rke#installing-the-provider) for details.
+
+Terraform version 0.13 is required.
https://github.com/gruntwork-io/terragrunt-infrastructure-live-example#deploying-all-modules-in-a-region
diff --git a/openlab/modules/kubernetes/kubernetes/versions.tf b/openlab/modules/kubernetes/kubernetes/versions.tf
new file mode 100644
index 0000000..8213053
--- /dev/null
+++ b/openlab/modules/kubernetes/kubernetes/versions.tf
@@ -0,0 +1,14 @@
+terraform {
+ required_providers {
+ helm = {
+ source = "hashicorp/helm"
+ }
+ kubernetes = {
+ source = "hashicorp/kubernetes"
+ }
+ openstack = {
+ source = "terraform-providers/openstack"
+ }
+ }
+ required_version = ">= 0.13"
+}
diff --git a/openlab/modules/kubernetes/rancher/versions.tf b/openlab/modules/kubernetes/rancher/versions.tf
new file mode 100644
index 0000000..6ea1b36
--- /dev/null
+++ b/openlab/modules/kubernetes/rancher/versions.tf
@@ -0,0 +1,17 @@
+terraform {
+ required_providers {
+ local = {
+ source = "hashicorp/local"
+ }
+ null = {
+ source = "hashicorp/null"
+ }
+ rke = {
+ source = "registry.terraform.io/rancher/rke"
+ }
+ openstack = {
+ source = "terraform-providers/openstack"
+ }
+ }
+ required_version = ">= 0.13"
+}
diff --git a/openlab/modules/openstack/compute/versions.tf b/openlab/modules/openstack/compute/versions.tf
new file mode 100644
index 0000000..5af3d60
--- /dev/null
+++ b/openlab/modules/openstack/compute/versions.tf
@@ -0,0 +1,8 @@
+terraform {
+ required_providers {
+ openstack = {
+ source = "terraform-providers/openstack"
+ }
+ }
+ required_version = ">= 0.13"
+}
diff --git a/openlab/modules/openstack/keypair/versions.tf b/openlab/modules/openstack/keypair/versions.tf
new file mode 100644
index 0000000..5af3d60
--- /dev/null
+++ b/openlab/modules/openstack/keypair/versions.tf
@@ -0,0 +1,8 @@
+terraform {
+ required_providers {
+ openstack = {
+ source = "terraform-providers/openstack"
+ }
+ }
+ required_version = ">= 0.13"
+}
diff --git a/openlab/modules/openstack/network/versions.tf b/openlab/modules/openstack/network/versions.tf
new file mode 100644
index 0000000..5af3d60
--- /dev/null
+++ b/openlab/modules/openstack/network/versions.tf
@@ -0,0 +1,8 @@
+terraform {
+ required_providers {
+ openstack = {
+ source = "terraform-providers/openstack"
+ }
+ }
+ required_version = ">= 0.13"
+}
diff --git a/openlab/modules/openstack/securitygroup/versions.tf b/openlab/modules/openstack/securitygroup/versions.tf
new file mode 100644
index 0000000..5af3d60
--- /dev/null
+++ b/openlab/modules/openstack/securitygroup/versions.tf
@@ -0,0 +1,8 @@
+terraform {
+ required_providers {
+ openstack = {
+ source = "terraform-providers/openstack"
+ }
+ }
+ required_version = ">= 0.13"
+}