diff options
| author |   Harry Huang <huangxiangyu5@huawei.com> | 2017-01-25 20:54:29 +0800 |
|---|---|---|
| committer |   Justin chi <chigang@huawei.com> | 2017-02-09 06:45:05 +0000 |
| commit | 08fc4477bff0219d0277a63a9ab82a03087f7ef5 (patch) | |
| tree | 5403c41908596cb985fbd8df341d979a2583ded6 /deploy/adapters/ansible/roles/odl_cluster/tasks | |
| parent | 42634c9d279f6c1db38e0926a787fc33c2ef826f (diff) | |
Upgrade OpenDaylight to Boron ( l3 scenario )
JIRA: COMPASS-512
1. Use package distribution-karaf-0.5.2-Boron.tar.gz
2. Add configuring ACL
3. Remove neutron-l3 agent in odl_cluster role
4. Fix ODL l2 metadata problem
Change-Id: Ib14cdf3539deeeb91ebfec0450a9e7f0228f7741
Signed-off-by: Harry Huang <huangxiangyu5@huawei.com>
Diffstat (limited to 'deploy/adapters/ansible/roles/odl_cluster/tasks')
| -rw-r--r-- | deploy/adapters/ansible/roles/odl_cluster/tasks/01_03_copy_odl_configuration_files.yml | 9 | ||||
| -rw-r--r-- | deploy/adapters/ansible/roles/odl_cluster/tasks/01_08_configure_neutron.yml | 18 |
2 files changed, 27 insertions, 0 deletions
diff --git a/deploy/adapters/ansible/roles/odl_cluster/tasks/01_03_copy_odl_configuration_files.yml b/deploy/adapters/ansible/roles/odl_cluster/tasks/01_03_copy_odl_configuration_files.yml index f4e87955..41aca7ee 100644 --- a/deploy/adapters/ansible/roles/odl_cluster/tasks/01_03_copy_odl_configuration_files.yml +++ b/deploy/adapters/ansible/roles/odl_cluster/tasks/01_03_copy_odl_configuration_files.yml @@ -40,6 +40,15 @@ mode: 0775 when: ansible_os_family == "RedHat" +- name: copy acl configuration script + template: + src: acl_conf.sh + dest: "/opt/acl_conf.sh" + mode: 0777 + +- name: execute acl configuration script + command: su -s /bin/sh -c "/opt/acl_conf.sh;" + - name: create tomcat config template: src: tomcat-server.xml diff --git a/deploy/adapters/ansible/roles/odl_cluster/tasks/01_08_configure_neutron.yml b/deploy/adapters/ansible/roles/odl_cluster/tasks/01_08_configure_neutron.yml index 12c1fd25..5135c8cf 100644 --- a/deploy/adapters/ansible/roles/odl_cluster/tasks/01_08_configure_neutron.yml +++ b/deploy/adapters/ansible/roles/odl_cluster/tasks/01_08_configure_neutron.yml @@ -32,6 +32,24 @@ enable_isolated_metadata "True"; when: odl_l3_agent == "Enable" +- name: force metadata for l3 configuration + shell: | + crudini --set /etc/neutron/dhcp_agent.ini DEFAULT \ + force_metadata "True"; + when: odl_l3_agent == "Enable" + +- name: stop neutron l3 agent + service: name=neutron-l3-agent state=stopped enabled=no + when: odl_l3_agent == "Enable" and inventory_hostname in groups['odl'] + +- name: remove neutron l3 agent + shell: > + sed -i '/neutron-l3-agent/d' /opt/service; + rm -rf /lib/systemd/system/neutron-l3-agent.service; + rm -rf /etc/init/neutron-l3-agent.conf; + rm -rf /etc/init.d/neutron-l3-agent; + when: odl_l3_agent == "Enable" and inventory_hostname in groups['odl'] + - name: drop and recreate neutron database shell: | mysql -e "drop database if exists neutron;"; |