x
/
fuel-ccp-neutron
Code Issues Proposed changes

Use database service name from config 

Change-Id: I5d4ed433e2c9dc752e95e000b9b968e872705f4d
Depends-on: Iacc3f02fdd4f39edb5c95d144ffff00b65baa55a
This commit is contained in:
Sergey Reshetnyak 2016-11-17 15:58:16 +03:00
parent 5b0f1ba381
commit 674e26a391
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -55,7 +55,7 @@ root_helper = sudo neutron-rootwrap /etc/neutron/rootwrap.conf
root_helper_daemon = sudo neutron-rootwrap-daemon /etc/neutron/rootwrap.conf
[database]
connection = mysql+pymysql://{{ neutron.db.username }}:{{ neutron.db.password }}@{{ address('mariadb') }}/{{ neutron.db.name }}
connection = mysql+pymysql://{{ neutron.db.username }}:{{ neutron.db.password }}@{{ address(service.database) }}/{{ neutron.db.name }}
max_retries = -1
[keystone_authtoken]

4
service/neutron-server.yaml
View File

@ -13,9 +13,9 @@ service:
pre:
- name: neutron-db-create
dependencies:
- mariadb
- {{ service.database }}
type: single
command: mysql -u root -p{{ db.root_password }} -h {{ address('mariadb') }} -e 'create database `{{ neutron.db.name }}`;
command: mysql -u root -p{{ db.root_password }} -h {{ address(service.database) }} -e 'create database `{{ neutron.db.name }}`;
grant all privileges on `{{ neutron.db.name }}`.* to "{{ neutron.db.username }}"@"%" identified by "{{ neutron.db.password }}"'
- name: neutron-db-sync
type: single