diff options
author | Sergey Kraynev <skraynev@mirantis.com> | 2017-03-02 13:03:31 +0000 |
---|---|---|
committer | Sergey Kraynev <skraynev@mirantis.com> | 2017-03-03 08:27:00 +0000 |
commit | 5941d5212d6dbeeca0450a10af60deff02b8e3c0 (patch) | |
tree | 6734b08b7dad1b0d228d0682052fe1a5d238982f | |
parent | 6d351b3fc23e80d28c040eff40d3a1588024a192 (diff) |
Use keystoneauth macros in designate
Change-Id: I60c5e22b68fabe7eb17ccb6f5f8f13d45ae6c320
Notes
Notes (review):
Code-Review+2: Andrey Pavlov <apavlov@mirantis.com>
Code-Review+2: Proskurin Kirill <kproskurin@mirantis.com>
Workflow+1: Proskurin Kirill <kproskurin@mirantis.com>
Verified+2: Jenkins
Submitted-by: Jenkins
Submitted-at: Mon, 06 Mar 2017 10:07:41 +0000
Reviewed-on: https://review.openstack.org/440944
Project: openstack/fuel-ccp-designate
Branch: refs/heads/master
-rw-r--r-- | service/designate-api.yaml | 7 | ||||
-rw-r--r-- | service/files/designate.conf.j2 | 11 |
2 files changed, 5 insertions, 13 deletions
diff --git a/service/designate-api.yaml b/service/designate-api.yaml index 8e00bcf..42cf754 100644 --- a/service/designate-api.yaml +++ b/service/designate-api.yaml | |||
@@ -26,14 +26,15 @@ service: | |||
26 | command: designate-manage --config-file /etc/designate/designate.conf database sync | 26 | command: designate-manage --config-file /etc/designate/designate.conf database sync |
27 | - name: designate-user-create | 27 | - name: designate-user-create |
28 | dependencies: | 28 | dependencies: |
29 | - keystone-create-project | 29 | - keystone-create-domain |
30 | type: single | 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 | - name: designate-admin-role-add | 32 | - name: designate-admin-role-add |
33 | dependencies: | 33 | dependencies: |
34 | - designate-user-create | 34 | - designate-user-create |
35 | - keystone-create-project | ||
35 | type: single | 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 | - name: designate-service-create | 38 | - name: designate-service-create |
38 | dependencies: | 39 | dependencies: |
39 | - keystone-create-project | 40 | - keystone-create-project |
diff --git a/service/files/designate.conf.j2 b/service/files/designate.conf.j2 index 89e81c9..25ec5d6 100644 --- a/service/files/designate.conf.j2 +++ b/service/files/designate.conf.j2 | |||
@@ -29,16 +29,7 @@ rabbit_hosts = {{ address("rabbitmq", rabbitmq.port) }} | |||
29 | #-------------------- | 29 | #-------------------- |
30 | # Keystone Middleware | 30 | # Keystone Middleware |
31 | #-------------------- | 31 | #-------------------- |
32 | [keystone_authtoken] | 32 | {{ keystone_authtoken.keystone_authtoken(designate.username, designate.password) }} |
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) }} | ||
42 | 33 | ||
43 | ######################## | 34 | ######################## |
44 | ## Service Configuration | 35 | ## Service Configuration |