diff --git a/ansible/roles/cinder/tasks/check.yml b/ansible/roles/cinder/tasks/check.yml index be12310760..c4f9065508 100644 --- a/ansible/roles/cinder/tasks/check.yml +++ b/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 }} diff --git a/ansible/roles/murano/tasks/start.yml b/ansible/roles/murano/tasks/start.yml index e3dc5a5a1b..cd798cac13 100644 --- a/ansible/roles/murano/tasks/start.yml +++ b/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 \ diff --git a/ansible/roles/nova/tasks/simple_cell_setup.yml b/ansible/roles/nova/tasks/simple_cell_setup.yml index 115cf0295f..9403dc2b87 100644 --- a/ansible/roles/nova/tasks/simple_cell_setup.yml +++ b/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 diff --git a/ansible/roles/octavia/templates/octavia.conf.j2 b/ansible/roles/octavia/templates/octavia.conf.j2 index b44c5221be..9f937f2638 100644 --- a/ansible/roles/octavia/templates/octavia.conf.j2 +++ b/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 diff --git a/ansible/roles/swift/tasks/check.yml b/ansible/roles/swift/tasks/check.yml index e655ac0e7d..9b40ebe4ef 100644 --- a/ansible/roles/swift/tasks/check.yml +++ b/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 }} diff --git a/ansible/roles/tempest/templates/tempest.conf.j2 b/ansible/roles/tempest/templates/tempest.conf.j2 index a0dc90cb59..6cf35df7c0 100644 --- a/ansible/roles/tempest/templates/tempest.conf.j2 +++ b/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]