summaryrefslogtreecommitdiffstats
path: root/deploy/adapters/ansible/roles/odl_cluster/tasks
diff options
context:
space:
mode:
Diffstat (limited to 'deploy/adapters/ansible/roles/odl_cluster/tasks')
-rw-r--r--[-rwxr-xr-x]deploy/adapters/ansible/roles/odl_cluster/tasks/00_odl_common.yml2
-rw-r--r--deploy/adapters/ansible/roles/odl_cluster/tasks/01_00_download_packages.yml2
-rw-r--r--deploy/adapters/ansible/roles/odl_cluster/tasks/01_04_install_pip_packages.yml6
-rw-r--r--deploy/adapters/ansible/roles/odl_cluster/tasks/01_07_start_check_odl.yml2
-rw-r--r--deploy/adapters/ansible/roles/odl_cluster/tasks/01_odl_controller.yml10
-rw-r--r--[-rwxr-xr-x]deploy/adapters/ansible/roles/odl_cluster/tasks/02_odl_compute.yml0
-rw-r--r--deploy/adapters/ansible/roles/odl_cluster/tasks/03_02_openvswitch_connect_opendaylight.yml5
-rw-r--r--deploy/adapters/ansible/roles/odl_cluster/tasks/03_04_setup_ml2.yml10
-rw-r--r--deploy/adapters/ansible/roles/odl_cluster/tasks/moon-odl.yml65
9 files changed, 17 insertions, 85 deletions
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
index 1545314d..55b29b3e 100755..100644
--- a/deploy/adapters/ansible/roles/odl_cluster/tasks/00_odl_common.yml
+++ b/deploy/adapters/ansible/roles/odl_cluster/tasks/00_odl_common.yml
@@ -10,4 +10,4 @@
- name: install controller packages
action: "{{ ansible_pkg_mgr }} name={{ item }} state=present"
- with_items: common_packages | union(common_packages_noarch)
+ 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
index ebca876a..6c2063f9 100644
--- 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
@@ -29,5 +29,5 @@
- name: download odl pip package
get_url:
- url: "http://{{ http_server.stdout_lines[0] }}/pip/{{ networking_odl_pkg_name }}"
+ 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_04_install_pip_packages.yml b/deploy/adapters/ansible/roles/odl_cluster/tasks/01_04_install_pip_packages.yml
index 869d264a..f9015ffc 100644
--- 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
@@ -13,9 +13,9 @@
cd /opt
tar xf /opt/{{ networking_odl_pkg_name }}
rm -rf /opt/{{ networking_odl_pkg_name }}
- sed -i 's/^neutron-lib.*/neutron-lib/' networking-odl-2.0.0/requirements.txt
- tar zcf /opt/{{ networking_odl_pkg_name }} networking-odl-2.0.0
- rm -rf networking-odl-2.0.0
+ sed -i 's/^neutron-lib.*/neutron-lib/' networking-odl-3.2.0/requirements.txt
+ tar zcf /opt/{{ networking_odl_pkg_name }} networking-odl-3.2.0
+ rm -rf networking-odl-3.2.0
cd -
- name: odl pip package install
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
index ee8c3585..f52079de 100644
--- 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
@@ -28,4 +28,4 @@
- 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
+ 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_odl_controller.yml b/deploy/adapters/ansible/roles/odl_cluster/tasks/01_odl_controller.yml
index d78a76e0..7dd8bd88 100644
--- a/deploy/adapters/ansible/roles/odl_cluster/tasks/01_odl_controller.yml
+++ b/deploy/adapters/ansible/roles/odl_cluster/tasks/01_odl_controller.yml
@@ -29,13 +29,9 @@
- 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"
+# - 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
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
index 7506200b..7506200b 100755..100644
--- a/deploy/adapters/ansible/roles/odl_cluster/tasks/02_odl_compute.yml
+++ b/deploy/adapters/ansible/roles/odl_cluster/tasks/02_odl_compute.yml
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
index f060e7bb..2a9622f9 100644
--- 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
@@ -8,6 +8,9 @@
##############################################################################
---
+- 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']
@@ -20,7 +23,7 @@
- name: set opendaylight as the manager
command: |
- su -s /bin/sh -c "ovs-vsctl set-manager tcp:{{ internal_vip.ip }}:6640;"
+ 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: |
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
index ae0dd6cc..febe72be 100644
--- 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
@@ -10,12 +10,10 @@
- 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 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:
diff --git a/deploy/adapters/ansible/roles/odl_cluster/tasks/moon-odl.yml b/deploy/adapters/ansible/roles/odl_cluster/tasks/moon-odl.yml
deleted file mode 100644
index ec05f6ce..00000000
--- a/deploy/adapters/ansible/roles/odl_cluster/tasks/moon-odl.yml
+++ /dev/null
@@ -1,65 +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: delete data journal snapshots
- shell: rm -rf {{ odl_home }}/{{ item }}
- with_items:
- - journal
- - data
- - snapshots
-
-- name: remove aaa feature
- shell: rm -rf {{ odl_home }}/system/org/opendaylight/aaa/
-
-- name: download apache maven package file
- get_url:
- url: "http://{{ http_server.stdout_lines[0] }}/packages/moon/apache-maven-3.3.9-bin.tar.gz"
- dest: /opt/apache-maven-3.3.9-bin.tar.gz
-
-- name: create maven folder
- shell: mkdir -p /opt/apache-maven-3.3.9/
-
-- name: extract maven
- command: |
- su -s /bin/sh -c "tar zxf /opt/apache-maven-3.3.9-bin.tar.gz -C \
- /opt/apache-maven-3.3.9/ --strip-components 1 --no-overwrite-dir -k \
- --skip-old-files" root
-
-- name: install maven
- shell: ln -s /opt/apache-maven-3.3.9/bin/mvn /usr/local/bin/mvn;
-
-- name: create m2 directory
- file: path=/root/.m2/ state=directory mode=0755
-
-- name: copy settings.xml
- template: src=settings.xml dest=/root/.m2/settings.xml
-
-- name: download odl-aaa-moon package
- get_url:
- url: "http://{{ http_server.stdout_lines[0] }}/packages/moon/{{ odl_aaa_moon }}"
- dest: /home/
-
-- name: unarchive odl-aaa-moon package
- command: su -s /bin/sh -c "tar xvf /home/{{ odl_aaa_moon }} -C /home/"
-
-- name: install aaa
- shell: >
- export PATH=$PATH:/usr/lib/jvm/java-8-oracle/bin:/opt/apache-maven-3.3.3/bin;
- export JAVA_HOME="/usr/lib/jvm/java-8-oracle";
- export _JAVA_OPTIONS="-Djava.net.preferIPv4Stack=true";
- export MAVEN_OPTS="-Xmx1024m -XX:MaxPermSize=512m";
- cd /home/odl-aaa-moon/aaa/;
- mvn clean install -DskipTests;
-
-- name: remove shiro ini
- shell: rm -f {{ odl_home }}/etc/shiro.ini
-
-- name: set moon env
- template: src=moon-environment dest=/opt/moon-environment