diff options
| author | Jenkins <jenkins@review.openstack.org> | 2016-08-15 15:53:34 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2016-08-15 15:53:34 +0000 |
| commit | ec569e752d7464307c40aa371fd4ef8788ed8737 (patch) | |
| tree | 1bbd202c8064bae7ee2927bcaa8032525b265032 /ansible | |
| parent | 55ddbad92ae08805479e67691f158bce7abdbf10 (diff) | |
| parent | 512be70cee96f6d72744094ec2226bf75fc9d16e (diff) | |
| download | kolla-ec569e752d7464307c40aa371fd4ef8788ed8737.tar.gz kolla-ec569e752d7464307c40aa371fd4ef8788ed8737.zip | |
Merge "Fix the neutron-lbaas-agent container issues"
Diffstat (limited to 'ansible')
| -rw-r--r-- | ansible/roles/neutron/tasks/config.yml | 1 | ||||
| -rw-r--r-- | ansible/roles/neutron/tasks/start.yml | 1 | ||||
| -rw-r--r-- | ansible/roles/neutron/templates/lbaas_agent.ini.j2 | 10 | ||||
| -rw-r--r-- | ansible/roles/neutron/templates/neutron-lbaas-agent.json.j2 | 8 |
4 files changed, 9 insertions, 11 deletions
diff --git a/ansible/roles/neutron/tasks/config.yml b/ansible/roles/neutron/tasks/config.yml index 3495611aa..3ece8199b 100644 --- a/ansible/roles/neutron/tasks/config.yml +++ b/ansible/roles/neutron/tasks/config.yml @@ -75,6 +75,7 @@ - "neutron-dhcp-agent" - "neutron-l3-agent" - "neutron-linuxbridge-agent" + - "neutron-lbaas-agent" - "neutron-metadata-agent" - "neutron-openvswitch-agent" - "neutron-server" diff --git a/ansible/roles/neutron/tasks/start.yml b/ansible/roles/neutron/tasks/start.yml index 80e65b601..0d29efe25 100644 --- a/ansible/roles/neutron/tasks/start.yml +++ b/ansible/roles/neutron/tasks/start.yml @@ -196,6 +196,7 @@ privileged: True volumes: - "{{ node_config_directory }}/neutron-lbaas-agent/:{{ container_config_directory }}/:ro" + - "/etc/localtime:/etc/localtime:ro" - "/run:/run" - "/run/netns/:/run/netns/:shared" - "neutron_metadata_socket:/var/lib/neutron/kolla/" diff --git a/ansible/roles/neutron/templates/lbaas_agent.ini.j2 b/ansible/roles/neutron/templates/lbaas_agent.ini.j2 index b9545ec1c..973bd6180 100644 --- a/ansible/roles/neutron/templates/lbaas_agent.ini.j2 +++ b/ansible/roles/neutron/templates/lbaas_agent.ini.j2 @@ -1,15 +1,5 @@ [DEFAULT] debug = {{ neutron_logging_debug }} - -output_file = /etc/neutron/lbaas_agent.ini -wrap_width = 79 - -{% if neutron_plugin_agent == "openvswitch" %} -interface_driver = neutron.agent.linux.interface.OVSInterfaceDriver -{% elif neutron_plugin_agent == "linuxbridge" %} -interface_driver = neutron.agent.linux.interface.BridgeInterfaceDriver -{% endif %} - device_driver = neutron_lbaas.drivers.haproxy.namespace_driver.HaproxyNSDriver [haproxy] diff --git a/ansible/roles/neutron/templates/neutron-lbaas-agent.json.j2 b/ansible/roles/neutron/templates/neutron-lbaas-agent.json.j2 index 541a25524..6bb45cdee 100644 --- a/ansible/roles/neutron/templates/neutron-lbaas-agent.json.j2 +++ b/ansible/roles/neutron/templates/neutron-lbaas-agent.json.j2 @@ -1,5 +1,5 @@ { - "command": "neutron-lbaasv2-agent --config-file /etc/neutron/neutron.conf --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_files": [ { "source": "{{ container_config_directory }}/neutron.conf", @@ -12,6 +12,12 @@ "dest": "/etc/neutron/lbaas_agent.ini", "owner": "neutron", "perm": "0600" + }, + { + "source": "{{ container_config_directory }}/ml2_conf.ini", + "dest": "/etc/neutron/plugins/ml2/ml2_conf.ini", + "owner": "neutron", + "perm": "0600" } ] } |