Merge "Use keystone_authtoken macros for auth"
This commit is contained in:
commit
8ac8f8feaa
|
@ -9,6 +9,8 @@ configs:
|
||||||
server_port:
|
server_port:
|
||||||
cont: 9696
|
cont: 9696
|
||||||
ingress: network
|
ingress: network
|
||||||
|
username: neutron
|
||||||
|
password: password
|
||||||
core_plugin: "ml2"
|
core_plugin: "ml2"
|
||||||
ml2:
|
ml2:
|
||||||
tenant_network_types:
|
tenant_network_types:
|
||||||
|
|
|
@ -61,16 +61,7 @@ max_retries = -1
|
||||||
max_pool_size = {{ neutron.db.max_pool_size }}
|
max_pool_size = {{ neutron.db.max_pool_size }}
|
||||||
max_overflow = {{ neutron.db.max_overflow }}
|
max_overflow = {{ neutron.db.max_overflow }}
|
||||||
|
|
||||||
[keystone_authtoken]
|
{{ keystone_authtoken.keystone_authtoken(neutron.username, neutron.password) }}
|
||||||
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) }}
|
|
||||||
|
|
||||||
{% if searchlight is defined and (searchlight.services.neutron or searchlight.services.nova) %}
|
{% if searchlight is defined and (searchlight.services.neutron or searchlight.services.nova) %}
|
||||||
[oslo_messaging_notifications]
|
[oslo_messaging_notifications]
|
||||||
|
|
|
@ -34,14 +34,14 @@ service:
|
||||||
- ml2-conf.ini
|
- ml2-conf.ini
|
||||||
- name: neutron-user-create
|
- name: neutron-user-create
|
||||||
dependencies:
|
dependencies:
|
||||||
- keystone-create-project
|
- keystone-create-domain
|
||||||
type: single
|
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
|
- name: neutron-role-add
|
||||||
dependencies:
|
dependencies:
|
||||||
- neutron-user-create
|
- neutron-user-create
|
||||||
type: single
|
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
|
- name: neutron-service-create
|
||||||
dependencies:
|
dependencies:
|
||||||
- keystone
|
- keystone
|
||||||
|
|
Loading…
Reference in New Issue