Adjust to per-service configuration
Change-Id: Ibff46ab612b0e1ac2a35fddd66550c6435d165ca Depends-On: Ia4d29167cea6dfd19a1970706aafda51a31d5b24
This commit is contained in:
parent
209dd8728f
commit
53e98a28f2
|
@ -15,8 +15,8 @@ service:
|
|||
command: calico-dhcp-agent --config-file /etc/neutron/neutron.conf --config-file /etc/neutron/plugins/ml2/ml2_conf.ini
|
||||
dependencies:
|
||||
- neutron-db-sync
|
||||
- "{{ messaging.dependencies[messaging.backend.rpc] }}"
|
||||
- "{{ messaging.dependencies[messaging.backend.notifications] }}"
|
||||
- rpc
|
||||
- notifications
|
||||
files:
|
||||
- neutron.conf
|
||||
- ml2-conf.ini
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
#!/bin/bash -ex
|
||||
set -o pipefail
|
||||
BACKUP_FILE="/var/ccp/backup/neutron/backup-$(date "+%Y%m%d%H%M%S").sql"
|
||||
mysqldump {% if db.tls.enabled %} --ssl-mode REQUIRED {% endif %} -h {{ address(service.database) }} \
|
||||
mysqldump {% if db.tls.enabled %} --ssl-mode REQUIRED {% endif %} -h {{ address("database") }} \
|
||||
-u {{ neutron.db.username }} -p{{ neutron.db.password }} \
|
||||
--single-transaction {{ neutron.db.name }} > "${BACKUP_FILE}"
|
||||
|
|
|
@ -56,7 +56,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(service.database) }}/{{ neutron.db.name }}{% if db.tls.enabled %}?ssl_ca=/opt/ccp/etc/tls/ca.pem{% endif %}
|
||||
connection = mysql+pymysql://{{ neutron.db.username }}:{{ neutron.db.password }}@{{ address("database") }}/{{ neutron.db.name }}{% if db.tls.enabled %}?ssl_ca=/opt/ccp/etc/tls/ca.pem{% endif %}
|
||||
max_retries = -1
|
||||
max_pool_size = {{ neutron.db.max_pool_size }}
|
||||
max_overflow = {{ neutron.db.max_overflow }}
|
||||
|
|
|
@ -18,8 +18,8 @@ service:
|
|||
command: neutron-dhcp-agent --config-file /etc/neutron/neutron.conf --config-file /etc/neutron/dhcp_agent.ini
|
||||
dependencies:
|
||||
- neutron-db-sync
|
||||
- "{{ messaging.dependencies[messaging.backend.rpc] }}"
|
||||
- "{{ messaging.dependencies[messaging.backend.notifications] }}"
|
||||
- rpc
|
||||
- notifications
|
||||
files:
|
||||
- neutron.conf
|
||||
- ml2-conf.ini
|
||||
|
|
|
@ -18,8 +18,8 @@ service:
|
|||
command: neutron-l3-agent --config-file /etc/neutron/neutron.conf --config-file /etc/neutron/l3_agent.ini --config-file /etc/neutron/plugins/ml2/ml2_conf.ini
|
||||
dependencies:
|
||||
- neutron-db-sync
|
||||
- "{{ messaging.dependencies[messaging.backend.rpc] }}"
|
||||
- "{{ messaging.dependencies[messaging.backend.notifications] }}"
|
||||
- rpc
|
||||
- notifications
|
||||
files:
|
||||
- neutron.conf
|
||||
- ml2-conf.ini
|
||||
|
|
|
@ -17,7 +17,7 @@ service:
|
|||
command: neutron-metadata-agent --config-file /etc/neutron/neutron.conf --config-file /etc/neutron/metadata-agent.ini
|
||||
dependencies:
|
||||
- neutron-db-sync
|
||||
- "{{ messaging.dependencies[messaging.backend.rpc] }}"
|
||||
- rpc
|
||||
files:
|
||||
- neutron.conf
|
||||
- ml2-conf.ini
|
||||
|
|
|
@ -18,8 +18,8 @@ service:
|
|||
command: neutron-openvswitch-agent --config-file /etc/neutron/neutron.conf --config-file /etc/neutron/plugins/ml2/ml2_conf.ini
|
||||
dependencies:
|
||||
- neutron-db-sync
|
||||
- "{{ messaging.dependencies[messaging.backend.rpc] }}"
|
||||
- "{{ messaging.dependencies[messaging.backend.notifications] }}"
|
||||
- rpc
|
||||
- notifications
|
||||
- openvswitch-vswitchd:local
|
||||
files:
|
||||
- neutron.conf
|
||||
|
|
|
@ -15,9 +15,9 @@ service:
|
|||
pre:
|
||||
- name: neutron-db-create
|
||||
dependencies:
|
||||
- {{ service.database }}
|
||||
- database
|
||||
type: single
|
||||
command: mysql -u root -p{{ db.root_password }} -h {{ address(service.database) }} -e 'create database `{{ neutron.db.name }}`;
|
||||
command: mysql -u root -p{{ db.root_password }} -h {{ address("database") }} -e 'create database `{{ neutron.db.name }}`;
|
||||
create user "{{ neutron.db.username }}"@"%" identified by "{{ neutron.db.password }}"
|
||||
{% if db.tls.enabled %} require ssl {% endif %};
|
||||
grant all privileges on `{{ neutron.db.name }}`.* to "{{ neutron.db.username }}"@"%" identified by "{{ neutron.db.password }}"
|
||||
|
@ -26,8 +26,8 @@ service:
|
|||
type: single
|
||||
command: neutron-db-manage --config-file /etc/neutron/neutron.conf --config-file /etc/neutron/plugins/ml2/ml2_conf.ini upgrade head
|
||||
dependencies:
|
||||
- "{{ messaging.dependencies[messaging.backend.rpc] }}"
|
||||
- "{{ messaging.dependencies[messaging.backend.notifications] }}"
|
||||
- rpc
|
||||
- notifications
|
||||
- neutron-db-create
|
||||
files:
|
||||
- neutron.conf
|
||||
|
|
Loading…
Reference in New Issue