summaryrefslogtreecommitdiffstats
path: root/playbooks/provisioning/openstack
diff options
context:
space:
mode:
authorTomas Sedovic <tomas@sedovic.cz>2017-07-12 17:30:00 +0200
committerGitHub <noreply@github.com>2017-07-12 17:30:00 +0200
commita3a61ab4544d97dbc76dcd278c0f17d7a17fa022 (patch)
tree4b53d1598c1b27974780fb1a5cf6c01487dd9bdd /playbooks/provisioning/openstack
parent25a2d4f772d735bc31e7a891e16e3d7d7002cd68 (diff)
downloadopenshift-a3a61ab4544d97dbc76dcd278c0f17d7a17fa022.tar.gz
openshift-a3a61ab4544d97dbc76dcd278c0f17d7a17fa022.tar.bz2
openshift-a3a61ab4544d97dbc76dcd278c0f17d7a17fa022.tar.xz
openshift-a3a61ab4544d97dbc76dcd278c0f17d7a17fa022.zip
Add defaults values for some openstack vars (#539)
* Add defaults values for some openstack vars Ansible shows errors when the `rhsm_register` and `openstack_flat_secgrp` values are not present in the inventory even though they have sensible default values. This makes them both default to false when they're not specified. * Comment out the flat security group option in inv It's no longer required to be there so let's comment it out.
Diffstat (limited to 'playbooks/provisioning/openstack')
-rw-r--r--playbooks/provisioning/openstack/post-provision-openstack.yml2
-rw-r--r--playbooks/provisioning/openstack/sample-inventory/group_vars/all.yml4
2 files changed, 3 insertions, 3 deletions
diff --git a/playbooks/provisioning/openstack/post-provision-openstack.yml b/playbooks/provisioning/openstack/post-provision-openstack.yml
index 8d4ba3c12..460c6596b 100644
--- a/playbooks/provisioning/openstack/post-provision-openstack.yml
+++ b/playbooks/provisioning/openstack/post-provision-openstack.yml
@@ -14,7 +14,7 @@
become: true
roles:
- role: subscription-manager
- when: hostvars.localhost.rhsm_register
+ when: hostvars.localhost.rhsm_register|default(False)
tags: 'subscription-manager'
- name: Determine which DNS server(s) to use for our generated records
diff --git a/playbooks/provisioning/openstack/sample-inventory/group_vars/all.yml b/playbooks/provisioning/openstack/sample-inventory/group_vars/all.yml
index 7c9033828..c7e54f6cb 100644
--- a/playbooks/provisioning/openstack/sample-inventory/group_vars/all.yml
+++ b/playbooks/provisioning/openstack/sample-inventory/group_vars/all.yml
@@ -56,5 +56,5 @@ openstack_subnet_prefix: "192.168.99"
# hardcoded to `openshift`.
ansible_user: openshift
-# # Use a single security group for a cluster
-openstack_flat_secgrp: false
+# # Use a single security group for a cluster (default: false)
+#openstack_flat_secgrp: false