Use keystone_authtoken macros for auth

Change-Id: I583cab63faceb2708fe5ac3ea0edda6b9ea71fcf
Depends-on: Icd3a2276097a52e77a31cb7eeeffb2d5bca8492b
This commit is contained in:
Sergey Reshetnyak 2017-02-13 17:29:15 +03:00
parent 2b36d032a0
commit 3cec99bda5
2 changed files with 5 additions and 14 deletions

View File

@ -17,16 +17,7 @@ os_region_name = RegionOne
auth_uri = {{ address('keystone', keystone.public_port, with_scheme=True) }}
auth_url = {{ address('keystone', keystone.admin_port, with_scheme=True) }}
[keystone_authtoken]
auth_uri = {{ address('keystone', keystone.public_port, with_scheme=True) }}
auth_url = {{ address('keystone', keystone.admin_port, with_scheme=True) }}
auth_type = password
project_domain_id = default
user_domain_id = default
project_name = service
username = {{ searchlight.user }}
password = {{ searchlight.password }}
memcached_servers = {{ address("memcached", memcached.port) }}
{{ keystone_authtoken.keystone_authtoken(searchlight.user, searchlight.password) }}
[paste_deploy]
flavor = keystone

View File

@ -29,19 +29,19 @@ service:
command: searchlight-manage --config-file /etc/searchlight/searchlight.conf index sync --force
- name: searchlight-user-create
dependencies:
- keystone-create-project
- keystone-create-domain
type: single
command: openstack user create --domain default --password {{ searchlight.password }} {{ searchlight.user }}
command: openstack user create --domain {{ service_account.domain }} --password {{ searchlight.password }} {{ searchlight.user }}
- name: searchlight-admin-role-add
dependencies:
- searchlight-user-create
type: single
command: openstack role add --project service --user {{ searchlight.user }} admin
command: openstack role add --domain {{ service_account.domain }} --user {{ searchlight.user }} admin
- name: searchlight-service-create
dependencies:
- keystone-create-project
- keystone
type: single
command: openstack service create --name searchlight --description "Searchlight Service" search