summaryrefslogtreecommitdiffstats
path: root/roles/openshift_aws/defaults
diff options
context:
space:
mode:
authorJoel Diaz <jdiaz@redhat.com>2018-01-04 13:55:23 +0000
committerJoel Diaz <jdiaz@redhat.com>2018-01-22 16:53:38 +0000
commitcd381ae7f8716a1dccce78d08f5776ec94cd31b7 (patch)
treec03a40348dbd954f6d802be0e330539ecf79c421 /roles/openshift_aws/defaults
parentaa1c22ddba413d18b5b1c674a512568d18368eae (diff)
downloadopenshift-cd381ae7f8716a1dccce78d08f5776ec94cd31b7.tar.gz
openshift-cd381ae7f8716a1dccce78d08f5776ec94cd31b7.tar.bz2
openshift-cd381ae7f8716a1dccce78d08f5776ec94cd31b7.tar.xz
openshift-cd381ae7f8716a1dccce78d08f5776ec94cd31b7.zip
un-hardcode default subnet az
allow defining 'default_az' for one of the subnets in the vpc structure, and pull that default_az and set it to openshift_aws_subnet_az. this should allow one less variable to have to be defined/overridded (openshift_aws_subnet_az) when using non-default (us-east-1) regions update provisioning_vars.yml.example to show an example VPC structure
Diffstat (limited to 'roles/openshift_aws/defaults')
-rw-r--r--roles/openshift_aws/defaults/main.yml5
1 files changed, 3 insertions, 2 deletions
diff --git a/roles/openshift_aws/defaults/main.yml b/roles/openshift_aws/defaults/main.yml
index 8c8227b5e..6de603661 100644
--- a/roles/openshift_aws/defaults/main.yml
+++ b/roles/openshift_aws/defaults/main.yml
@@ -274,8 +274,6 @@ openshift_aws_node_security_groups:
openshift_aws_vpc_tags:
Name: "{{ openshift_aws_vpc_name }}"
-openshift_aws_subnet_az: us-east-1c
-
openshift_aws_vpc:
name: "{{ openshift_aws_vpc_name }}"
cidr: 172.31.0.0/16
@@ -283,11 +281,14 @@ openshift_aws_vpc:
us-east-1:
- cidr: 172.31.48.0/20
az: "us-east-1c"
+ default_az: true
- cidr: 172.31.32.0/20
az: "us-east-1e"
- cidr: 172.31.16.0/20
az: "us-east-1a"
+openshift_aws_subnet_az: "{{ openshift_aws_vpc.subnets[openshift_aws_region] | get_default_az }}"
+
openshift_aws_node_run_bootstrap_startup: True
openshift_aws_node_user_data: ''
openshift_aws_node_config_namespace: openshift-node