From 1f3cb24aeb19e49bf53d21d277c5723998229227 Mon Sep 17 00:00:00 2001 From: xiaojueguan Date: Wed, 13 May 2020 14:46:36 +0800 Subject: [PATCH] make murano work with endpoints with non-public CA Change-Id: Ic0d0543b6ad93743eae2a144e8a3b07de54e6d96 Closes-Bug: #1878344 --- ansible/roles/murano/tasks/import_library_packages.yml | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/ansible/roles/murano/tasks/import_library_packages.yml b/ansible/roles/murano/tasks/import_library_packages.yml index 9f653ded8f..d01e0cc7fb 100644 --- a/ansible/roles/murano/tasks/import_library_packages.yml +++ b/ansible/roles/murano/tasks/import_library_packages.yml @@ -19,8 +19,9 @@ --os-username {{ openstack_auth.username }} --os-password {{ keystone_admin_password }} --os-project-name {{ openstack_auth.project_name }} + {% if openstack_cacert != '' %}--os-cacert {{ openstack_cacert }}{% endif %} --os-auth-url {{ keystone_admin_url }} - --murano-url {{ admin_protocol }}://{{ api_interface_address | put_address_in_context('url') }}:{{ murano_api_port }} + --murano-url {{ admin_protocol }}://{{ kolla_internal_fqdn | put_address_in_context('url') }}:{{ murano_api_port }} package-list register: status changed_when: False @@ -34,8 +35,9 @@ --os-username {{ openstack_auth.username }} --os-password {{ keystone_admin_password }} --os-project-name {{ openstack_auth.project_name }} + {% if openstack_cacert != '' %}--os-cacert {{ openstack_cacert }}{% endif %} --os-auth-url {{ keystone_admin_url }} - --murano-url {{ admin_protocol }}://{{ api_interface_address | put_address_in_context('url') }}:{{ murano_api_port }} + --murano-url {{ admin_protocol }}://{{ kolla_internal_fqdn | put_address_in_context('url') }}:{{ murano_api_port }} package-import --exists-action u --is-public /io.murano.zip run_once: True delegate_to: "{{ groups['murano-api'][0] }}" @@ -49,8 +51,9 @@ --os-username {{ openstack_auth.username }} --os-password {{ keystone_admin_password }} --os-project-name {{ openstack_auth.project_name }} + {% if openstack_cacert != '' %}--os-cacert {{ openstack_cacert }}{% endif %} --os-auth-url {{ keystone_admin_url }} - --murano-url {{ admin_protocol }}://{{ api_interface_address | put_address_in_context('url') }}:{{ murano_api_port }} + --murano-url {{ admin_protocol }}://{{ kolla_internal_fqdn | put_address_in_context('url') }}:{{ murano_api_port }} package-import --exists-action u --is-public /io.murano.applications.zip run_once: True delegate_to: "{{ groups['murano-api'][0] }}"