From 95ecdb773c9fa90f9e4f1f792f5cc5dc8328fd6a Mon Sep 17 00:00:00 2001 From: chigang Date: Fri, 30 Jun 2017 20:24:25 +0800 Subject: Remove obsoleted code JIRA:- use OpenStack-ansible deploy openstack, so remove obsoleted code. Some of the enhanced features will be added in later versions Change-Id: Ie92b92b5de234a7d7d03b578b0bc15fd0218b3b3 Signed-off-by: chigang --- .../roles/odl_cluster/tasks/00_odl_common.yml | 13 ----- .../odl_cluster/tasks/01_00_download_packages.yml | 33 ------------- .../tasks/01_01_create_odl_user_and_group.yml | 21 --------- .../tasks/01_02_unarchive_odl_and_jdk.yml | 26 ---------- .../tasks/01_03_copy_odl_configuration_files.yml | 55 ---------------------- .../tasks/01_04_install_pip_packages.yml | 25 ---------- .../tasks/01_05_clean_up_karaf_data.yml | 12 ----- .../tasks/01_06_stop_openstack_services.yml | 34 ------------- .../odl_cluster/tasks/01_07_start_check_odl.yml | 31 ------------ .../odl_cluster/tasks/01_08_configure_neutron.yml | 54 --------------------- .../roles/odl_cluster/tasks/01_odl_controller.yml | 43 ----------------- .../roles/odl_cluster/tasks/02_odl_compute.yml | 12 ----- .../03_00_switch_off_neutron_openvswitch_agent.yml | 23 --------- .../03_01_clean_up_and_restart_openvswitch.yml | 16 ------- .../03_02_openvswitch_connect_opendaylight.yml | 36 -------------- .../tasks/03_03_00_recover_external_network_l3.yml | 45 ------------------ .../tasks/03_03_01_recover_external_network_l2.yml | 27 ----------- .../tasks/03_03_recover_external_network.yml | 22 --------- .../roles/odl_cluster/tasks/03_04_setup_ml2.yml | 25 ---------- .../roles/odl_cluster/tasks/03_openvswitch.yml | 24 ---------- .../roles/odl_cluster/tasks/04_odl_l3_nova.yml | 15 ------ .../tasks/05_set_opendaylight_cluster.yml | 34 ------------- .../ansible/roles/odl_cluster/tasks/main.yml | 24 ---------- 23 files changed, 650 deletions(-) delete mode 100644 deploy/adapters/ansible/roles/odl_cluster/tasks/00_odl_common.yml delete mode 100644 deploy/adapters/ansible/roles/odl_cluster/tasks/01_00_download_packages.yml delete mode 100644 deploy/adapters/ansible/roles/odl_cluster/tasks/01_01_create_odl_user_and_group.yml delete mode 100644 deploy/adapters/ansible/roles/odl_cluster/tasks/01_02_unarchive_odl_and_jdk.yml delete mode 100644 deploy/adapters/ansible/roles/odl_cluster/tasks/01_03_copy_odl_configuration_files.yml delete mode 100644 deploy/adapters/ansible/roles/odl_cluster/tasks/01_04_install_pip_packages.yml delete mode 100644 deploy/adapters/ansible/roles/odl_cluster/tasks/01_05_clean_up_karaf_data.yml delete mode 100644 deploy/adapters/ansible/roles/odl_cluster/tasks/01_06_stop_openstack_services.yml delete mode 100644 deploy/adapters/ansible/roles/odl_cluster/tasks/01_07_start_check_odl.yml delete mode 100644 deploy/adapters/ansible/roles/odl_cluster/tasks/01_08_configure_neutron.yml delete mode 100644 deploy/adapters/ansible/roles/odl_cluster/tasks/01_odl_controller.yml delete mode 100644 deploy/adapters/ansible/roles/odl_cluster/tasks/02_odl_compute.yml delete mode 100644 deploy/adapters/ansible/roles/odl_cluster/tasks/03_00_switch_off_neutron_openvswitch_agent.yml delete mode 100644 deploy/adapters/ansible/roles/odl_cluster/tasks/03_01_clean_up_and_restart_openvswitch.yml delete mode 100644 deploy/adapters/ansible/roles/odl_cluster/tasks/03_02_openvswitch_connect_opendaylight.yml delete mode 100644 deploy/adapters/ansible/roles/odl_cluster/tasks/03_03_00_recover_external_network_l3.yml delete mode 100644 deploy/adapters/ansible/roles/odl_cluster/tasks/03_03_01_recover_external_network_l2.yml delete mode 100644 deploy/adapters/ansible/roles/odl_cluster/tasks/03_03_recover_external_network.yml delete mode 100644 deploy/adapters/ansible/roles/odl_cluster/tasks/03_04_setup_ml2.yml delete mode 100644 deploy/adapters/ansible/roles/odl_cluster/tasks/03_openvswitch.yml delete mode 100644 deploy/adapters/ansible/roles/odl_cluster/tasks/04_odl_l3_nova.yml delete mode 100644 deploy/adapters/ansible/roles/odl_cluster/tasks/05_set_opendaylight_cluster.yml delete mode 100644 deploy/adapters/ansible/roles/odl_cluster/tasks/main.yml (limited to 'deploy/adapters/ansible/roles/odl_cluster/tasks') diff --git a/deploy/adapters/ansible/roles/odl_cluster/tasks/00_odl_common.yml b/deploy/adapters/ansible/roles/odl_cluster/tasks/00_odl_common.yml deleted file mode 100644 index 55b29b3e..00000000 --- a/deploy/adapters/ansible/roles/odl_cluster/tasks/00_odl_common.yml +++ /dev/null @@ -1,13 +0,0 @@ -############################################################################## -# Copyright (c) 2016 HUAWEI TECHNOLOGIES CO.,LTD and others. -# -# All rights reserved. This program and the accompanying materials -# are made available under the terms of the Apache License, Version 2.0 -# which accompanies this distribution, and is available at -# http://www.apache.org/licenses/LICENSE-2.0 -############################################################################## ---- - -- name: install controller packages - action: "{{ ansible_pkg_mgr }} name={{ item }} state=present" - with_items: "{{ common_packages | union(common_packages_noarch) }}" diff --git a/deploy/adapters/ansible/roles/odl_cluster/tasks/01_00_download_packages.yml b/deploy/adapters/ansible/roles/odl_cluster/tasks/01_00_download_packages.yml deleted file mode 100644 index 565fc7ef..00000000 --- a/deploy/adapters/ansible/roles/odl_cluster/tasks/01_00_download_packages.yml +++ /dev/null @@ -1,33 +0,0 @@ -############################################################################## -# Copyright (c) 2016 HUAWEI TECHNOLOGIES CO.,LTD and others. -# -# All rights reserved. This program and the accompanying materials -# are made available under the terms of the Apache License, Version 2.0 -# which accompanies this distribution, and is available at -# http://www.apache.org/licenses/LICENSE-2.0 -############################################################################## ---- - -- name: get image http server - shell: awk -F'=' '/compass_server/ {print $2}' /etc/compass.conf - register: http_server - -- name: download oracle-jdk8 package file - get_url: - url: "http://{{ http_server.stdout_lines[0] }}/packages/java/{{ jdk8_pkg_name }}" - dest: /opt/{{ jdk8_pkg_name }} - -- name: download oracle-jdk8 script file - get_url: - url: "http://{{ http_server.stdout_lines[0] }}/packages/java/{{ jdk8_script_name }}" - dest: /opt/ - -- name: download odl package - get_url: - url: "http://{{ http_server.stdout_lines[0] }}/packages/odl/{{ odl_pkg_url }}" - dest: /opt/{{ odl_pkg_name }} - -- name: download odl pip package - get_url: - url: "http://{{ http_server.stdout_lines[0] }}/pip-openstack/{{ networking_odl_pkg_name }}" - dest: /opt/{{ networking_odl_pkg_name }} diff --git a/deploy/adapters/ansible/roles/odl_cluster/tasks/01_01_create_odl_user_and_group.yml b/deploy/adapters/ansible/roles/odl_cluster/tasks/01_01_create_odl_user_and_group.yml deleted file mode 100644 index cd6e9751..00000000 --- a/deploy/adapters/ansible/roles/odl_cluster/tasks/01_01_create_odl_user_and_group.yml +++ /dev/null @@ -1,21 +0,0 @@ -############################################################################## -# Copyright (c) 2016 HUAWEI TECHNOLOGIES CO.,LTD and others. -# -# All rights reserved. This program and the accompanying materials -# are made available under the terms of the Apache License, Version 2.0 -# which accompanies this distribution, and is available at -# http://www.apache.org/licenses/LICENSE-2.0 -############################################################################## ---- - -- name: create odl group - group: name=odl system=yes state=present - -- name: create odl user - user: - name: odl - group: odl - home: "{{ odl_home }}" - createhome: "yes" - system: "yes" - shell: "/bin/false" diff --git a/deploy/adapters/ansible/roles/odl_cluster/tasks/01_02_unarchive_odl_and_jdk.yml b/deploy/adapters/ansible/roles/odl_cluster/tasks/01_02_unarchive_odl_and_jdk.yml deleted file mode 100644 index 9592a0ae..00000000 --- a/deploy/adapters/ansible/roles/odl_cluster/tasks/01_02_unarchive_odl_and_jdk.yml +++ /dev/null @@ -1,26 +0,0 @@ -############################################################################## -# Copyright (c) 2016 HUAWEI TECHNOLOGIES CO.,LTD and others. -# -# All rights reserved. This program and the accompanying materials -# are made available under the terms of the Apache License, Version 2.0 -# which accompanies this distribution, and is available at -# http://www.apache.org/licenses/LICENSE-2.0 -############################################################################## ---- - -- name: clear jdk8 package - command: su -s /bin/sh -c "rm -rf /opt/install_jdk8" - -- name: unarchive onos driver package - command: su -s /bin/sh -c "tar xvf /opt/install_jdk8.tar -C /opt/" - -- name: install install_jdk8 package - command: su -s /bin/sh -c "/opt/install_jdk8/install_jdk8.sh" - -- name: clear odl package - command: su -s /bin/sh -c "rm -rf {{ odl_home }}/*" - -- name: extract odl package - command: | - su -s /bin/sh -c "tar xzf /opt/{{ odl_pkg_name }} -C {{ odl_home }} \ - --strip-components 1" odl 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 deleted file mode 100644 index 0d4043e0..00000000 --- a/deploy/adapters/ansible/roles/odl_cluster/tasks/01_03_copy_odl_configuration_files.yml +++ /dev/null @@ -1,55 +0,0 @@ -############################################################################## -# Copyright (c) 2016 HUAWEI TECHNOLOGIES CO.,LTD and others. -# -# All rights reserved. This program and the accompanying materials -# are made available under the terms of the Apache License, Version 2.0 -# which accompanies this distribution, and is available at -# http://www.apache.org/licenses/LICENSE-2.0 -############################################################################## ---- -- name: opendaylight system file - copy: - src: "{{ service_file.src }}" - dest: "{{ service_file.dst }}" - mode: 0755 - -- name: set l3 fwd enable in custom.properties - template: - src: custom.properties - dest: "{{ odl_home }}/etc/custom.properties" - owner: odl - group: odl - mode: 0775 - when: odl_l3_agent == "Enable" - -- name: create karaf config - template: - src: org.apache.karaf.features.cfg.Debian - dest: "{{ odl_home }}/etc/org.apache.karaf.features.cfg" - owner: odl - group: odl - mode: 0775 - when: ansible_os_family == "Debian" - -- name: create karaf config - template: - src: org.apache.karaf.features.cfg.Redhat - dest: "{{ odl_home }}/etc/org.apache.karaf.features.cfg" - owner: odl - group: odl - 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 - shell: > - sed -i 's/port="8282"/port="{{ odl_api_port }}"/' - {{ odl_home }}configuration/tomcat-server.xml diff --git a/deploy/adapters/ansible/roles/odl_cluster/tasks/01_04_install_pip_packages.yml b/deploy/adapters/ansible/roles/odl_cluster/tasks/01_04_install_pip_packages.yml deleted file mode 100644 index fa418c6c..00000000 --- a/deploy/adapters/ansible/roles/odl_cluster/tasks/01_04_install_pip_packages.yml +++ /dev/null @@ -1,25 +0,0 @@ -############################################################################## -# Copyright (c) 2016 HUAWEI TECHNOLOGIES CO.,LTD and others. -# -# All rights reserved. This program and the accompanying materials -# are made available under the terms of the Apache License, Version 2.0 -# which accompanies this distribution, and is available at -# http://www.apache.org/licenses/LICENSE-2.0 -############################################################################## ---- - -- name: patch odl pip package - shell: | - cd /opt - tar xf /opt/{{ networking_odl_pkg_name }} - rm -rf /opt/{{ networking_odl_pkg_name }} - sed -i 's/^neutron-lib.*/neutron-lib/' {{ odl_pip }}/requirements.txt - tar zcf /opt/{{ networking_odl_pkg_name }} {{ odl_pip }} - cd - - -- name: odl pip package install - shell: | - cd /opt - pip install {{ networking_odl_pkg_name }} - rm -rf {{ networking_odl_pkg_name }} - cd - diff --git a/deploy/adapters/ansible/roles/odl_cluster/tasks/01_05_clean_up_karaf_data.yml b/deploy/adapters/ansible/roles/odl_cluster/tasks/01_05_clean_up_karaf_data.yml deleted file mode 100644 index 6ed317d6..00000000 --- a/deploy/adapters/ansible/roles/odl_cluster/tasks/01_05_clean_up_karaf_data.yml +++ /dev/null @@ -1,12 +0,0 @@ -############################################################################## -# Copyright (c) 2016 HUAWEI TECHNOLOGIES CO.,LTD and others. -# -# All rights reserved. This program and the accompanying materials -# are made available under the terms of the Apache License, Version 2.0 -# which accompanies this distribution, and is available at -# http://www.apache.org/licenses/LICENSE-2.0 -############################################################################## ---- - -- name: remove karaf data directory - shell: rm -rf {{ odl_home }}/data/*; diff --git a/deploy/adapters/ansible/roles/odl_cluster/tasks/01_06_stop_openstack_services.yml b/deploy/adapters/ansible/roles/odl_cluster/tasks/01_06_stop_openstack_services.yml deleted file mode 100644 index 30ee61fb..00000000 --- a/deploy/adapters/ansible/roles/odl_cluster/tasks/01_06_stop_openstack_services.yml +++ /dev/null @@ -1,34 +0,0 @@ -############################################################################## -# Copyright (c) 2016 HUAWEI TECHNOLOGIES CO.,LTD and others. -# -# All rights reserved. This program and the accompanying materials -# are made available under the terms of the Apache License, Version 2.0 -# which accompanies this distribution, and is available at -# http://www.apache.org/licenses/LICENSE-2.0 -############################################################################## ---- - -- name: turn off neutron server and agent Daemon on control node - shell: > - sed -i '/{{ service_ovs_agent_name }}/d' /opt/service ; - sed -i '/neutron-server/d' /opt/service; - sed -i '/keepalived/d' /opt/service; - -- name: turn off neutron-server on control node - service: name=neutron-server state=stopped - -- name: turn off keepalived on control node - service: name=keepalived state=stopped - when: ansible_os_family == "Debian" - -- 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'] diff --git a/deploy/adapters/ansible/roles/odl_cluster/tasks/01_07_start_check_odl.yml b/deploy/adapters/ansible/roles/odl_cluster/tasks/01_07_start_check_odl.yml deleted file mode 100644 index f52079de..00000000 --- a/deploy/adapters/ansible/roles/odl_cluster/tasks/01_07_start_check_odl.yml +++ /dev/null @@ -1,31 +0,0 @@ -############################################################################## -# Copyright (c) 2016 HUAWEI TECHNOLOGIES CO.,LTD and others. -# -# All rights reserved. This program and the accompanying materials -# are made available under the terms of the Apache License, Version 2.0 -# which accompanies this distribution, and is available at -# http://www.apache.org/licenses/LICENSE-2.0 -############################################################################## ---- - -- name: chown opendaylight directory and files - shell: > - chown -R odl:odl "{{ odl_home }}"; - chown odl:odl "{{ service_file.dst }}"; - -- name: start opendaylight - service: name=opendaylight state=started - when: ansible_os_family == "Debian" - -- name: set opendaylight autostart - shell: chkconfig opendaylight on - when: ansible_os_family == "RedHat" - -- name: start opendaylight - shell: service opendaylight start - when: ansible_os_family == "RedHat" - -- name: check if opendaylight running - shell: | - netstat -lpen --tcp | grep java | grep 6653; - while [ $? -ne 0 ]; do sleep 10; netstat -lpen --tcp | grep java | grep 6653; done 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 deleted file mode 100644 index 80443f1b..00000000 --- a/deploy/adapters/ansible/roles/odl_cluster/tasks/01_08_configure_neutron.yml +++ /dev/null @@ -1,54 +0,0 @@ -############################################################################## -# Copyright (c) 2016 HUAWEI TECHNOLOGIES CO.,LTD and others. -# -# All rights reserved. This program and the accompanying materials -# are made available under the terms of the Apache License, Version 2.0 -# which accompanies this distribution, and is available at -# http://www.apache.org/licenses/LICENSE-2.0 -############################################################################## ---- - -- name: configure l2 configuration - shell: | - crudini --set /etc/neutron/l3_agent.ini DEFAULT external_network_bridge \ - br-prv; - when: odl_l3_agent == "Disable" - -- name: configure l3 configuration - shell: | - crudini --set /etc/neutron/l3_agent.ini DEFAULT external_network_bridge \ - br-ex; - when: odl_l3_agent == "Enable" - -- name: configure odl l3 driver - shell: | - crudini --set /etc/neutron/neutron.conf DEFAULT service_plugins \ - networking_odl.l3.l3_odl.OpenDaylightL3RouterPlugin; - when: odl_l3_agent == "Enable" - -- name: configure metadata for l3 configuration - shell: | - crudini --set /etc/neutron/dhcp_agent.ini DEFAULT \ - 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: drop and recreate neutron database - shell: | - mysql -e "drop database if exists neutron;"; - mysql -e "create database neutron character set utf8;"; - mysql -e "grant all on neutron.* to 'neutron'@'%' identified by \ - '{{ NEUTRON_DBPASS }}';"; - su -s /bin/sh -c "neutron-db-manage \ - --config-file /etc/neutron/neutron.conf \ - --config-file /etc/neutron/plugins/ml2/ml2_conf.ini \ - upgrade head" neutron; - when: inventory_hostname == haproxy_hosts.keys()[0] - tags: - - test_odl diff --git a/deploy/adapters/ansible/roles/odl_cluster/tasks/01_odl_controller.yml b/deploy/adapters/ansible/roles/odl_cluster/tasks/01_odl_controller.yml deleted file mode 100644 index 7dd8bd88..00000000 --- a/deploy/adapters/ansible/roles/odl_cluster/tasks/01_odl_controller.yml +++ /dev/null @@ -1,43 +0,0 @@ -############################################################################## -# Copyright (c) 2016 HUAWEI TECHNOLOGIES CO.,LTD and others. -# -# All rights reserved. This program and the accompanying materials -# are made available under the terms of the Apache License, Version 2.0 -# which accompanies this distribution, and is available at -# http://www.apache.org/licenses/LICENSE-2.0 -############################################################################## ---- - -- name: download packages - include: 01_00_download_packages.yml - -- name: create odl user and group - include: 01_01_create_odl_user_and_group.yml - -- name: unarchive odl and jdk - include: 01_02_unarchive_odl_and_jdk.yml - -- name: copy odl configuration files - include: 01_03_copy_odl_configuration_files.yml - -- name: install pip packages - include: 01_04_install_pip_packages.yml - -- name: clean up karaf data - include: 01_05_clean_up_karaf_data.yml - -- name: stop openstack services - include: 01_06_stop_openstack_services.yml - -# - name: set opendaylight cluster -# include: 05_set_opendaylight_cluster.yml -# when: groups['odl']|length > 1 - -- name: start and check odl - include: 01_07_start_check_odl.yml - -- name: run openswitch - include: 03_openvswitch.yml - -- name: configure neutron - include: 01_08_configure_neutron.yml diff --git a/deploy/adapters/ansible/roles/odl_cluster/tasks/02_odl_compute.yml b/deploy/adapters/ansible/roles/odl_cluster/tasks/02_odl_compute.yml deleted file mode 100644 index 7506200b..00000000 --- a/deploy/adapters/ansible/roles/odl_cluster/tasks/02_odl_compute.yml +++ /dev/null @@ -1,12 +0,0 @@ -############################################################################## -# Copyright (c) 2016 HUAWEI TECHNOLOGIES CO.,LTD and others. -# -# All rights reserved. This program and the accompanying materials -# are made available under the terms of the Apache License, Version 2.0 -# which accompanies this distribution, and is available at -# http://www.apache.org/licenses/LICENSE-2.0 -############################################################################## ---- - -- name: Provision ODL on Compute nodes - include: 03_openvswitch.yml diff --git a/deploy/adapters/ansible/roles/odl_cluster/tasks/03_00_switch_off_neutron_openvswitch_agent.yml b/deploy/adapters/ansible/roles/odl_cluster/tasks/03_00_switch_off_neutron_openvswitch_agent.yml deleted file mode 100644 index 08f8a07c..00000000 --- a/deploy/adapters/ansible/roles/odl_cluster/tasks/03_00_switch_off_neutron_openvswitch_agent.yml +++ /dev/null @@ -1,23 +0,0 @@ -############################################################################## -# Copyright (c) 2016 HUAWEI TECHNOLOGIES CO.,LTD and others. -# -# All rights reserved. This program and the accompanying materials -# are made available under the terms of the Apache License, Version 2.0 -# which accompanies this distribution, and is available at -# http://www.apache.org/licenses/LICENSE-2.0 -############################################################################## ---- -- name: remove neutron-openvswitch-agent service daemon - shell: sed -i '/{{ service_ovs_agent_name }}/d' /opt/service ; - -- name: shut down and disable Neutron's openvswitch agent services - service: name={{ service_ovs_agent_name }} state=stopped enabled=no - -- name: remove Neutron's openvswitch agent services - shell: > - update-rc.d -f {{ service_ovs_agent_name }} remove; - mv /etc/init.d/{{ service_ovs_agent_name }} \ - /home/{{ service_ovs_agent_name }}; - mv /etc/init/{{ service_ovs_agent_name }}.conf \ - /home/{{ service_ovs_agent_name }}.conf; - when: ansible_os_family == "Debian" diff --git a/deploy/adapters/ansible/roles/odl_cluster/tasks/03_01_clean_up_and_restart_openvswitch.yml b/deploy/adapters/ansible/roles/odl_cluster/tasks/03_01_clean_up_and_restart_openvswitch.yml deleted file mode 100644 index 48287857..00000000 --- a/deploy/adapters/ansible/roles/odl_cluster/tasks/03_01_clean_up_and_restart_openvswitch.yml +++ /dev/null @@ -1,16 +0,0 @@ -############################################################################## -# Copyright (c) 2016 HUAWEI TECHNOLOGIES CO.,LTD and others. -# -# All rights reserved. This program and the accompanying materials -# are made available under the terms of the Apache License, Version 2.0 -# which accompanies this distribution, and is available at -# http://www.apache.org/licenses/LICENSE-2.0 -############################################################################## ---- - -- name: Stop the Open vSwitch service and clear existing OVSDB - shell: > - service {{ service_ovs_name }} stop ; - rm -rf /var/log/openvswitch/* ; - rm -rf /etc/openvswitch/conf.db ; - service {{ service_ovs_name }} start ; diff --git a/deploy/adapters/ansible/roles/odl_cluster/tasks/03_02_openvswitch_connect_opendaylight.yml b/deploy/adapters/ansible/roles/odl_cluster/tasks/03_02_openvswitch_connect_opendaylight.yml deleted file mode 100644 index 2a9622f9..00000000 --- a/deploy/adapters/ansible/roles/odl_cluster/tasks/03_02_openvswitch_connect_opendaylight.yml +++ /dev/null @@ -1,36 +0,0 @@ -############################################################################## -# Copyright (c) 2016 HUAWEI TECHNOLOGIES CO.,LTD and others. -# -# All rights reserved. This program and the accompanying materials -# are made available under the terms of the Apache License, Version 2.0 -# which accompanies this distribution, and is available at -# http://www.apache.org/licenses/LICENSE-2.0 -############################################################################## ---- - -- name: add ovsdb_connection to neutron.conf - shell: crudini --set /etc/neutron/neutron.conf OVS ovsdb_connection tcp:127.0.0.1:6639 - -- name: restart keepalived to recover external IP before check br-int - shell: service keepalived restart - when: inventory_hostname in groups['odl'] - ignore_errors: "True" - -- name: restart opendaylight - shell: service opendaylight restart; sleep 60 - when: inventory_hostname in groups['odl'] - ignore_errors: "True" - -- name: set opendaylight as the manager - command: | - su -s /bin/sh -c "ovs-vsctl set-manager ptcp:6639:127.0.0.1 tcp:{{ internal_vip.ip }}:6640;" - -- name: check br-int - shell: | - ovs-vsctl list-br | grep br-int; while [ $? -ne 0 ]; do sleep 10; \ - ovs-vsctl list-br | grep br-int; done - -- name: set local ip in openvswitch - shell: | - ovs-vsctl set Open_vSwitch $(ovs-vsctl show | head -n 1) \ - other_config={'local_ip'=' {{ internal_ip }} '}; diff --git a/deploy/adapters/ansible/roles/odl_cluster/tasks/03_03_00_recover_external_network_l3.yml b/deploy/adapters/ansible/roles/odl_cluster/tasks/03_03_00_recover_external_network_l3.yml deleted file mode 100644 index f315ebbf..00000000 --- a/deploy/adapters/ansible/roles/odl_cluster/tasks/03_03_00_recover_external_network_l3.yml +++ /dev/null @@ -1,45 +0,0 @@ -############################################################################## -# Copyright (c) 2016 HUAWEI TECHNOLOGIES CO.,LTD and others. -# -# All rights reserved. This program and the accompanying materials -# are made available under the terms of the Apache License, Version 2.0 -# which accompanies this distribution, and is available at -# http://www.apache.org/licenses/LICENSE-2.0 -############################################################################## ---- -- name: check br-ex - shell: | - ovs-vsctl list-br | grep br-ex; - while [ $? -ne 0 ]; do sleep 10; ovs-vsctl list-br | grep br-ex; done - -- name: add ovs uplink - openvswitch_port: bridge=br-ex port={{ item["interface"] }} state=present - with_items: "{{ network_cfg['provider_net_mappings'] }}" - when: item["type"] == "ovs" - -- name: wait 10 seconds - shell: sleep 10 - -- name: set external nic in openvswitch - shell: | - ovs-vsctl set Open_vSwitch $(ovs-vsctl show | head -n 1) \ - other_config:provider_mappings=br-ex:{{ item["interface"] }} - with_items: "{{ network_cfg['provider_net_mappings'] }}" - when: item["type"] == "ovs" - -- name: copy recovery script - copy: src={{ item }} dest=/opt/setup_networks - with_items: - - recover_network_odl_l3.py - - setup_networks_odl_l3.py - -- name: recover external script - shell: python /opt/setup_networks/recover_network_odl_l3.py - -- name: update keepalived info - template: src=keepalived.conf dest=/etc/keepalived/keepalived.conf - when: inventory_hostname in groups['odl'] - -- name: modify net-init - shell: sed -i 's/setup_networks.py/setup_networks_odl_l3.py/g' \ - /etc/init.d/net_init diff --git a/deploy/adapters/ansible/roles/odl_cluster/tasks/03_03_01_recover_external_network_l2.yml b/deploy/adapters/ansible/roles/odl_cluster/tasks/03_03_01_recover_external_network_l2.yml deleted file mode 100644 index 54630898..00000000 --- a/deploy/adapters/ansible/roles/odl_cluster/tasks/03_03_01_recover_external_network_l2.yml +++ /dev/null @@ -1,27 +0,0 @@ -############################################################################## -# Copyright (c) 2016 HUAWEI TECHNOLOGIES CO.,LTD and others. -# -# All rights reserved. This program and the accompanying materials -# are made available under the terms of the Apache License, Version 2.0 -# which accompanies this distribution, and is available at -# http://www.apache.org/licenses/LICENSE-2.0 -############################################################################## ---- -- name: add ovs bridge - openvswitch_bridge: bridge={{ item["name"] }} state=present - with_items: "{{ network_cfg['provider_net_mappings'] }}" - when: item["type"] == "ovs" - -- name: add ovs uplink - openvswitch_port: bridge={{ item["name"] }} port={{ item["interface"] }} - state=present - with_items: "{{ network_cfg['provider_net_mappings'] }}" - when: item["type"] == "ovs" - -- name: copy recovery script - copy: src={{ item }} dest=/opt/setup_networks - with_items: - - recover_network.py - -- name: recover external script - shell: python /opt/setup_networks/recover_network.py diff --git a/deploy/adapters/ansible/roles/odl_cluster/tasks/03_03_recover_external_network.yml b/deploy/adapters/ansible/roles/odl_cluster/tasks/03_03_recover_external_network.yml deleted file mode 100644 index bffaf79f..00000000 --- a/deploy/adapters/ansible/roles/odl_cluster/tasks/03_03_recover_external_network.yml +++ /dev/null @@ -1,22 +0,0 @@ -############################################################################## -# Copyright (c) 2016 HUAWEI TECHNOLOGIES CO.,LTD and others. -# -# All rights reserved. This program and the accompanying materials -# are made available under the terms of the Apache License, Version 2.0 -# which accompanies this distribution, and is available at -# http://www.apache.org/licenses/LICENSE-2.0 -############################################################################## ---- - -- name: recover external network for L3 - include: 03_03_00_recover_external_network_l3.yml - when: odl_l3_agent == "Enable" - -- name: recover external network for L2 - include: 03_03_01_recover_external_network_l2.yml - when: odl_l3_agent == "Disable" - -- name: restart keepalived to recover external IP - shell: service keepalived restart - when: inventory_hostname in groups['odl'] - ignore_errors: "True" diff --git a/deploy/adapters/ansible/roles/odl_cluster/tasks/03_04_setup_ml2.yml b/deploy/adapters/ansible/roles/odl_cluster/tasks/03_04_setup_ml2.yml deleted file mode 100644 index febe72be..00000000 --- a/deploy/adapters/ansible/roles/odl_cluster/tasks/03_04_setup_ml2.yml +++ /dev/null @@ -1,25 +0,0 @@ -############################################################################## -# Copyright (c) 2016 HUAWEI TECHNOLOGIES CO.,LTD and others. -# -# All rights reserved. This program and the accompanying materials -# are made available under the terms of the Apache License, Version 2.0 -# which accompanies this distribution, and is available at -# http://www.apache.org/licenses/LICENSE-2.0 -############################################################################## ---- - -- name: configure opendaylight -> ml2 - shell: > - crudini --set /etc/neutron/plugins/ml2/ml2_conf.ini ml2 mechanism_drivers opendaylight; - crudini --set /etc/neutron/plugins/ml2/ml2_conf.ini ml2 tenant_network_types vxlan; - crudini --set /etc/neutron/plugins/ml2/ml2_conf.ini ovs enable_tunneling "True"; - crudini --set /etc/neutron/plugins/ml2/ml2_conf.ini ml2 extension_drivers port_security; - -- name: copy ml2 configuration script - template: - src: ml2_conf.sh - dest: "/opt/ml2_conf.sh" - mode: 0777 - -- name: execute ml2 configuration script - command: su -s /bin/sh -c "/opt/ml2_conf.sh;" diff --git a/deploy/adapters/ansible/roles/odl_cluster/tasks/03_openvswitch.yml b/deploy/adapters/ansible/roles/odl_cluster/tasks/03_openvswitch.yml deleted file mode 100644 index 5c24be0b..00000000 --- a/deploy/adapters/ansible/roles/odl_cluster/tasks/03_openvswitch.yml +++ /dev/null @@ -1,24 +0,0 @@ -############################################################################## -# Copyright (c) 2016 HUAWEI TECHNOLOGIES CO.,LTD and others. -# -# All rights reserved. This program and the accompanying materials -# are made available under the terms of the Apache License, Version 2.0 -# which accompanies this distribution, and is available at -# http://www.apache.org/licenses/LICENSE-2.0 -############################################################################## ---- - -- name: switch off neutron-openvswitch-agent - include: 03_00_switch_off_neutron_openvswitch_agent.yml - -- name: clean up and restart openvswitch - include: 03_01_clean_up_and_restart_openvswitch.yml - -- name: openvswitch connect with opendaylight and check br-int - include: 03_02_openvswitch_connect_opendaylight.yml - -- name: recover external network - include: 03_03_recover_external_network.yml - -- name: set up ml2 - include: 03_04_setup_ml2.yml diff --git a/deploy/adapters/ansible/roles/odl_cluster/tasks/04_odl_l3_nova.yml b/deploy/adapters/ansible/roles/odl_cluster/tasks/04_odl_l3_nova.yml deleted file mode 100644 index 8a6435b5..00000000 --- a/deploy/adapters/ansible/roles/odl_cluster/tasks/04_odl_l3_nova.yml +++ /dev/null @@ -1,15 +0,0 @@ -############################################################################## -# Copyright (c) 2016 HUAWEI TECHNOLOGIES CO.,LTD and others. -# -# All rights reserved. This program and the accompanying materials -# are made available under the terms of the Apache License, Version 2.0 -# which accompanies this distribution, and is available at -# http://www.apache.org/licenses/LICENSE-2.0 -############################################################################## ---- - -- name: set file inject in nova.conf - shell: crudini --set /etc/nova/nova.conf DEFAULT force_config_drive true - -- name: restart all nova service - shell: for i in `cat /opt/service | grep nova` ; do service $i restart; done diff --git a/deploy/adapters/ansible/roles/odl_cluster/tasks/05_set_opendaylight_cluster.yml b/deploy/adapters/ansible/roles/odl_cluster/tasks/05_set_opendaylight_cluster.yml deleted file mode 100644 index c9d93709..00000000 --- a/deploy/adapters/ansible/roles/odl_cluster/tasks/05_set_opendaylight_cluster.yml +++ /dev/null @@ -1,34 +0,0 @@ -############################################################################## -# Copyright (c) 2016 HUAWEI TECHNOLOGIES CO.,LTD and others. -# -# All rights reserved. This program and the accompanying materials -# are made available under the terms of the Apache License, Version 2.0 -# which accompanies this distribution, and is available at -# http://www.apache.org/licenses/LICENSE-2.0 -############################################################################## ---- - -- name: combine odl controller - shell: rm -f /opt/cluster; touch /opt/cluster; - -- name: combine odl controller - shell: | - echo "{{ ip_settings[item.1]['mgmt']['ip'] }} \c" >> /opt/cluster; \ - >> /opt/cluster; - with_indexed_items: groups['odl'] - -- name: combine odl controller - shell: cat /opt/cluster - register: cluster - -- name: combine odl controller - shell: uname -n | cut -b 5,5 - register: number - -- debug: msg="{{ odl_home }}/bin/configure_cluster.sh - {{ number.stdout_lines[0] }} {{ cluster.stdout_lines[0] }}" - -- name: configure odl controller in cluster - shell: | - "{{ odl_home }}/bin/configure_cluster.sh {{ number.stdout_lines[0] }} \ - {{ cluster.stdout_lines[0] }}" diff --git a/deploy/adapters/ansible/roles/odl_cluster/tasks/main.yml b/deploy/adapters/ansible/roles/odl_cluster/tasks/main.yml deleted file mode 100644 index 32952c51..00000000 --- a/deploy/adapters/ansible/roles/odl_cluster/tasks/main.yml +++ /dev/null @@ -1,24 +0,0 @@ -############################################################################## -# Copyright (c) 2016 HUAWEI TECHNOLOGIES CO.,LTD and others. -# -# All rights reserved. This program and the accompanying materials -# are made available under the terms of the Apache License, Version 2.0 -# which accompanies this distribution, and is available at -# http://www.apache.org/licenses/LICENSE-2.0 -############################################################################## ---- -- include_vars: "{{ ansible_os_family }}.yml" - tags: - - test_odl - -- name: Provision Common on all nodes - include: 00_odl_common.yml - when: groups['odl']|length !=0 - -- name: Provision ODL on Controller nodes - include: 01_odl_controller.yml - when: inventory_hostname in groups['odl'] - -- name: Provision ODL on Compute nodes - include: 02_odl_compute.yml - when: groups['odl']|length !=0 and inventory_hostname not in groups['odl'] -- cgit 1.2.3-korg