Merge "Glance user should belong to service project, not admin"

This commit is contained in:
Jenkins 2016-12-09 09:55:47 +00:00 committed by Gerrit Code Review
commit 3428df27e0
3 changed files with 3 additions and 3 deletions

View File

@ -27,7 +27,7 @@ auth_url = {{ address('keystone', keystone.admin_port, with_scheme=True) }}
auth_type = password
project_domain_id = default
user_domain_id = default
project_name = {{ openstack.project_name }}
project_name = service
username = {{ glance.user }}
password = {{ glance.password }}
memcached_servers = {{ address('memcached', memcached.port) }}

View File

@ -1,7 +1,7 @@
[swift]
auth_version = 3
auth_address = {{ address('keystone', keystone.public_port, with_scheme=True) }}/v3
user = {{ openstack.project_name }}:{{ glance.user }}
user = service:{{ glance.user }}
key = {{ glance.password }}
project_domain_id = default
user_domain_id = default

View File

@ -36,7 +36,7 @@ service:
dependencies:
- glance-user-create
type: single
command: openstack role add --project {{ openstack.project_name }} --user {{ glance.user }} admin
command: openstack role add --project service --user {{ glance.user }} admin
- name: glance-service-create
dependencies:
- keystone