x
/
fuel-ccp-cinder
Code Issues Proposed changes

Adust to per-service configuration 

Change-Id: I24b0e7ac4fcc798933a5492ad36533b0fdb1b8df
Depends-On: Ia4d29167cea6dfd19a1970706aafda51a31d5b24
This commit is contained in:
Andrey Pavlov 2017-02-27 09:39:39 +00:00
parent 174a58f33b
commit 63b87ca726
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
service/cinder-api.yaml
View File

@ -9,10 +9,10 @@ service:
pre: pre:
- name: cinder-db-create - name: cinder-db-create
dependencies: dependencies:
- {{ service.database }} - database
type: single type: single
command: 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 }}' create user '{{ cinder.db.username }}'@'%' identified by '{{ cinder.db.password }}'
{% if db.tls.enabled %} require ssl {% endif %}; {% if db.tls.enabled %} require ssl {% endif %};
grant all privileges on {{ cinder.db.name }}.* to '{{ cinder.db.username }}'@'%' identified by '{{ cinder.db.password }}' grant all privileges on {{ cinder.db.name }}.* to '{{ cinder.db.username }}'@'%' identified by '{{ cinder.db.password }}'
@ -107,8 +107,8 @@ service:
- cinder-conf - cinder-conf
dependencies: dependencies:
- memcached - memcached
- "{{ messaging.dependencies[messaging.backend.rpc] }}" - rpc
- "{{ messaging.dependencies[messaging.backend.notifications] }}" - notifications
# {% if cinder.tls.enabled %} # {% if cinder.tls.enabled %}
- name: nginx-cinder-api - name: nginx-cinder-api
image: nginx image: nginx

2
service/files/cinder.conf.j2
View File

@ -23,7 +23,7 @@ glance_catalog_info = image:glance:internalURL
auth_strategy = keystone auth_strategy = keystone
[database] [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 max_retries = -1
{{ keystone_authtoken.keystone_authtoken(cinder.username, cinder.password) }} {{ keystone_authtoken.keystone_authtoken(cinder.username, cinder.password) }}