Browse Source

Adjust to per-service configuration

Change-Id: I76ad2841d74509621d0176a6d794e1e515a31eee
Depends-On: Ia4d29167cea6dfd19a1970706aafda51a31d5b24
Andrey Pavlov 2 years ago
parent
commit
e5ada4b0a0
4 changed files with 7 additions and 7 deletions
  1. 1
    1
      service/files/heat.conf.j2
  2. 1
    1
      service/heat-api-cfn.yaml
  3. 3
    3
      service/heat-api.yaml
  4. 2
    2
      service/heat-engine.yaml

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

@@ -16,7 +16,7 @@ reauthentication_auth_method = trusts
16 16
 endpoint_type = internalURL
17 17
 
18 18
 [database]
19
-connection = mysql+pymysql://{{ heat.db.username }}:{{ heat.db.password }}@{{ address(service.database) }}/{{ heat.db.name }}{% if db.tls.enabled %}?ssl_ca=/opt/ccp/etc/tls/ca.pem{% endif %}
19
+connection = mysql+pymysql://{{ heat.db.username }}:{{ heat.db.password }}@{{ address("database") }}/{{ heat.db.name }}{% if db.tls.enabled %}?ssl_ca=/opt/ccp/etc/tls/ca.pem{% endif %}
20 20
 
21 21
 {{ keystone_authtoken.keystone_authtoken(heat.user, heat.password) }}
22 22
 

+ 1
- 1
service/heat-api-cfn.yaml View File

@@ -33,7 +33,7 @@ service:
33 33
             openstack endpoint create --region RegionOne cloudformation admin {{ address('heat-api-cfn', heat.api_cfn_port, with_scheme=True) }}/v1
34 34
       daemon:
35 35
         dependencies:
36
-          - "{{ messaging.dependencies[messaging.backend.rpc] }}"
36
+          - rpc
37 37
           # heat-api in dependencies, because it prepares DB, which will be used
38 38
           - heat-api
39 39
         files:

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

@@ -9,10 +9,10 @@ service:
9 9
       pre:
10 10
         - name: heat-db-create
11 11
           dependencies:
12
-            - {{ service.database }}
12
+            - database
13 13
           type: single
14 14
           command:
15
-            mysql -u root -p{{ db.root_password }} -h {{ address(service.database) }} -e "create database {{ heat.db.name }};
15
+            mysql -u root -p{{ db.root_password }} -h {{ address("database") }} -e "create database {{ heat.db.name }};
16 16
             create user '{{ heat.db.username }}'@'%' identified by '{{ heat.db.password }}'
17 17
             {% if db.tls.enabled %} require ssl {% endif %};
18 18
             grant all privileges on {{ heat.db.name }}.* to '{{ heat.db.username }}'@'%' identified by '{{ heat.db.password }}'
@@ -96,7 +96,7 @@ service:
96 96
             - heat-grant-doman-user-admin-privileges
97 97
       daemon:
98 98
         dependencies:
99
-          - "{{ messaging.dependencies[messaging.backend.rpc] }}"
99
+          - rpc
100 100
         files:
101 101
           - heat-conf
102 102
         command: heat-api --config-file /etc/heat/heat.conf

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

@@ -8,8 +8,8 @@ service:
8 8
         command: heat-engine --config-file /etc/heat/heat.conf
9 9
         dependencies:
10 10
           - heat-api
11
-          - "{{ messaging.dependencies[messaging.backend.rpc] }}"
12
-          - "{{ messaging.dependencies[messaging.backend.notifications] }}"
11
+          - rpc
12
+          - notifications
13 13
         files:
14 14
           - heat.conf
15 15
 files:

Loading…
Cancel
Save