From 6c5cd18c1d8579e040502d3a40b4d3e007723df2 Mon Sep 17 00:00:00 2001 From: "chenshuai@huawei.com" Date: Wed, 2 Nov 2016 04:36:20 -0400 Subject: Improvement: add odl cluster new solution for mitaka and newton on xenial JIRA: COMPASS-501 Change-Id: I11fc3297be4e72f24fd5ea9958dfd9e20f183afd Signed-off-by: chenshuai@huawei.com --- .../roles/odl_cluster/vars/Debian.yml | 6 +--- .../roles/odl_cluster/tasks/01_odl_controller.yml | 4 +++ .../tasks/05_set_opendaylight_cluster.yml | 34 ++++++++++++++++++++++ .../roles/odl_cluster/tasks/01_odl_controller.yml | 4 +++ .../tasks/05_set_opendaylight_cluster.yml | 34 ++++++++++++++++++++++ 5 files changed, 77 insertions(+), 5 deletions(-) create mode 100644 deploy/adapters/ansible/openstack_mitaka_xenial/roles/odl_cluster/tasks/05_set_opendaylight_cluster.yml create mode 100644 deploy/adapters/ansible/openstack_newton_xenial/roles/odl_cluster/tasks/05_set_opendaylight_cluster.yml diff --git a/deploy/adapters/ansible/openstack_mitaka/roles/odl_cluster/vars/Debian.yml b/deploy/adapters/ansible/openstack_mitaka/roles/odl_cluster/vars/Debian.yml index a3d5dd02..bb560ac0 100755 --- a/deploy/adapters/ansible/openstack_mitaka/roles/odl_cluster/vars/Debian.yml +++ b/deploy/adapters/ansible/openstack_mitaka/roles/odl_cluster/vars/Debian.yml @@ -8,11 +8,7 @@ ############################################################################## --- -controller_packages: -# - openjdk-7-jdk - - crudini - -compute_packages: +common_packages: - crudini service_ovs_name: openvswitch-switch diff --git a/deploy/adapters/ansible/openstack_mitaka_xenial/roles/odl_cluster/tasks/01_odl_controller.yml b/deploy/adapters/ansible/openstack_mitaka_xenial/roles/odl_cluster/tasks/01_odl_controller.yml index 7d010d10..d78a76e0 100644 --- a/deploy/adapters/ansible/openstack_mitaka_xenial/roles/odl_cluster/tasks/01_odl_controller.yml +++ b/deploy/adapters/ansible/openstack_mitaka_xenial/roles/odl_cluster/tasks/01_odl_controller.yml @@ -29,6 +29,10 @@ - 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: install moon include: moon-odl.yml when: moon == "Enable" diff --git a/deploy/adapters/ansible/openstack_mitaka_xenial/roles/odl_cluster/tasks/05_set_opendaylight_cluster.yml b/deploy/adapters/ansible/openstack_mitaka_xenial/roles/odl_cluster/tasks/05_set_opendaylight_cluster.yml new file mode 100644 index 00000000..7eddf7fa --- /dev/null +++ b/deploy/adapters/ansible/openstack_mitaka_xenial/roles/odl_cluster/tasks/05_set_opendaylight_cluster.yml @@ -0,0 +1,34 @@ +############################################################################## +# 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 + +#- debug: msg="{{ cluster.stdout_lines[0] }}" + +- name: combine odl controller + shell: uname -n | cut -b 5,5 + register: number + +#- debug: msg="{{ number.stdout_lines[0] }}" + +- 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/openstack_newton_xenial/roles/odl_cluster/tasks/01_odl_controller.yml b/deploy/adapters/ansible/openstack_newton_xenial/roles/odl_cluster/tasks/01_odl_controller.yml index 7d010d10..d78a76e0 100644 --- a/deploy/adapters/ansible/openstack_newton_xenial/roles/odl_cluster/tasks/01_odl_controller.yml +++ b/deploy/adapters/ansible/openstack_newton_xenial/roles/odl_cluster/tasks/01_odl_controller.yml @@ -29,6 +29,10 @@ - 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: install moon include: moon-odl.yml when: moon == "Enable" diff --git a/deploy/adapters/ansible/openstack_newton_xenial/roles/odl_cluster/tasks/05_set_opendaylight_cluster.yml b/deploy/adapters/ansible/openstack_newton_xenial/roles/odl_cluster/tasks/05_set_opendaylight_cluster.yml new file mode 100644 index 00000000..7eddf7fa --- /dev/null +++ b/deploy/adapters/ansible/openstack_newton_xenial/roles/odl_cluster/tasks/05_set_opendaylight_cluster.yml @@ -0,0 +1,34 @@ +############################################################################## +# 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 + +#- debug: msg="{{ cluster.stdout_lines[0] }}" + +- name: combine odl controller + shell: uname -n | cut -b 5,5 + register: number + +#- debug: msg="{{ number.stdout_lines[0] }}" + +- 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] }}" + -- cgit 1.2.3-korg