Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Updated Openstack to terraform 0.12 (#5062)
* update openstack to terraform 0.12(.5) * replace cluter.tf with cluster.tfvars * update README.md to terraform 0.12 * update Openstack CI tests to use terraform 0.12 * specify terraform version in openstack README * gitlab CI to copy cluster.tfvars in case of openstack provider * The terraform/openstack dynamic inventory can read tfstate v4 (generated by terraform 0.12) and convert them internally ro v3 (as generated by terraform 0.11.x). Additionally the script has been updated to Python 3.
- Loading branch information
1 parent
554857d
commit da015e0
Showing
10 changed files
with
83 additions
and
37 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,4 +1,5 @@ | ||
.terraform | ||
*.tfvars | ||
!sample-inventory\/cluster.tfvars | ||
*.tfstate | ||
*.tfstate.backup |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,5 +1,5 @@ | ||
resource "null_resource" "dummy_dependency" { | ||
triggers { | ||
triggers = { | ||
dependency_id = "${var.router_id}" | ||
} | ||
} | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,15 +1,15 @@ | ||
output "k8s_master_fips" { | ||
value = ["${openstack_networking_floatingip_v2.k8s_master.*.address}"] | ||
value = "${openstack_networking_floatingip_v2.k8s_master[*].address}" | ||
} | ||
|
||
output "k8s_master_no_etcd_fips" { | ||
value = ["${openstack_networking_floatingip_v2.k8s_master_no_etcd.*.address}"] | ||
value = "${openstack_networking_floatingip_v2.k8s_master_no_etcd[*].address}" | ||
} | ||
|
||
output "k8s_node_fips" { | ||
value = ["${openstack_networking_floatingip_v2.k8s_node.*.address}"] | ||
value = "${openstack_networking_floatingip_v2.k8s_node[*].address}" | ||
} | ||
|
||
output "bastion_fips" { | ||
value = ["${openstack_networking_floatingip_v2.bastion.*.address}"] | ||
value = "${openstack_networking_floatingip_v2.bastion[*].address}" | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
File renamed without changes.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters