Merge "optimize the command format for murano start.yml"

This commit is contained in:
Jenkins 2017-09-26 10:41:03 +00:00 committed by Gerrit Code Review
commit 1390c9e32c

View File

@ -39,30 +39,28 @@
delegate_to: "{{ groups['murano-api'][0] }}" delegate_to: "{{ groups['murano-api'][0] }}"
- name: Checking if Murano core library package exists - name: Checking if Murano core library package exists
command: "docker exec murano_api murano \ command: >
--os-username {{ openstack_auth.username }} \ docker exec murano_api murano
--os-password {{ keystone_admin_password }} \ --os-username {{ openstack_auth.username }}
--os-project-name {{ openstack_auth.project_name }} \ --os-password {{ keystone_admin_password }}
--os-auth-url \ --os-project-name {{ openstack_auth.project_name }}
{{ admin_protocol }}://{{ kolla_internal_fqdn }}:{{ keystone_admin_port }}/v3 \ --os-auth-url {{ keystone_admin_url }}
--murano-url \ --murano-url {{ admin_protocol }}://{{ api_interface_address }}:{{ murano_api_port }}
{{ admin_protocol }}://{{ api_interface_address }}:{{ murano_api_port }} \ package-list
package-list"
register: status register: status
changed_when: False changed_when: False
run_once: True run_once: True
delegate_to: "{{ groups['murano-api'][0] }}" delegate_to: "{{ groups['murano-api'][0] }}"
- name: Importing Murano core library package - name: Importing Murano core library package
command: "docker exec murano_api murano \ command: >
--os-username {{ openstack_auth.username }} \ docker exec murano_api murano
--os-password {{ keystone_admin_password }} \ --os-username {{ openstack_auth.username }}
--os-project-name {{ openstack_auth.project_name }} \ --os-password {{ keystone_admin_password }}
--os-auth-url \ --os-project-name {{ openstack_auth.project_name }}
{{ admin_protocol }}://{{ kolla_internal_fqdn }}:{{ keystone_admin_port }}/v3 \ --os-auth-url {{ keystone_admin_url }}
--murano-url \ --murano-url {{ admin_protocol }}://{{ api_interface_address }}:{{ murano_api_port }}
{{ admin_protocol }}://{{ api_interface_address }}:{{ murano_api_port }} \ package-import --exists-action u --is-public /io.murano.zip
package-import --exists-action u --is-public /io.murano.zip"
run_once: True run_once: True
delegate_to: "{{ groups['murano-api'][0] }}" delegate_to: "{{ groups['murano-api'][0] }}"
when: when: