x
/
fuel-ccp-sahara
Code Issues Proposed changes

Merge "Use keystone_authtoken macros for auth"

This commit is contained in:
Jenkins 2017-02-15 20:00:03 +00:00 committed by Gerrit Code Review
parent c30a23b26c aa01cbb34b
commit 9e91ccd7c6
2 changed files with 4 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
service/files/sahara.conf.j2
View File

@ -19,16 +19,7 @@ heat_enable_wait_condition = {{ sahara.enable_wait_condition }}
connection = mysql+pymysql://{{ sahara.db.username }}:{{ sahara.db.password }}@{{ address(service.database) }}/{{ sahara.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 = {{ openstack.project_name }}
username = {{ sahara.auth.user }}
password = {{ sahara.auth.password }}
memcached_servers = {{ address("memcached", memcached.port) }}
{{ keystone_authtoken.keystone_authtoken(sahara.auth.user, sahara.auth.password) }}
# sahara trustor user
admin_password = {{ sahara.auth.password }}

6
service/sahara-api.yaml
View File

@ -27,14 +27,14 @@ service:
command: sahara-db-manage --config-file /etc/sahara/sahara.conf upgrade head
- name: sahara-user-create
dependencies:
- keystone
- keystone-create-domain
type: single
command: openstack user create --domain default --password {{ sahara.auth.password }} {{ sahara.auth.user }}
command: openstack user create --domain {{ service_account.domain }} --password {{ sahara.auth.password }} {{ sahara.auth.user }}
- name: sahara-role-add
dependencies:
- sahara-user-create
type: single
command: openstack role add --project {{ openstack.project_name }} --user {{ sahara.auth.user }} admin
command: openstack role add --domain {{ service_account.domain }} --user {{ sahara.auth.user }} admin
- name: sahara-service-create
dependencies:
- keystone