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
(cherry picked from commit 46df30d)

Author: markgoddard

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
 

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 }}