Browse Source

Merge "Use keystone_authtoken macros for auth"

changes/48/434748/1
Jenkins Gerrit Code Review 3 years ago
parent
commit
a0320952ab
3 changed files with 4 additions and 26 deletions
  1. +1
    -11
      service/files/glance-api.conf.j2
  2. +0
    -11
      service/files/glance-registry.conf.j2
  3. +3
    -4
      service/glance-api.yaml

+ 1
- 11
service/files/glance-api.conf.j2 View File

@@ -19,17 +19,7 @@ show_multiple_locations = true
connection = mysql+pymysql://{{ glance.db.username }}:{{ glance.db.password }}@{{ address(service.database) }}/{{ glance.db.name }}{% if percona.tls.enabled %}?ssl_ca=/opt/ccp/etc/tls/ca.pem{% endif %}
max_retries = -1

[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 = {{ glance.user }}
password = {{ glance.password }}
memcached_servers = {{ address('memcached', memcached.port) }}

{{ keystone_authtoken.keystone_authtoken(glance.user, glance.password) }}

[paste_deploy]
flavor = keystone


+ 0
- 11
service/files/glance-registry.conf.j2 View File

@@ -12,17 +12,6 @@ bind_port = {{ glance.registry_port.cont }}
connection = mysql+pymysql://{{ glance.db.username }}:{{ glance.db.password }}@{{ address(service.database) }}/{{ glance.db.name }}{% if percona.tls.enabled %}?ssl_ca=/opt/ccp/etc/tls/ca.pem{% endif %}
max_retries = -1

[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 = {{ glance.user }}
password = {{ glance.password }}
memcached_servers = {{ address('memcached', memcached.port) }}

[paste_deploy]
flavor = keystone



+ 3
- 4
service/glance-api.yaml View File

@@ -30,15 +30,14 @@ service:
command: glance-manage db_sync
- name: glance-user-create
dependencies:
- keystone
- keystone-create-domain
type: single
command: openstack user create --domain default --password {{ glance.password }} {{ glance.user }}
command: openstack user create --domain {{ service_account.domain }} --password {{ glance.password }} {{ glance.user }}
- name: glance-role-add
dependencies:
- glance-user-create
- keystone-create-project
type: single
command: openstack role add --project service --user {{ glance.user }} admin
command: openstack role add --domain {{ service_account.domain }} --user {{ glance.user }} admin
- name: glance-service-create
dependencies:
- keystone


Loading…
Cancel
Save