Merge "Use auth vars for admin user"

ansible/roles/cinder/tasks/check.yml

@@ -4,7 +4,7 @@
     -m kolla_sanity
     -a "service=cinder
         project=service
-        user=admin
+        user={{ openstack_auth.username }}
         password={{ cinder_keystone_password }}
         role=admin
         region_name={{ openstack_region_name }}

ansible/roles/murano/tasks/start.yml

@@ -38,9 +38,9 @@
 
 - name: Checking if Murano core library package exists
   command: "docker exec murano_api murano \
-                --os-username admin \
+                --os-username {{ openstack_auth.username }} \
                 --os-password {{ keystone_admin_password }} \
-                --os-project-name admin \
+                --os-project-name {{ openstack_auth.project_name }} \
                 --os-auth-url \
                     {{ admin_protocol }}://{{ kolla_internal_fqdn }}:{{ keystone_admin_port }}/v3 \
                 --murano-url \
@@ -53,9 +53,9 @@
 
 - name: Importing Murano core library package
   command: "docker exec murano_api murano \
-                --os-username admin \
+                --os-username {{ openstack_auth.username }} \
                 --os-password {{ keystone_admin_password }} \
-                --os-project-name admin \
+                --os-project-name {{ openstack_auth.project_name }} \
                 --os-auth-url \
                     {{ admin_protocol }}://{{ kolla_internal_fqdn }}:{{ keystone_admin_port }}/v3 \
                 --murano-url \

ansible/roles/nova/tasks/simple_cell_setup.yml

@@ -32,11 +32,11 @@
     --os-interface internal
     --os-auth-url {{ keystone_admin_url }}
     --os-identity-api-version 3
-    --os-project-domain-name default
-    --os-tenant-name admin
-    --os-username admin
+    --os-project-domain-name {{ openstack_auth.domain_name }}
+    --os-tenant-name {{ openstack_auth.project_name }}
+    --os-username {{ openstack_auth.username }}
     --os-password {{ keystone_admin_password }}
-    --os-user-domain-name default
+    --os-user-domain-name {{ openstack_auth.domain_name }}
     compute service list -f json --service nova-compute
   register: nova_compute_services
   changed_when: false

ansible/roles/octavia/templates/octavia.conf.j2

@@ -26,10 +26,10 @@ max_retries = -1
 [service_auth]
 auth_url = {{ internal_protocol }}://{{ kolla_internal_fqdn }}:{{ keystone_admin_port }}
 auth_type = password
-username = admin
+username = {{ openstack_auth.username }}
 password = {{ keystone_admin_password }}
 user_domain_name = Default
-project_name = admin
+project_name = {{ openstack_auth.project_name }}
 project_domain_name = Default
 
 memcache_security_strategy = ENCRYPT

ansible/roles/swift/tasks/check.yml

@@ -4,7 +4,7 @@
     -m kolla_sanity
     -a "service=swift
         project=service
-        user=admin
+        user={{ openstack_auth.username }}
         password={{ swift_keystone_password }}
         role=admin
         region_name={{ openstack_region_name }}

ansible/roles/tempest/templates/tempest.conf.j2

@@ -5,10 +5,10 @@ use_stderr = False
 log_dir = /var/log/kolla/tempest/
 
 [auth]
-admin_username = admin
+admin_username = {{ openstack_auth.username }}
 admin_password = {{ keystone_admin_password }}
-admin_project_name = admin
-admin_domain_name = default
+admin_project_name = {{ openstack_auth.project_name }}
+admin_domain_name = {{ openstack_auth.domain_name }}
 
 
 [dashboard]