Use keystone_authtoken macros for auth

Change-Id: I9bcb80bb843f46cf754e6395a34877c746ab66d2
Depends-on: Icd3a2276097a52e77a31cb7eeeffb2d5bca8492b
This commit is contained in:
Sergey Reshetnyak 2017-02-13 14:06:25 +03:00
parent f4f30a276f
commit 4e835f84fa
3 changed files with 6 additions and 13 deletions

View File

@ -9,6 +9,8 @@ configs:
server_port:
cont: 9696
ingress: network
username: neutron
password: password
core_plugin: "ml2"
ml2:
tenant_network_types:

View File

@ -61,16 +61,7 @@ max_retries = -1
max_pool_size = {{ neutron.db.max_pool_size }}
max_overflow = {{ neutron.db.max_overflow }}
[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 = {{ neutron.db.username }}
password = {{ neutron.db.password }}
memcached_servers = {{ address('memcached', memcached.port) }}
{{ keystone_authtoken.keystone_authtoken(neutron.username, neutron.password) }}
{% if searchlight is defined and (searchlight.services.neutron or searchlight.services.nova) %}
[oslo_messaging_notifications]

View File

@ -28,14 +28,14 @@ service:
- ml2-conf.ini
- name: neutron-user-create
dependencies:
- keystone-create-project
- keystone-create-domain
type: single
command: openstack user create --project service --password {{ neutron.db.password }} {{ neutron.db.username }}
command: openstack user create --domain {{ service_account.domain }} --password {{ neutron.password }} {{ neutron.username }}
- name: neutron-role-add
dependencies:
- neutron-user-create
type: single
command: openstack role add --project service --user {{ neutron.db.username }} admin
command: openstack role add --domain {{ service_account.domain }} --user {{ neutron.username }} admin
- name: neutron-service-create
dependencies:
- keystone