From b3cb549af9e68b0efdbac159df01e5c54b829918 Mon Sep 17 00:00:00 2001 From: caoyuan Date: Mon, 25 Sep 2017 13:19:06 +0800 Subject: [PATCH] optimize the command format for murano start.yml 1. optimize the conmmand format 2. Update the "--os-auth-url", use the {{ keystone_admin_url }} since it be defined in all.yml Change-Id: I53278a7b1c43a021eafbd10842355a4c70c47116 --- ansible/roles/murano/tasks/start.yml | 34 +++++++++++++--------------- 1 file changed, 16 insertions(+), 18 deletions(-) diff --git a/ansible/roles/murano/tasks/start.yml b/ansible/roles/murano/tasks/start.yml index fbf9f6297a..4aa92557e7 100644 --- a/ansible/roles/murano/tasks/start.yml +++ b/ansible/roles/murano/tasks/start.yml @@ -39,30 +39,28 @@ delegate_to: "{{ groups['murano-api'][0] }}" - name: Checking if Murano core library package exists - command: "docker exec murano_api murano \ - --os-username {{ openstack_auth.username }} \ - --os-password {{ keystone_admin_password }} \ - --os-project-name {{ openstack_auth.project_name }} \ - --os-auth-url \ - {{ admin_protocol }}://{{ kolla_internal_fqdn }}:{{ keystone_admin_port }}/v3 \ - --murano-url \ - {{ admin_protocol }}://{{ api_interface_address }}:{{ murano_api_port }} \ - package-list" + command: > + docker exec murano_api murano + --os-username {{ openstack_auth.username }} + --os-password {{ keystone_admin_password }} + --os-project-name {{ openstack_auth.project_name }} + --os-auth-url {{ keystone_admin_url }} + --murano-url {{ admin_protocol }}://{{ api_interface_address }}:{{ murano_api_port }} + package-list register: status changed_when: False run_once: True delegate_to: "{{ groups['murano-api'][0] }}" - name: Importing Murano core library package - command: "docker exec murano_api murano \ - --os-username {{ openstack_auth.username }} \ - --os-password {{ keystone_admin_password }} \ - --os-project-name {{ openstack_auth.project_name }} \ - --os-auth-url \ - {{ admin_protocol }}://{{ kolla_internal_fqdn }}:{{ keystone_admin_port }}/v3 \ - --murano-url \ - {{ admin_protocol }}://{{ api_interface_address }}:{{ murano_api_port }} \ - package-import --exists-action u --is-public /io.murano.zip" + command: > + docker exec murano_api murano + --os-username {{ openstack_auth.username }} + --os-password {{ keystone_admin_password }} + --os-project-name {{ openstack_auth.project_name }} + --os-auth-url {{ keystone_admin_url }} + --murano-url {{ admin_protocol }}://{{ api_interface_address }}:{{ murano_api_port }} + package-import --exists-action u --is-public /io.murano.zip run_once: True delegate_to: "{{ groups['murano-api'][0] }}" when: