diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2018-01-24 10:41:14 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-01-24 10:41:14 -0800 |
| commit | 54ee60a3e9d162aedd28af7396975dc7fbaef662 (patch) | |
| tree | 561be2d23f3ee9f74031ad05b4f26dca82244bc0 /roles | |
| parent | 9a2bf772cc5a54bb3461ee1947f2885c69e95239 (diff) | |
| parent | cd381ae7f8716a1dccce78d08f5776ec94cd31b7 (diff) | |
| download | openshift-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 'roles')
| -rw-r--r-- | roles/lib_utils/filter_plugins/openshift_aws_filters.py | 16 | ||||
| -rw-r--r-- | roles/openshift_aws/defaults/main.yml | 5 |
2 files changed, 19 insertions, 2 deletions
diff --git a/roles/lib_utils/filter_plugins/openshift_aws_filters.py b/roles/lib_utils/filter_plugins/openshift_aws_filters.py index dfcb11da3..f16048056 100644 --- a/roles/lib_utils/filter_plugins/openshift_aws_filters.py +++ b/roles/lib_utils/filter_plugins/openshift_aws_filters.py @@ -67,8 +67,24 @@ class FilterModule(object): return tags + @staticmethod + def get_default_az(subnets): + ''' From a list of subnets/AZs in a specific region (from the VPC + structure), return the AZ that has the key/value + 'default_az=True.' ''' + + for subnet in subnets: + if subnet.get('default_az'): + return subnet['az'] + + # if there was none marked with default_az=True, just return the first + # one. (this does mean we could possible return an item that has + # default_az=False set + return subnets[0]['az'] + def filters(self): ''' returns a mapping of filters to methods ''' return {'build_instance_tags': self.build_instance_tags, + 'get_default_az': self.get_default_az, 'scale_groups_match_capacity': self.scale_groups_match_capacity, 'scale_groups_serial': self.scale_groups_serial} diff --git a/roles/openshift_aws/defaults/main.yml b/roles/openshift_aws/defaults/main.yml index 5053823b0..e14d57702 100644 --- a/roles/openshift_aws/defaults/main.yml +++ b/roles/openshift_aws/defaults/main.yml @@ -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 |