Merge "Use keystoneauth macros in designate"

This commit is contained in:
Jenkins 2017-03-06 10:07:41 +00:00 committed by Gerrit Code Review
commit 78d0dcafd2
2 changed files with 5 additions and 13 deletions

View File

@ -26,14 +26,15 @@ service:
command: designate-manage --config-file /etc/designate/designate.conf database sync
- name: designate-user-create
dependencies:
- keystone-create-project
- keystone-create-domain
type: single
command: openstack user create --domain default --password {{ designate.password }} {{ designate.username }}
command: openstack user create --domain {{ service_account.domain }} --password {{ designate.password }} {{ designate.username }}
- name: designate-admin-role-add
dependencies:
- designate-user-create
- keystone-create-project
type: single
command: openstack role add --project service --user {{ designate.username }} admin
command: openstack role add --project {{ service_account.project }} --user {{ designate.username }} admin
- name: designate-service-create
dependencies:
- keystone-create-project

View File

@ -29,16 +29,7 @@ rabbit_hosts = {{ address("rabbitmq", rabbitmq.port) }}
#--------------------
# Keystone Middleware
#--------------------
[keystone_authtoken]
auth_uri = {{ address('keystone', keystone.public_port, with_scheme=True) }}
auth_url = {{ address('keystone', keystone.admin_port, with_scheme=True) }}
project_domain_name = Default
project_name = service
user_domain_name = Default
auth_type = password
username = {{ designate.username }}
password = {{ designate.password }}
memcached_servers = {{ address("memcached", memcached.port) }}
{{ keystone_authtoken.keystone_authtoken(designate.username, designate.password) }}
########################
## Service Configuration