summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2017-03-06 10:07:41 +0000
committerGerrit Code Review <review@openstack.org>2017-03-06 10:07:41 +0000
commit78d0dcafd26ec16bca7a849a6a3003c5f2670328 (patch)
treecf88803ce04494411bee9e0a9ed11231dfe768c6
parent935a186bbc800b069b9c8d803280c4100da6deca (diff)
parent5941d5212d6dbeeca0450a10af60deff02b8e3c0 (diff)
Merge "Use keystoneauth macros in designate"
-rw-r--r--service/designate-api.yaml7
-rw-r--r--service/files/designate.conf.j211
2 files changed, 5 insertions, 13 deletions
diff --git a/service/designate-api.yaml b/service/designate-api.yaml
index 4c43b50..5796e34 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 16e28c4..0454033 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) }}
33auth_uri = {{ address('keystone', keystone.public_port, with_scheme=True) }}
34auth_url = {{ address('keystone', keystone.admin_port, with_scheme=True) }}
35project_domain_name = Default
36project_name = service
37user_domain_name = Default
38auth_type = password
39username = {{ designate.username }}
40password = {{ designate.password }}
41memcached_servers = {{ address("memcached", memcached.port) }}
42 33
43######################## 34########################
44## Service Configuration 35## Service Configuration