From 46df30d87140d182acfc70b005fb8b29a4589c12 Mon Sep 17 00:00:00 2001 From: Mark Goddard Date: Tue, 10 Aug 2021 09:16:59 +0100 Subject: [PATCH] ironic: Follow up for ironic_enable_keystone_integration Follow up for I0c7e9a28876a1d4278fb2ed8555c2b08472864b9 which added a ironic_enable_keystone_integration variable to support Ironic in multi-region environments. This change skips Keystone service registration based on ironic_enable_keystone_integration rather than enable_keystone. It also updates the ironic-inspector.conf template to use the new variable. Change-Id: I2ecba4999e194766258ac5beed62877d43829313 --- ansible/roles/ironic/tasks/deploy.yml | 2 +- ansible/roles/ironic/templates/ironic-inspector.conf.j2 | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/ansible/roles/ironic/tasks/deploy.yml b/ansible/roles/ironic/tasks/deploy.yml index bf32d69f35..f135ada713 100644 --- a/ansible/roles/ironic/tasks/deploy.yml +++ b/ansible/roles/ironic/tasks/deploy.yml @@ -1,6 +1,6 @@ --- - import_tasks: register.yml - when: enable_keystone | bool + when: ironic_enable_keystone_integration | bool - import_tasks: config-host.yml diff --git a/ansible/roles/ironic/templates/ironic-inspector.conf.j2 b/ansible/roles/ironic/templates/ironic-inspector.conf.j2 index e3d87dfc24..2e5e58fbfc 100644 --- a/ansible/roles/ironic/templates/ironic-inspector.conf.j2 +++ b/ansible/roles/ironic/templates/ironic-inspector.conf.j2 @@ -19,7 +19,7 @@ ssl_ca_file = {{ om_rabbitmq_cacert }} {% endif %} [ironic] -{% if enable_keystone | bool %} +{% if ironic_enable_keystone_integration | bool %} auth_url = {{ keystone_admin_url }} auth_type = password project_domain_id = {{ default_project_domain_id }} @@ -35,7 +35,7 @@ auth_type = none endpoint_override = {{ ironic_internal_endpoint }} {% endif %} -{% if enable_keystone | bool %} +{% if ironic_enable_keystone_integration | bool %} [keystone_authtoken] www_authenticate_uri = {{ keystone_internal_url }} auth_url = {{ keystone_admin_url }}