diff options
| author | Dan Yocum <dyocum@redhat.com> | 2018-01-24 17:15:26 -0500 |
|---|---|---|
| committer | Dan Yocum <dyocum@redhat.com> | 2018-01-24 17:15:26 -0500 |
| commit | 8cbd53ed64f1819b8f4defbf196140a1692c5a42 (patch) | |
| tree | 7dd61610e8ea6ae373e12dbb1c894047b8feac0f /roles/openshift_aws/defaults | |
| parent | c2de775c80b8daa629af514f24118f704c521c18 (diff) | |
| parent | 0b57e113dbf16b5ac6f01859c9c4ab2aee594f87 (diff) | |
| download | openshift-8cbd53ed64f1819b8f4defbf196140a1692c5a42.tar.gz openshift-8cbd53ed64f1819b8f4defbf196140a1692c5a42.tar.bz2 openshift-8cbd53ed64f1819b8f4defbf196140a1692c5a42.tar.xz openshift-8cbd53ed64f1819b8f4defbf196140a1692c5a42.zip | |
Merge branch 'master' into rm_origin-components
Diffstat (limited to 'roles/openshift_aws/defaults')
| -rw-r--r-- | roles/openshift_aws/defaults/main.yml | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/roles/openshift_aws/defaults/main.yml b/roles/openshift_aws/defaults/main.yml index a729e8dbd..e14d57702 100644 --- a/roles/openshift_aws/defaults/main.yml +++ b/roles/openshift_aws/defaults/main.yml @@ -59,7 +59,7 @@ openshift_aws_elb_name_dict: external: "{{ openshift_aws_elb_basename }}-infra" openshift_aws_elb_idle_timout: 400 -openshift_aws_elb_scheme: internet-facing + openshift_aws_elb_cert_arn: '' openshift_aws_elb_dict: @@ -282,8 +282,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 @@ -291,11 +289,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 |