summaryrefslogtreecommitdiffstats
path: root/playbooks/aws
diff options
context:
space:
mode:
authorOpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com>2018-01-24 10:41:14 -0800
committerGitHub <noreply@github.com>2018-01-24 10:41:14 -0800
commit54ee60a3e9d162aedd28af7396975dc7fbaef662 (patch)
tree561be2d23f3ee9f74031ad05b4f26dca82244bc0 /playbooks/aws
parent9a2bf772cc5a54bb3461ee1947f2885c69e95239 (diff)
parentcd381ae7f8716a1dccce78d08f5776ec94cd31b7 (diff)
downloadopenshift-54ee60a3e9d162aedd28af7396975dc7fbaef662.tar.gz
openshift-54ee60a3e9d162aedd28af7396975dc7fbaef662.tar.bz2
openshift-54ee60a3e9d162aedd28af7396975dc7fbaef662.tar.xz
openshift-54ee60a3e9d162aedd28af7396975dc7fbaef662.zip
Merge pull request #6603 from joelddiaz/fetch_subnet_az
Automatic merge from submit-queue. 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 be defined/overridded when using non-default (us-east-1) regions
Diffstat (limited to 'playbooks/aws')
-rw-r--r--playbooks/aws/provisioning_vars.yml.example18
1 files changed, 17 insertions, 1 deletions
diff --git a/playbooks/aws/provisioning_vars.yml.example b/playbooks/aws/provisioning_vars.yml.example
index f6b1a6b5d..a1a8a5b08 100644
--- a/playbooks/aws/provisioning_vars.yml.example
+++ b/playbooks/aws/provisioning_vars.yml.example
@@ -41,11 +41,27 @@ openshift_pkg_version: # -3.7.0
# a vpc, set this to false.
#openshift_aws_create_vpc: true
+# when openshift_aws_create_vpc is true (the default), the VPC defined in
+# openshift_aws_vpc will be created
+#openshift_aws_vpc:
+# name: "{{ openshift_aws_vpc_name }}"
+# cidr: 172.31.0.0/16
+# subnets:
+# 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"
+
# Name of the vpc. Needs to be set if using a pre-existing vpc.
#openshift_aws_vpc_name: "{{ openshift_aws_clusterid }}"
# Name of the subnet in the vpc to use. Needs to be set if using a pre-existing
-# vpc + subnet.
+# vpc + subnet. Otherwise will use the subnet with 'default_az' set (see above
+# example VPC structure)
#openshift_aws_subnet_az:
# -------------- #