From 565917702669c689297198b4648962b07e9aaf63 Mon Sep 17 00:00:00 2001 From: linpeiwen Date: Thu, 26 Mar 2020 23:10:06 -0400 Subject: [PATCH] keystone roles container name variable keystone and keystone_fernet container name variable is fixed in some places, but in the defaults directory, keystone and keystone_fernet container_name variable is variable. If the keystone and keystone_fernet container_name variable is changed during deployment, it will not be assigned to keystone and keystone_fernet, but a fixed 'keystone' and 'keystone_fernet' name. Change-Id: Ifc8ac69e6abc4586f0e4fd820b9022aea9f76396 --- ansible/roles/keystone/tasks/distribute_fernet.yml | 2 +- ansible/roles/keystone/tasks/register.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/ansible/roles/keystone/tasks/distribute_fernet.yml b/ansible/roles/keystone/tasks/distribute_fernet.yml index 184acac840..f5c12b8031 100644 --- a/ansible/roles/keystone/tasks/distribute_fernet.yml +++ b/ansible/roles/keystone/tasks/distribute_fernet.yml @@ -11,7 +11,7 @@ - name: Run key distribution become: true - command: docker exec -t keystone_fernet /usr/bin/fernet-push.sh + command: docker exec -t "{{ keystone_services['keystone-fernet']['container_name'] }}" /usr/bin/fernet-push.sh run_once: True delegate_to: >- {% if groups['keystone_fernet_running'] is defined -%} diff --git a/ansible/roles/keystone/tasks/register.yml b/ansible/roles/keystone/tasks/register.yml index 69dffd9405..957e2a7f9c 100644 --- a/ansible/roles/keystone/tasks/register.yml +++ b/ansible/roles/keystone/tasks/register.yml @@ -1,7 +1,7 @@ --- - name: Creating admin project, user, role, service, and endpoint become: true - command: docker exec keystone kolla_keystone_bootstrap {{ openstack_auth.username }} {{ openstack_auth.password }} {{ openstack_auth.project_name }} admin {{ keystone_admin_url }} {{ keystone_internal_url }} {{ keystone_public_url }} {{ item }} + command: docker exec "{{ keystone_services['keystone']['container_name'] }}" kolla_keystone_bootstrap {{ openstack_auth.username }} {{ openstack_auth.password }} {{ openstack_auth.project_name }} admin {{ keystone_admin_url }} {{ keystone_internal_url }} {{ keystone_public_url }} {{ item }} register: keystone_bootstrap changed_when: (keystone_bootstrap.stdout | from_json).changed failed_when: (keystone_bootstrap.stdout | from_json).failed