Browse Source

Merge "Use keystoneauth macros in designate"

Jenkins 2 years ago
parent
commit
78d0dcafd2
2 changed files with 5 additions and 13 deletions
  1. 4
    3
      service/designate-api.yaml
  2. 1
    10
      service/files/designate.conf.j2

+ 4
- 3
service/designate-api.yaml View File

@@ -26,14 +26,15 @@ service:
26 26
           command: designate-manage --config-file /etc/designate/designate.conf database sync
27 27
         - name: designate-user-create
28 28
           dependencies:
29
-            - keystone-create-project
29
+            - keystone-create-domain
30 30
           type: single
31
-          command: openstack user create --domain default --password {{ designate.password }} {{ designate.username }}
31
+          command: openstack user create --domain  {{ service_account.domain }} --password {{ designate.password }} {{ designate.username }}
32 32
         - name: designate-admin-role-add
33 33
           dependencies:
34 34
             - designate-user-create
35
+            - keystone-create-project
35 36
           type: single
36
-          command: openstack role add --project service --user {{ designate.username }} admin
37
+          command: openstack role add --project {{ service_account.project }} --user {{ designate.username }} admin
37 38
         - name: designate-service-create
38 39
           dependencies:
39 40
             - keystone-create-project

+ 1
- 10
service/files/designate.conf.j2 View File

@@ -29,16 +29,7 @@ rabbit_hosts = {{ address("rabbitmq", rabbitmq.port) }}
29 29
 #--------------------
30 30
 # Keystone Middleware
31 31
 #--------------------
32
-[keystone_authtoken]
33
-auth_uri = {{ address('keystone', keystone.public_port, with_scheme=True) }}
34
-auth_url = {{ address('keystone', keystone.admin_port, with_scheme=True) }}
35
-project_domain_name = Default
36
-project_name = service
37
-user_domain_name = Default
38
-auth_type = password
39
-username = {{ designate.username }}
40
-password = {{ designate.password }}
41
-memcached_servers = {{ address("memcached", memcached.port) }}
32
+{{ keystone_authtoken.keystone_authtoken(designate.username, designate.password) }}
42 33
 
43 34
 ########################
44 35
 ## Service Configuration

Loading…
Cancel
Save