From 838100cf265b19f5562e12a57cfefc1746a33837 Mon Sep 17 00:00:00 2001 From: Jesse Pretorius Date: Mon, 22 Oct 2018 16:00:03 +0100 Subject: [PATCH] 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 --- defaults/main.yml | 1 + examples/playbook.yml | 11 +++-------- tests/openstack_openrc-overrides.yml | 3 --- 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 openrc_os_auth_type: password openrc_os_auth_url: "http://127.0.0.1:5000" openrc_region_name: RegionOne +openrc_os_domain_name: Default ## Deliberately allow access to SSL endpoints with bad certificates openrc_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 @@ -- name: Install openrc +- name: Create OpenStack openrc and clouds.yaml file hosts: all user: root roles: - - { role: "openstack-ansible-openstack_openrc", - tags: [ "openstack_openrc" ] - } + - role: "openstack_openrc" vars: - keystone_service_adminuri_insecure: false - keystone_service_internaluri_insecure: false - openrc_os_password: secrete - openrc_os_domain_name: Default + openrc_os_password: secrete 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 @@ # See the License for the specific language governing permissions and # limitations under the License. -keystone_service_adminuri_insecure: False -keystone_service_internaluri_insecure: False openrc_os_password: secrete -openrc_os_domain_name: Default