diff options
| author | Jenkins <jenkins@review.openstack.org> | 2015-07-23 13:27:33 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2015-07-23 13:27:33 +0000 |
| commit | ea0c1a14cc223e5433f455948f1b9134fd5bf3de (patch) | |
| tree | 163f7ba307176dd889ff2bd804bf39189dedcc77 | |
| parent | 266ffe2d402d2f59eea0889e372dc0949f846ad0 (diff) | |
| parent | ad57661d519571b1679737683a30743c8365bdce (diff) | |
| download | kolla-ea0c1a14cc223e5433f455948f1b9134fd5bf3de.tar.gz kolla-ea0c1a14cc223e5433f455948f1b9134fd5bf3de.zip | |
Merge "Copy ml2_conf.ini to correct location"
| -rw-r--r-- | ansible/roles/neutron/tasks/config.yml | 26 |
1 files changed, 25 insertions, 1 deletions
diff --git a/ansible/roles/neutron/tasks/config.yml b/ansible/roles/neutron/tasks/config.yml index fcc7d6f5a..b8f902dff 100644 --- a/ansible/roles/neutron/tasks/config.yml +++ b/ansible/roles/neutron/tasks/config.yml @@ -21,6 +21,18 @@ - include: ../../config.yml vars: + service_name: "neutron-server" + config_source: + - "roles/{{ project_name }}/templates/ml2_conf.ini.j2" + - "/etc/kolla/config/{{ project_name }}/ml2_conf.ini" + config_template_dest: + - "{{ node_templates_directory }}/{{ service_name }}/ml2_conf.ini_minimal" + - "{{ node_templates_directory }}/{{ service_name }}/ml2_conf.ini_augment" + config_dest: "{{ node_config_directory }}/{{ service_name }}/ml2_conf.ini" + when: inventory_hostname in groups['neutron-server'] + +- include: ../../config.yml + vars: service_name: "neutron-agents" config_source: - "roles/{{ project_name }}/templates/neutron.conf.j2" @@ -41,6 +53,18 @@ - include: ../../config.yml vars: + service_name: "neutron-agents" + config_source: + - "roles/{{ project_name }}/templates/ml2_conf.ini.j2" + - "/etc/kolla/config/{{ project_name }}/ml2_conf.ini" + config_template_dest: + - "{{ node_templates_directory }}/{{ service_name }}/ml2_conf.ini_minimal" + - "{{ node_templates_directory }}/{{ service_name }}/ml2_conf.ini_augment" + config_dest: "{{ node_config_directory }}/{{ service_name }}/ml2_conf.ini" + when: inventory_hostname in groups['neutron-agents'] + +- include: ../../config.yml + vars: service_name: "neutron-openvswitch-agent" config_source: - "roles/{{ project_name }}/templates/neutron.conf.j2" @@ -69,6 +93,6 @@ config_template_dest: - "{{ node_templates_directory }}/{{ service_name }}/ml2_conf.ini_minimal" - "{{ node_templates_directory }}/{{ service_name }}/ml2_conf.ini_augment" - config_dest: "{{ node_config_directory }}/ml2_conf.ini" + config_dest: "{{ node_config_directory }}/{{ service_name }}/ml2_conf.ini" when: inventory_hostname in groups['neutron-agents'] or inventory_hostname in groups['compute'] |