f425c0678f
The goal for this push request is to normalize the construction and use of internal, external, and admin URLs. While extending Kolla-ansible to enable a more flexible method to manage external URLs, we noticed that the same URL was constructed multiple times in different parts of the code. This can make it difficult for people that want to work with these URLs and create inconsistencies in a large code base with time. Therefore, we are proposing here the use of "single Kolla-ansible variable" per endpoint URL, which facilitates for people that are interested in overriding/extending these URLs. As an example, we extended Kolla-ansible to facilitate the "override" of public (external) URLs with the following standard "<component/serviceName>.<companyBaseUrl>". Therefore, the "NAT/redirect" in the SSL termination system (HAproxy, HTTPD or some other) is done via the service name, and not by the port. This allows operators to easily and automatically create more friendly URL names. To develop this feature, we first applied this patch that we are sending now to the community. We did that to reduce the surface of changes in Kolla-ansible. Another example is the integration of Kolla-ansible and Consul, which we also implemented internally, and also requires URLs changes. Therefore, this PR is essential to reduce code duplicity, and to facility users/developers to work/customize the services URLs. Change-Id: I73d483e01476e779a5155b2e18dd5ea25f514e93 Signed-off-by: Rafael Weingärtner <rafael@apache.org>
62 lines
2.2 KiB
YAML
62 lines
2.2 KiB
YAML
---
|
|
- name: Waiting for Murano API service to be ready on first node
|
|
wait_for:
|
|
host: "{{ api_interface_address }}"
|
|
port: "{{ murano_api_port }}"
|
|
connect_timeout: 1
|
|
timeout: 60
|
|
run_once: True
|
|
register: check_murano_port
|
|
until: check_murano_port is success
|
|
retries: 10
|
|
delay: 6
|
|
delegate_to: "{{ groups['murano-api'][0] }}"
|
|
|
|
- name: Checking if Murano core and applications library packages exist
|
|
become: true
|
|
command: >
|
|
docker exec murano_api murano
|
|
--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 {{ murano_admin_endpoint }}
|
|
package-list
|
|
register: status
|
|
changed_when: False
|
|
run_once: True
|
|
delegate_to: "{{ groups['murano-api'][0] }}"
|
|
|
|
- name: Importing Murano core library package
|
|
become: true
|
|
command: >
|
|
docker exec murano_api murano
|
|
--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 {{ murano_admin_endpoint }}
|
|
package-import --exists-action u --is-public /io.murano.zip
|
|
run_once: True
|
|
delegate_to: "{{ groups['murano-api'][0] }}"
|
|
when:
|
|
- status.stdout.find("io.murano") == -1 or kolla_action == "upgrade"
|
|
|
|
- name: Importing Murano applications library package
|
|
become: true
|
|
command: >
|
|
docker exec murano_api murano
|
|
--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 {{ murano_admin_endpoint }}
|
|
package-import --exists-action u --is-public /io.murano.applications.zip
|
|
run_once: True
|
|
delegate_to: "{{ groups['murano-api'][0] }}"
|
|
when:
|
|
- status.stdout.find("io.murano.applications") == -1 or kolla_action == "upgrade"
|