Use auth vars for admin user
In someplace in the code admin user, project and domain name are hardcoded. This change use the correct variable defined at: https://github.com/openstack/kolla-ansible/blob/master/ansible/group_vars/all.yml#L278 Change-Id: I3a4c78d81733bf7a2f3c67d259ec5c5f5bb38d3f
This commit is contained in:
parent
b595f236d0
commit
e9bde0dcb9
@ -4,7 +4,7 @@
|
|||||||
-m kolla_sanity
|
-m kolla_sanity
|
||||||
-a "service=cinder
|
-a "service=cinder
|
||||||
project=service
|
project=service
|
||||||
user=admin
|
user={{ openstack_auth.username }}
|
||||||
password={{ cinder_keystone_password }}
|
password={{ cinder_keystone_password }}
|
||||||
role=admin
|
role=admin
|
||||||
region_name={{ openstack_region_name }}
|
region_name={{ openstack_region_name }}
|
||||||
|
@ -38,9 +38,9 @@
|
|||||||
|
|
||||||
- name: Checking if Murano core library package exists
|
- name: Checking if Murano core library package exists
|
||||||
command: "docker exec murano_api murano \
|
command: "docker exec murano_api murano \
|
||||||
--os-username admin \
|
--os-username {{ openstack_auth.username }} \
|
||||||
--os-password {{ keystone_admin_password }} \
|
--os-password {{ keystone_admin_password }} \
|
||||||
--os-project-name admin \
|
--os-project-name {{ openstack_auth.project_name }} \
|
||||||
--os-auth-url \
|
--os-auth-url \
|
||||||
{{ admin_protocol }}://{{ kolla_internal_fqdn }}:{{ keystone_admin_port }}/v3 \
|
{{ admin_protocol }}://{{ kolla_internal_fqdn }}:{{ keystone_admin_port }}/v3 \
|
||||||
--murano-url \
|
--murano-url \
|
||||||
@ -53,9 +53,9 @@
|
|||||||
|
|
||||||
- name: Importing Murano core library package
|
- name: Importing Murano core library package
|
||||||
command: "docker exec murano_api murano \
|
command: "docker exec murano_api murano \
|
||||||
--os-username admin \
|
--os-username {{ openstack_auth.username }} \
|
||||||
--os-password {{ keystone_admin_password }} \
|
--os-password {{ keystone_admin_password }} \
|
||||||
--os-project-name admin \
|
--os-project-name {{ openstack_auth.project_name }} \
|
||||||
--os-auth-url \
|
--os-auth-url \
|
||||||
{{ admin_protocol }}://{{ kolla_internal_fqdn }}:{{ keystone_admin_port }}/v3 \
|
{{ admin_protocol }}://{{ kolla_internal_fqdn }}:{{ keystone_admin_port }}/v3 \
|
||||||
--murano-url \
|
--murano-url \
|
||||||
|
@ -32,11 +32,11 @@
|
|||||||
--os-interface internal
|
--os-interface internal
|
||||||
--os-auth-url {{ keystone_admin_url }}
|
--os-auth-url {{ keystone_admin_url }}
|
||||||
--os-identity-api-version 3
|
--os-identity-api-version 3
|
||||||
--os-project-domain-name default
|
--os-project-domain-name {{ openstack_auth.domain_name }}
|
||||||
--os-tenant-name admin
|
--os-tenant-name {{ openstack_auth.project_name }}
|
||||||
--os-username admin
|
--os-username {{ openstack_auth.username }}
|
||||||
--os-password {{ keystone_admin_password }}
|
--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
|
compute service list -f json --service nova-compute
|
||||||
register: nova_compute_services
|
register: nova_compute_services
|
||||||
changed_when: false
|
changed_when: false
|
||||||
|
@ -26,10 +26,10 @@ max_retries = -1
|
|||||||
[service_auth]
|
[service_auth]
|
||||||
auth_url = {{ internal_protocol }}://{{ kolla_internal_fqdn }}:{{ keystone_admin_port }}
|
auth_url = {{ internal_protocol }}://{{ kolla_internal_fqdn }}:{{ keystone_admin_port }}
|
||||||
auth_type = password
|
auth_type = password
|
||||||
username = admin
|
username = {{ openstack_auth.username }}
|
||||||
password = {{ keystone_admin_password }}
|
password = {{ keystone_admin_password }}
|
||||||
user_domain_name = Default
|
user_domain_name = Default
|
||||||
project_name = admin
|
project_name = {{ openstack_auth.project_name }}
|
||||||
project_domain_name = Default
|
project_domain_name = Default
|
||||||
|
|
||||||
memcache_security_strategy = ENCRYPT
|
memcache_security_strategy = ENCRYPT
|
||||||
|
@ -4,7 +4,7 @@
|
|||||||
-m kolla_sanity
|
-m kolla_sanity
|
||||||
-a "service=swift
|
-a "service=swift
|
||||||
project=service
|
project=service
|
||||||
user=admin
|
user={{ openstack_auth.username }}
|
||||||
password={{ swift_keystone_password }}
|
password={{ swift_keystone_password }}
|
||||||
role=admin
|
role=admin
|
||||||
region_name={{ openstack_region_name }}
|
region_name={{ openstack_region_name }}
|
||||||
|
@ -5,10 +5,10 @@ use_stderr = False
|
|||||||
log_dir = /var/log/kolla/tempest/
|
log_dir = /var/log/kolla/tempest/
|
||||||
|
|
||||||
[auth]
|
[auth]
|
||||||
admin_username = admin
|
admin_username = {{ openstack_auth.username }}
|
||||||
admin_password = {{ keystone_admin_password }}
|
admin_password = {{ keystone_admin_password }}
|
||||||
admin_project_name = admin
|
admin_project_name = {{ openstack_auth.project_name }}
|
||||||
admin_domain_name = default
|
admin_domain_name = {{ openstack_auth.domain_name }}
|
||||||
|
|
||||||
|
|
||||||
[dashboard]
|
[dashboard]
|
||||||
|
Loading…
Reference in New Issue
Block a user