Merge "TLS loadbalancer creation fails due to unread neutron_lbaas.conf"

This commit is contained in:
Jenkins 2017-01-16 14:32:42 +00:00 committed by Gerrit Code Review
commit 0ffd82b10c
2 changed files with 8 additions and 1 deletions
ansible/roles/neutron

@ -77,6 +77,7 @@
dest: "{{ node_config_directory }}/{{ item }}/neutron_lbaas.conf"
with_items:
- "neutron-server"
- "neutron-lbaas-agent"
- name: Copying over neutron_vpnaas.conf
merge_configs:

@ -1,5 +1,5 @@
{
"command": "neutron-lbaasv2-agent --config-file /etc/neutron/neutron.conf --config-file /etc/neutron/plugins/ml2/ml2_conf.ini --config-file /etc/neutron/lbaas_agent.ini",
"command": "neutron-lbaasv2-agent --config-file /etc/neutron/neutron.conf --config-file /etc/neutron/plugins/ml2/ml2_conf.ini --config-file /etc/neutron/lbaas_agent.ini --config-file /etc/neutron/neutron_lbaas.conf",
"config_files": [
{
"source": "{{ container_config_directory }}/neutron.conf",
@ -19,6 +19,12 @@
"owner": "neutron",
"perm": "0600"
},
{
"source": "{{ container_config_directory }}/neutron_lbaas.conf",
"dest": "/etc/neutron/neutron_lbaas.conf",
"owner": "neutron",
"perm": "0600"
},
{
"source": "{{ container_config_directory }}/policy.json",
"dest": "/etc/neutron/policy.json",