Browse Source

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
Jesse Pretorius 6 months ago
parent
commit
838100cf26
3 changed files with 4 additions and 11 deletions
  1. 1
    0
      defaults/main.yml
  2. 3
    8
      examples/playbook.yml
  3. 0
    3
      tests/openstack_openrc-overrides.yml

+ 1
- 0
defaults/main.yml View File

@@ -25,6 +25,7 @@ openrc_os_tenant_name: admin
25 25
 openrc_os_auth_type: password
26 26
 openrc_os_auth_url: "http://127.0.0.1:5000"
27 27
 openrc_region_name: RegionOne
28
+openrc_os_domain_name: Default
28 29
 
29 30
 ## Deliberately allow access to SSL endpoints with bad certificates
30 31
 openrc_insecure: >-

+ 3
- 8
examples/playbook.yml View File

@@ -1,12 +1,7 @@
1
-- name: Install openrc
1
+- name: Create OpenStack openrc and clouds.yaml file
2 2
   hosts: all
3 3
   user: root
4 4
   roles:
5
-    - { role: "openstack-ansible-openstack_openrc",
6
-        tags: [ "openstack_openrc" ]
7
-      }
5
+    - role: "openstack_openrc"
8 6
   vars:
9
-  keystone_service_adminuri_insecure: false
10
-  keystone_service_internaluri_insecure: false
11
-  openrc_os_password: secrete
12
-  openrc_os_domain_name: Default
7
+    openrc_os_password: secrete

+ 0
- 3
tests/openstack_openrc-overrides.yml View File

@@ -13,7 +13,4 @@
13 13
 # See the License for the specific language governing permissions and
14 14
 # limitations under the License.
15 15
 
16
-keystone_service_adminuri_insecure: False
17
-keystone_service_internaluri_insecure: False
18 16
 openrc_os_password: secrete
19
-openrc_os_domain_name: Default

Loading…
Cancel
Save