Browse Source

Add "address" to all services

Replace all <some_service> occurences with
{{ address('<some_service>') }}

Change-Id: Ife7e62245cc76a52557df145cd141b53fad50a7a
Depends-on: I163857fa0c671e21725d7276540f5fbba09619d2
Depends-on: Ibbb12e016570936468effbbd0648d4690abe3aab
changes/50/373250/4
Andrey 2 years ago
parent
commit
39fce942e3
3 changed files with 11 additions and 11 deletions
  1. 4
    4
      service/files/glance-api.conf.j2
  2. 4
    4
      service/files/glance-registry.conf.j2
  3. 3
    3
      service/glance-api.yaml

+ 4
- 4
service/files/glance-api.conf.j2 View File

@@ -14,19 +14,19 @@ registry_host = glance-registry
14 14
 cinder_catalog_info = volume:cinder:internalURL
15 15
 
16 16
 [database]
17
-connection = mysql+pymysql://{{ glance_db_username }}:{{ glance_db_password }}@mariadb/{{ glance_db_name }}
17
+connection = mysql+pymysql://{{ glance_db_username }}:{{ glance_db_password }}@{{ address('mariadb') }}/{{ glance_db_name }}
18 18
 max_retries = -1
19 19
 
20 20
 [keystone_authtoken]
21
-auth_uri = http://keystone:{{ keystone_public_port }}
22
-auth_url = http://keystone:{{ keystone_admin_port }}
21
+auth_uri = http://{{ address('keystone') }}:{{ keystone_public_port }}
22
+auth_url = http://{{ address('keystone') }}:{{ keystone_admin_port }}
23 23
 auth_type = password
24 24
 project_domain_id = default
25 25
 user_domain_id = default
26 26
 project_name = {{ openstack_project_name }}
27 27
 username = {{ glance_user }}
28 28
 password = {{ glance_password }}
29
-memcached_servers = memcached:{{ memcached_port }}
29
+memcached_servers = {{ address('memcached') }}:{{ memcached_port }}
30 30
 
31 31
 
32 32
 [paste_deploy]

+ 4
- 4
service/files/glance-registry.conf.j2 View File

@@ -13,19 +13,19 @@ registry_host = glance-registry
13 13
 cinder_catalog_info = volume:cinder:internalURL
14 14
 
15 15
 [database]
16
-connection = mysql+pymysql://{{ glance_db_username }}:{{ glance_db_password }}@mariadb/{{ glance_db_name }}
16
+connection = mysql+pymysql://{{ glance_db_username }}:{{ glance_db_password }}@{{ address('mariadb') }}/{{ glance_db_name }}
17 17
 max_retries = -1
18 18
 
19 19
 [keystone_authtoken]
20
-auth_uri = http://keystone:{{ keystone_public_port }}
21
-auth_url = http://keystone:{{ keystone_admin_port }}
20
+auth_uri = http://{{ address('keystone') }}:{{ keystone_public_port }}
21
+auth_url = http://{{ address('keystone') }}:{{ keystone_admin_port }}
22 22
 auth_type = password
23 23
 project_domain_id = default
24 24
 user_domain_id = default
25 25
 project_name = service
26 26
 username = {{ glance_user }}
27 27
 password = {{ glance_password }}
28
-memcached_servers = memcached:{{ memcached_port }}
28
+memcached_servers = {{ address('memcached') }}:{{ memcached_port }}
29 29
 
30 30
 [paste_deploy]
31 31
 flavor = keystone

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

@@ -43,17 +43,17 @@ service:
43 43
           dependencies:
44 44
             - glance-service-create
45 45
           type: single
46
-          command: openstack endpoint create --region RegionOne image public http://glance-api:{{ glance_api_port }}
46
+          command: openstack endpoint create --region RegionOne image public http://{{ address('glance-api') }}:{{ glance_api_port }}
47 47
         - name: glance-internal-endpoint-create
48 48
           dependencies:
49 49
             - glance-service-create
50 50
           type: single
51
-          command: openstack endpoint create --region RegionOne image internal http://glance-api:{{ glance_api_port }}
51
+          command: openstack endpoint create --region RegionOne image internal http://{{ address('glance-api') }}:{{ glance_api_port }}
52 52
         - name: glance-admin-endpoint-create
53 53
           dependencies:
54 54
             - glance-service-create
55 55
           type: single
56
-          command: openstack endpoint create --region RegionOne image admin http://glance-api:{{ glance_api_port }}
56
+          command: openstack endpoint create --region RegionOne image admin http://{{ address('glance-api') }}:{{ glance_api_port }}
57 57
       daemon:
58 58
         files:
59 59
           - glance-api

Loading…
Cancel
Save