Browse Source

Merge "Adjust urls with new 'address' functionality"

Jenkins 2 years ago
parent
commit
a6916421f8
2 changed files with 9 additions and 9 deletions
  1. 7
    7
      service/files/heat.conf.j2
  2. 2
    2
      service/heat-api.yaml

+ 7
- 7
service/files/heat.conf.j2 View File

@@ -17,26 +17,26 @@ rabbit_hosts = rabbitmq
17 17
 
18 18
 [keystone_authtoken]
19 19
 auth_version = v3
20
-auth_uri = http://{{ address('keystone') }}:{{ keystone.public_port.cont }}/v3
21
-auth_url = http://{{ address('keystone') }}:{{ keystone.admin_port.cont }}/v3
20
+auth_uri = {{ address('keystone', keystone.public_port, with_scheme=True) }}/v3
21
+auth_url = {{ address('keystone', keystone.admin_port, with_scheme=True) }}/v3
22 22
 auth_type = password
23 23
 project_domain_id = default
24 24
 user_domain_id = default
25 25
 project_name = {{ openstack.project_name }}
26 26
 username = {{ heat.user }}
27 27
 password = {{ heat.password }}
28
-memcached_servers = {{ address('memcached') }}:{{ memcached.port.cont }}
28
+memcached_servers = {{ address('memcached', memcached.port) }}
29 29
 
30 30
 [trustee]
31 31
 user_domain_id = default
32 32
 password = {{ heat.password }}
33 33
 username = {{ heat.user }}
34
-auth_uri = http://{{ address('keystone') }}:{{ keystone.public_port.cont }}
35
-auth_url = http://{{ address('keystone') }}:{{ keystone.admin_port.cont }}
34
+auth_uri = {{ address('keystone', keystone.public_port, with_scheme=True) }}
35
+auth_url = {{ address('keystone', keystone.admin_port, with_scheme=True) }}
36 36
 auth_type = password
37 37
 
38 38
 [clients_keystone]
39
-auth_uri = http://{{ address('keystone') }}:{{ keystone.public_port.cont }}
39
+auth_uri = {{ address('keystone', keystone.public_port, with_scheme=True) }}
40 40
 
41 41
 [heat_api]
42 42
 bind_host = {{ network_topology["private"]["address"] }}
@@ -45,4 +45,4 @@ bind_port = {{ heat.api_port.cont }}
45 45
 [cache]
46 46
 backend = oslo_cache.memcache_pool
47 47
 enabled = True
48
-memcache_servers = {{ address('memcached') }}:{{ memcached.port.cont }}
48
+memcache_servers = {{ address('memcached', memcached.port) }}

+ 2
- 2
service/heat-api.yaml View File

@@ -55,13 +55,13 @@ service:
55 55
             - heat-service-create
56 56
           type: single
57 57
           command:
58
-            openstack endpoint create --region RegionOne orchestration internal http://{{ address('heat-api') }}:{{ heat.api_port.cont }}/v1/%\(tenant_id\)s
58
+            openstack endpoint create --region RegionOne orchestration internal {{ address('heat-api', heat.api_port, with_scheme=True) }}/v1/%\(tenant_id\)s
59 59
         - name: heat-admin-endpoint-create
60 60
           dependencies:
61 61
             - heat-service-create
62 62
           type: single
63 63
           command:
64
-            openstack endpoint create --region RegionOne orchestration admin http://{{ address('heat-api') }}:{{ heat.api_port.cont }}/v1/%\(tenant_id\)s
64
+            openstack endpoint create --region RegionOne orchestration admin {{ address('heat-api', heat.api_port, with_scheme=True) }}/v1/%\(tenant_id\)s
65 65
       daemon:
66 66
         dependencies:
67 67
           - rabbitmq

Loading…
Cancel
Save