summaryrefslogtreecommitdiffstats
path: root/playbooks
diff options
context:
space:
mode:
authorOpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com>2018-02-12 06:24:30 -0800
committerGitHub <noreply@github.com>2018-02-12 06:24:30 -0800
commitb7cc4a8414f7aa51fab0898ec23cefa7717b62b2 (patch)
tree86b3859111f75b2f9e0bfde41613e2d8671fa0e2 /playbooks
parentf18cfa7897d771cb973b9aa28a90bc3575b56f58 (diff)
parent447ce80b3960eebff3a8a19d157487d7649929fc (diff)
downloadopenshift-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 'playbooks')
-rw-r--r--playbooks/openstack/sample-inventory/group_vars/all.yml7
1 files changed, 6 insertions, 1 deletions
diff --git a/playbooks/openstack/sample-inventory/group_vars/all.yml b/playbooks/openstack/sample-inventory/group_vars/all.yml
index d63229120..101ac52ad 100644
--- a/playbooks/openstack/sample-inventory/group_vars/all.yml
+++ b/playbooks/openstack/sample-inventory/group_vars/all.yml
@@ -85,7 +85,12 @@ openshift_openstack_docker_volume_size: "15"
## WARNING: This will delete any data on the volume!
#openshift_openstack_prepare_and_format_registry_volume: False
-openshift_openstack_subnet_prefix: "192.168.99"
+# The Classless Inter-Domain Routing (CIDR) for the OpenStack VM subnet.
+openshift_openstack_subnet_cidr: "192.168.99.0/24"
+# The starting IP address for the OpenStack subnet allocation pool.
+openshift_openstack_pool_start: "192.168.99.3"
+# The ending IP address for the OpenStack subnet allocation pool.
+openshift_openstack_pool_end: "192.168.99.254"
## Red Hat subscription:
#rhsub_user: '<username>'