diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2018-02-12 06:24:30 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-02-12 06:24:30 -0800 |
| commit | b7cc4a8414f7aa51fab0898ec23cefa7717b62b2 (patch) | |
| tree | 86b3859111f75b2f9e0bfde41613e2d8671fa0e2 /roles | |
| parent | f18cfa7897d771cb973b9aa28a90bc3575b56f58 (diff) | |
| parent | 447ce80b3960eebff3a8a19d157487d7649929fc (diff) | |
| download | openshift-b7cc4a8414f7aa51fab0898ec23cefa7717b62b2.tar.gz openshift-b7cc4a8414f7aa51fab0898ec23cefa7717b62b2.tar.bz2 openshift-b7cc4a8414f7aa51fab0898ec23cefa7717b62b2.tar.xz openshift-b7cc4a8414f7aa51fab0898ec23cefa7717b62b2.zip | |
Merge pull request #7001 from mbruzek/cidr_pool_start_end
Automatic merge from submit-queue.
Removing prefix, replacing with cidr, pool_start and pool_end vars
The heat template was hardcoded with a /24 cidr and that limited customers to 251 ip addresses in the OpenStack subnet. This allows the user to configure the cidr and the allocation pool start and end.
Addresses issue #6829 that I created last week.
@tomassedovic please take a look
Diffstat (limited to 'roles')
| -rw-r--r-- | roles/openshift_openstack/defaults/main.yml | 4 | ||||
| -rw-r--r-- | roles/openshift_openstack/templates/heat_stack.yaml.j2 | 22 |
2 files changed, 8 insertions, 18 deletions
diff --git a/roles/openshift_openstack/defaults/main.yml b/roles/openshift_openstack/defaults/main.yml index 2bdb81632..75bed96f0 100644 --- a/roles/openshift_openstack/defaults/main.yml +++ b/roles/openshift_openstack/defaults/main.yml @@ -55,7 +55,9 @@ openshift_openstack_app_subdomain: "apps" # heat vars openshift_openstack_clusterid: openshift openshift_openstack_stack_name: "{{ openshift_openstack_clusterid }}.{{ openshift_openstack_public_dns_domain }}" -openshift_openstack_subnet_prefix: "192.168.99" +openshift_openstack_subnet_cidr: "192.168.99.0/24" +openshift_openstack_pool_start: "192.168.99.3" +openshift_openstack_pool_end: "192.168.99.254" openshift_openstack_master_hostname: master openshift_openstack_infra_hostname: infra-node openshift_openstack_cns_hostname: cns diff --git a/roles/openshift_openstack/templates/heat_stack.yaml.j2 b/roles/openshift_openstack/templates/heat_stack.yaml.j2 index 1d3173022..b62cb2bc8 100644 --- a/roles/openshift_openstack/templates/heat_stack.yaml.j2 +++ b/roles/openshift_openstack/templates/heat_stack.yaml.j2 @@ -78,22 +78,10 @@ resources: params: cluster_id: {{ openshift_openstack_stack_name }} network: { get_resource: net } - cidr: - str_replace: - template: subnet_24_prefix.0/24 - params: - subnet_24_prefix: {{ openshift_openstack_subnet_prefix }} + cidr: {{ openshift_openstack_subnet_cidr }} allocation_pools: - - start: - str_replace: - template: subnet_24_prefix.3 - params: - subnet_24_prefix: {{ openshift_openstack_subnet_prefix }} - end: - str_replace: - template: subnet_24_prefix.254 - params: - subnet_24_prefix: {{ openshift_openstack_subnet_prefix }} + - start: {{ openshift_openstack_pool_start }} + end: {{ openshift_openstack_pool_end }} dns_nameservers: {% for nameserver in openshift_openstack_dns_nameservers %} - {{ nameserver }} @@ -261,7 +249,7 @@ resources: protocol: tcp port_range_min: 30000 port_range_max: 32767 - remote_ip_prefix: "{{ openshift_openstack_subnet_prefix }}.0/24" + remote_ip_prefix: "{{ openshift_openstack_subnet_cidr }}" {% else %} master-secgrp: type: OS::Neutron::SecurityGroup @@ -393,7 +381,7 @@ resources: protocol: tcp port_range_min: 30000 port_range_max: 32767 - remote_ip_prefix: "{{ openshift_openstack_subnet_prefix }}.0/24" + remote_ip_prefix: "{{ openshift_openstack_subnet_cidr }}" {% endif %} infra-secgrp: |