summaryrefslogtreecommitdiffstats
path: root/playbooks/provisioning/openstack
diff options
context:
space:
mode:
authorBogdan Dobrelya <bdobreli@redhat.com>2017-08-15 17:48:58 +0200
committerTomas Sedovic <tomas@sedovic.cz>2017-08-15 17:48:58 +0200
commit784443b0d88597b988c3d5c58bc6358f5c73675e (patch)
tree4ddf2a69739c806903fd6338701a2d4897621696 /playbooks/provisioning/openstack
parent1ed641f99d1e03827120d8e18f504a03002dc910 (diff)
downloadopenshift-784443b0d88597b988c3d5c58bc6358f5c73675e.tar.gz
openshift-784443b0d88597b988c3d5c58bc6358f5c73675e.tar.bz2
openshift-784443b0d88597b988c3d5c58bc6358f5c73675e.tar.xz
openshift-784443b0d88597b988c3d5c58bc6358f5c73675e.zip
Support multiple private networks for static inventory (#604)
Add openstack_private_network_name to filter by a wanted private network. Signed-off-by: Bogdan Dobrelya <bdobreli@redhat.com>
Diffstat (limited to 'playbooks/provisioning/openstack')
-rw-r--r--playbooks/provisioning/openstack/README.md4
-rw-r--r--playbooks/provisioning/openstack/sample-inventory/group_vars/all.yml1
-rw-r--r--playbooks/provisioning/openstack/stack_params.yaml1
3 files changed, 6 insertions, 0 deletions
diff --git a/playbooks/provisioning/openstack/README.md b/playbooks/provisioning/openstack/README.md
index c7b2ea975..98c847d88 100644
--- a/playbooks/provisioning/openstack/README.md
+++ b/playbooks/provisioning/openstack/README.md
@@ -110,6 +110,10 @@ providing external connectivity. It is often called `public`,
`external` or `ext-net`. You can see your networks with `openstack
network list`.
+`openstack_private_network_name` is the name of the private Neutron network
+providing admin/control access for ansible. It can be merged with other
+cluster networks, there are no special requirements for networking.
+
The `openstack_num_masters`, `openstack_num_infra` and
`openstack_num_nodes` values specify the number of Master, Infra and
App nodes to create.
diff --git a/playbooks/provisioning/openstack/sample-inventory/group_vars/all.yml b/playbooks/provisioning/openstack/sample-inventory/group_vars/all.yml
index 8f337546c..210caee16 100644
--- a/playbooks/provisioning/openstack/sample-inventory/group_vars/all.yml
+++ b/playbooks/provisioning/openstack/sample-inventory/group_vars/all.yml
@@ -7,6 +7,7 @@ openstack_ssh_public_key: "openshift"
openstack_default_image_name: "centos7"
openstack_default_flavor: "m1.medium"
openstack_external_network_name: "public"
+#openstack_private_network_name: "openshift-ansible-{{ stack_name }}-net"
openstack_num_masters: 1
openstack_num_infra: 1
diff --git a/playbooks/provisioning/openstack/stack_params.yaml b/playbooks/provisioning/openstack/stack_params.yaml
index c3a42ab06..e8434861b 100644
--- a/playbooks/provisioning/openstack/stack_params.yaml
+++ b/playbooks/provisioning/openstack/stack_params.yaml
@@ -5,6 +5,7 @@ dns_nameservers: "{{ public_dns_nameservers }}"
subnet_prefix: "{{ openstack_subnet_prefix }}"
ssh_public_key: "{{ openstack_ssh_public_key }}"
openstack_image: "{{ openstack_default_image_name }}"
+openstack_private_network: "{{ openstack_private_network_name | default ('openshift-ansible-' + stack_name + '-net') }}"
lb_flavor: "{{ openstack_default_flavor | default('m1.small') }}"
etcd_flavor: "{{ openstack_default_flavor | default('m1.small') }}"
master_flavor: "{{ openstack_default_flavor | default('m1.medium') }}"