Browse Source

Ports configuration refactoring

Ports configuration has been changed:

before:

  port: 123:3333

after:

  port:
    cont: 123
    node: 3333

Change-Id: I4a2327802839641ea44c5fc858287706d45ee5b6
Depends-On: I54ab8dd02fc88b821a1f0d05c08f98b618730150
Andrey Pavlov 2 years ago
parent
commit
00d4f259e4
3 changed files with 13 additions and 12 deletions
  1. 2
    1
      service/files/defaults.yaml
  2. 8
    8
      service/files/heat.conf.j2
  3. 3
    3
      service/heat-api.yaml

+ 2
- 1
service/files/defaults.yaml View File

@@ -1,6 +1,7 @@
1 1
 configs:
2 2
   heat:
3
-    api_port: 8004
3
+    api_port:
4
+      cont: 8004
4 5
 
5 6
     db:
6 7
       username: heat

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

@@ -17,32 +17,32 @@ rabbit_hosts = rabbitmq
17 17
 
18 18
 [keystone_authtoken]
19 19
 auth_version = v3
20
-auth_uri = http://{{ address('keystone') }}:{{ keystone.public_port }}/v3
21
-auth_url = http://{{ address('keystone') }}:{{ keystone.admin_port }}/v3
20
+auth_uri = http://{{ address('keystone') }}:{{ keystone.public_port.cont }}/v3
21
+auth_url = http://{{ address('keystone') }}:{{ keystone.admin_port.cont }}/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 }}
28
+memcached_servers = {{ address('memcached') }}:{{ memcached.port.cont }}
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 }}
35
-auth_url = http://{{ address('keystone') }}:{{ keystone.admin_port }}
34
+auth_uri = http://{{ address('keystone') }}:{{ keystone.public_port.cont }}
35
+auth_url = http://{{ address('keystone') }}:{{ keystone.admin_port.cont }}
36 36
 auth_type = password
37 37
 
38 38
 [clients_keystone]
39
-auth_uri = http://{{ address('keystone') }}:{{ keystone.public_port }}
39
+auth_uri = http://{{ address('keystone') }}:{{ keystone.public_port.cont }}
40 40
 
41 41
 [heat_api]
42 42
 bind_host = {{ network_topology["private"]["address"] }}
43
-bind_port = {{ heat.api_port }}
43
+bind_port = {{ heat.api_port.cont }}
44 44
 
45 45
 [cache]
46 46
 backend = oslo_cache.memcache_pool
47 47
 enabled = True
48
-memcache_servers = {{ address('memcached') }}:{{ memcached.port }}
48
+memcache_servers = {{ address('memcached') }}:{{ memcached.port.cont }}

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

@@ -49,19 +49,19 @@ service:
49 49
             - heat-service-create
50 50
           type: single
51 51
           command:
52
-            openstack endpoint create --region RegionOne orchestration public http://{{ address('heat-api') }}:{{ heat.api_port }}/v1/%\(tenant_id\)s
52
+            openstack endpoint create --region RegionOne orchestration public http://{{ address('heat-api') }}:{{ heat.api_port.cont }}/v1/%\(tenant_id\)s
53 53
         - name: heat-internal-endpoint-create
54 54
           dependencies:
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 }}/v1/%\(tenant_id\)s
58
+            openstack endpoint create --region RegionOne orchestration internal http://{{ address('heat-api') }}:{{ heat.api_port.cont }}/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 }}/v1/%\(tenant_id\)s
64
+            openstack endpoint create --region RegionOne orchestration admin http://{{ address('heat-api') }}:{{ heat.api_port.cont }}/v1/%\(tenant_id\)s
65 65
       daemon:
66 66
         dependencies:
67 67
           - rabbitmq

Loading…
Cancel
Save