Merge "Add config necessary to use Barbican with Murano"

ansible/group_vars/all.yml

@@ -483,6 +483,7 @@ ironic_keystone_user: "ironic"
 neutron_keystone_user: "neutron"
 nova_keystone_user: "nova"
 placement_keystone_user: "placement"
+murano_keystone_user: "murano"
 
 # Nova fake driver and the number of fake driver per compute node
 enable_nova_fake: "no"

ansible/roles/horizon/templates/local_settings.j2

@@ -830,3 +830,14 @@ REST_API_REQUIRED_SETTINGS = ['OPENSTACK_HYPERVISOR_FEATURES',
 # before loading any data into the admin views, set the following attribute to
 # True
 #ADMIN_FILTER_DATA_FIRST=False
+
+{% if enable_murano | bool and enable_barbican | bool %}
+KEY_MANAGER = {
+        'auth_url': '{{ internal_protocol }}://{{ kolla_internal_fqdn }}:{{ keystone_public_port }}/v3',
+        'username': '{{ murano_keystone_user }}',
+        'user_domain_name': '{{ default_project_domain_name }}',
+        'password': '{{ murano_keystone_password }}',
+        'project_name': 'service',
+        'project_domain_name': '{{ default_project_domain_name }}'
+}
+{% endif %}

ansible/roles/murano/defaults/main.yml

@@ -33,8 +33,6 @@ murano_public_endpoint: "{{ public_protocol }}://{{ kolla_external_fqdn }}:{{ mu
 
 murano_logging_debug: "{{ openstack_logging_debug }}"
 
-murano_keystone_user: "murano"
-
 openstack_murano_auth: "{{ openstack_auth }}"
 
 

ansible/roles/murano/templates/murano.conf.j2

@@ -61,4 +61,13 @@ port = {{ outward_rabbitmq_port }}
 login = {{ murano_agent_rabbitmq_user }}
 password = {{ murano_agent_rabbitmq_password }}
 virtual_host = {{ murano_agent_rabbitmq_vhost }}
+
+{% if enable_barbican | bool %}
+[key_manager]
+auth_type = keystone_password
+auth_url = {{ internal_protocol }}://{{ kolla_internal_fqdn }}:{{ keystone_public_port }}/v3
+username = {{ murano_keystone_user }}
+password = {{ murano_keystone_password }}
+user_domain_name = {{ default_project_domain_name }}
+{% endif %}
 {% endif %}