Browse Source

Merge "Use keystone_authtoken macros for auth"

Jenkins 2 years ago
parent
commit
e2186f559d
2 changed files with 5 additions and 15 deletions
  1. 1
    11
      service/files/heat.conf.j2
  2. 4
    4
      service/heat-api.yaml

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

@@ -18,17 +18,7 @@ endpoint_type = internalURL
18 18
 [database]
19 19
 connection = mysql+pymysql://{{ heat.db.username }}:{{ heat.db.password }}@{{ address(service.database) }}/{{ heat.db.name }}{% if percona.tls.enabled %}?ssl_ca=/opt/ccp/etc/tls/ca.pem{% endif %}
20 20
 
21
-[keystone_authtoken]
22
-auth_version = v3
23
-auth_uri = {{ address('keystone', keystone.public_port, with_scheme=True) }}/v3
24
-auth_url = {{ address('keystone', keystone.admin_port, with_scheme=True) }}/v3
25
-auth_type = password
26
-project_domain_id = default
27
-user_domain_id = default
28
-project_name = service
29
-username = {{ heat.user }}
30
-password = {{ heat.password }}
31
-memcached_servers = {{ address('memcached', memcached.port) }}
21
+{{ keystone_authtoken.keystone_authtoken(heat.user, heat.password) }}
32 22
 
33 23
 [trustee]
34 24
 user_domain_id = default

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

@@ -26,19 +26,19 @@ service:
26 26
           command: heat-manage db_sync
27 27
         - name: heat-user-create
28 28
           dependencies:
29
-            - keystone-create-project
29
+            - keystone-create-domain
30 30
           type: single
31 31
           command:
32
-            openstack user create --domain default --password {{ heat.password }} {{ heat.user }}
32
+            openstack user create --domain {{ service_account.domain }} --password {{ heat.password }} {{ heat.user }}
33 33
         - name: heat-admin-role-add
34 34
           dependencies:
35 35
             - heat-user-create
36 36
           type: single
37 37
           command:
38
-            openstack role add --project service --user {{ heat.user }} admin
38
+            openstack role add --domain {{ service_account.domain }} --user {{ heat.user }} admin
39 39
         - name: heat-service-create
40 40
           dependencies:
41
-            - keystone-create-project
41
+            - keystone
42 42
           type: single
43 43
           command:
44 44
             openstack service create --name heat --description "OpenStack orchestration service" orchestration

Loading…
Cancel
Save