Adding with_scheme param to addres functions
Replacing http with with_scheme param to add proper scheme Change-Id: I038ef496c103964b960a5ceaf7c9b7fc8ed198c9
This commit is contained in:
parent
edbf51cb89
commit
320abb452b
|
@ -20,8 +20,8 @@ packages_service = murano
|
|||
|
||||
[keystone_authtoken]
|
||||
auth_version = v3
|
||||
auth_uri = http://{{ address('keystone', keystone.public_port) }}/v3
|
||||
auth_url = http://{{ address('keystone', keystone.admin_port) }}/v3
|
||||
auth_uri = {{ address('keystone', keystone.public_port, with_scheme=True) }}/v3
|
||||
auth_url = {{ address('keystone', keystone.admin_port, with_scheme=True) }}/v3
|
||||
auth_plugin = password
|
||||
project_domain_id = default
|
||||
user_domain_id = default
|
||||
|
@ -41,7 +41,7 @@ driver = messagingv2
|
|||
transport_url = rabbit://{{ rabbitmq.user }}:{{ rabbitmq.password }}@{{ address("rabbitmq", rabbitmq.port) }}/
|
||||
|
||||
[murano]
|
||||
url = http://{{ address('murano-api', murano.api_port) }}
|
||||
url = {{ address('murano-api', murano.api_port, with_scheme=True) }}
|
||||
|
||||
[networking]
|
||||
default_dns = {{ murano.networking.dns }}
|
||||
|
|
|
@ -42,17 +42,17 @@ service:
|
|||
- keystone
|
||||
- name: murano-public-endpoint-create
|
||||
type: single
|
||||
command: openstack endpoint create --region RegionOne murano public http://{{ address('murano-api', murano.api_port, external=True) }}
|
||||
command: openstack endpoint create --region RegionOne murano public {{ address('murano-api', murano.api_port, external=True, with_scheme=True) }}
|
||||
dependencies:
|
||||
- murano-service-create
|
||||
- name: murano-internal-endpoint-create
|
||||
type: single
|
||||
command: openstack endpoint create --region RegionOne murano internal http://{{ address('murano-api', murano.api_port) }}
|
||||
command: openstack endpoint create --region RegionOne murano internal {{ address('murano-api', murano.api_port, with_scheme=True) }}
|
||||
dependencies:
|
||||
- murano-service-create
|
||||
- name: murano-admin-endpoint-create
|
||||
type: single
|
||||
command: openstack endpoint create --region RegionOne murano admin http://{{ address('murano-api', murano.api_port) }}
|
||||
command: openstack endpoint create --region RegionOne murano admin {{ address('murano-api', murano.api_port, with_scheme=True) }}
|
||||
dependencies:
|
||||
- murano-service-create
|
||||
daemon:
|
||||
|
@ -65,10 +65,10 @@ service:
|
|||
- name: murano-import-core
|
||||
type: single
|
||||
command: cd /murano/meta/io.murano; zip -r /tmp/murano-core.zip *;
|
||||
murano --murano-url http://{{ address('murano-api', murano.api_port) }}
|
||||
murano --murano-url {{ address('murano-api', murano.api_port, with_scheme=True) }}
|
||||
--os-username {{ murano.db.username }}
|
||||
--os-password {{ murano.db.password }}
|
||||
--os-auth-url http://{{ address('keystone', keystone.public_port) }}
|
||||
--os-auth-url {{ address('keystone', keystone.public_port, with_scheme=True) }}
|
||||
--os-project-name service
|
||||
package-import --is-public /tmp/murano-core.zip
|
||||
|
||||
|
|
Loading…
Reference in New Issue