Merge "Adjust to per-service configuration"

This commit is contained in:
Jenkins 2017-03-03 13:54:52 +00:00 committed by Gerrit Code Review
commit ec31b94d6c
2 changed files with 5 additions and 5 deletions

View File

@ -9,10 +9,10 @@ service:
pre:
- name: cinder-db-create
dependencies:
- {{ service.database }}
- database
type: single
command:
mysql -u root -p{{ db.root_password }} -h {{ address(service.database) }} -e "create database {{ cinder.db.name }};
mysql -u root -p{{ db.root_password }} -h {{ address("database") }} -e "create database {{ cinder.db.name }};
create user '{{ cinder.db.username }}'@'%' identified by '{{ cinder.db.password }}'
{% if db.tls.enabled %} require ssl {% endif %};
grant all privileges on {{ cinder.db.name }}.* to '{{ cinder.db.username }}'@'%' identified by '{{ cinder.db.password }}'
@ -107,8 +107,8 @@ service:
- cinder-conf
dependencies:
- memcached
- "{{ messaging.dependencies[messaging.backend.rpc] }}"
- "{{ messaging.dependencies[messaging.backend.notifications] }}"
- rpc
- notifications
# {% if cinder.tls.enabled %}
- name: nginx-cinder-api
image: nginx

View File

@ -23,7 +23,7 @@ glance_catalog_info = image:glance:internalURL
auth_strategy = keystone
[database]
connection = mysql+pymysql://{{ cinder.db.username }}:{{ cinder.db.password }}@{{ address(service.database) }}/{{ cinder.db.name }}{% if db.tls.enabled %}?ssl_ca=/opt/ccp/etc/tls/ca.pem{% endif %}
connection = mysql+pymysql://{{ cinder.db.username }}:{{ cinder.db.password }}@{{ address("database") }}/{{ cinder.db.name }}{% if db.tls.enabled %}?ssl_ca=/opt/ccp/etc/tls/ca.pem{% endif %}
max_retries = -1
{{ keystone_authtoken.keystone_authtoken(cinder.username, cinder.password) }}