summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJesse Pretorius <jesse.pretorius@rackspace.co.uk>2018-10-22 16:00:03 +0100
committerJesse Pretorius <jesse.pretorius@rackspace.co.uk>2018-10-22 16:00:03 +0100
commit838100cf265b19f5562e12a57cfefc1746a33837 (patch)
treede97482e70c64a8b7932ef659eb1c1b26b3a5ef4
parente64a1e035b39b7677d9c757547273cc7df04fc15 (diff)
Add default for openrc_os_domain_name and update example
There is currently no default value for openrc_os_domain_name, so we add one, and we update the example to remove the unnecessary overrides. Change-Id: Ic18b07d9347260faf828a55112f0b38e86e617f5
Notes
Notes (review): Code-Review+2: Mohammed Naser <mnaser@vexxhost.com> Code-Review+2: Amy Marrich (spotz) <amy@demarco.com> Workflow+1: Amy Marrich (spotz) <amy@demarco.com> Verified+2: Zuul Submitted-by: Zuul Submitted-at: Tue, 23 Oct 2018 17:24:28 +0000 Reviewed-on: https://review.openstack.org/612416 Project: openstack/openstack-ansible-openstack_openrc Branch: refs/heads/master
-rw-r--r--defaults/main.yml1
-rw-r--r--examples/playbook.yml11
-rw-r--r--tests/openstack_openrc-overrides.yml3
3 files changed, 4 insertions, 11 deletions
diff --git a/defaults/main.yml b/defaults/main.yml
index f4b8b85..7480e68 100644
--- a/defaults/main.yml
+++ b/defaults/main.yml
@@ -25,6 +25,7 @@ openrc_os_tenant_name: admin
25openrc_os_auth_type: password 25openrc_os_auth_type: password
26openrc_os_auth_url: "http://127.0.0.1:5000" 26openrc_os_auth_url: "http://127.0.0.1:5000"
27openrc_region_name: RegionOne 27openrc_region_name: RegionOne
28openrc_os_domain_name: Default
28 29
29## Deliberately allow access to SSL endpoints with bad certificates 30## Deliberately allow access to SSL endpoints with bad certificates
30openrc_insecure: >- 31openrc_insecure: >-
diff --git a/examples/playbook.yml b/examples/playbook.yml
index 573d38a..40ccbb5 100644
--- a/examples/playbook.yml
+++ b/examples/playbook.yml
@@ -1,12 +1,7 @@
1- name: Install openrc 1- name: Create OpenStack openrc and clouds.yaml file
2 hosts: all 2 hosts: all
3 user: root 3 user: root
4 roles: 4 roles:
5 - { role: "openstack-ansible-openstack_openrc", 5 - role: "openstack_openrc"
6 tags: [ "openstack_openrc" ]
7 }
8 vars: 6 vars:
9 keystone_service_adminuri_insecure: false 7 openrc_os_password: secrete
10 keystone_service_internaluri_insecure: false
11 openrc_os_password: secrete
12 openrc_os_domain_name: Default
diff --git a/tests/openstack_openrc-overrides.yml b/tests/openstack_openrc-overrides.yml
index ccfa1b0..f8339b5 100644
--- a/tests/openstack_openrc-overrides.yml
+++ b/tests/openstack_openrc-overrides.yml
@@ -13,7 +13,4 @@
13# See the License for the specific language governing permissions and 13# See the License for the specific language governing permissions and
14# limitations under the License. 14# limitations under the License.
15 15
16keystone_service_adminuri_insecure: False
17keystone_service_internaluri_insecure: False
18openrc_os_password: secrete 16openrc_os_password: secrete
19openrc_os_domain_name: Default