openstack/kolla-ansible
Code Issues Proposed changes

Merge "Add config necessary to use Barbican with Murano"

Browse Source
This commit is contained in:
Zuul 2018-03-19 09:17:13 +00:00 committed by Gerrit Code Review
commit 1ab1c835c4
4 changed files with 21 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
ansible/group_vars/all.yml
View File

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

11
ansible/roles/horizon/templates/local_settings.j2
View File

@ -830,3 +830,14 @@ REST_API_REQUIRED_SETTINGS = ['OPENSTACK_HYPERVISOR_FEATURES',
# before loading any data into the admin views, set the following attribute to # before loading any data into the admin views, set the following attribute to
# True # True
#ADMIN_FILTER_DATA_FIRST=False #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 %}

2
ansible/roles/murano/defaults/main.yml
View File

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

9
ansible/roles/murano/templates/murano.conf.j2
View File

@ -61,4 +61,13 @@ port = {{ outward_rabbitmq_port }}
login = {{ murano_agent_rabbitmq_user }} login = {{ murano_agent_rabbitmq_user }}
password = {{ murano_agent_rabbitmq_password }} password = {{ murano_agent_rabbitmq_password }}
virtual_host = {{ murano_agent_rabbitmq_vhost }} 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 %} {% endif %}