Upgrade OpenDaylight to Boron ( centos )

JIRA: COMPASS-512

1. Install requirements of networking-odl
2. Adjust order of removing neutron l3 agent
3. Modify file head

Change-Id: I27869821dc2f534500ec96b48df7a52ce27b58d8
Signed-off-by: Harry Huang <huangxiangyu5@huawei.com>

9 files changed, 32 insertions, 32 deletions

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
index 816e435a..4dd8860f 100644
--- 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
@@ -8,12 +8,18 @@
 ##############################################################################
 ---
 
+- 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/"
+  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 }} \
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 f9015ffc..2610d618 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,10 @@
     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-3.2.0/requirements.txt
-    tar zcf /opt/{{ networking_odl_pkg_name }} networking-odl-3.2.0
-    rm -rf networking-odl-3.2.0
+    sed -i 's/^neutron-lib.*/neutron-lib/' {{ odl_pip }}/requirements.txt
+    pip install -r {{ odl_pip }}/requirements.txt
+    tar zcf /opt/{{ networking_odl_pkg_name }} {{ odl_pip }}
+    rm -rf {{ odl_pip }}
     cd -
 
 - name: odl pip package install
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
index 7fc10e7d..30ee61fb 100644
--- 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
@@ -20,3 +20,15 @@
 - 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_08_configure_neutron.yml b/deploy/adapters/ansible/roles/odl_cluster/tasks/01_08_configure_neutron.yml
index 5135c8cf..80443f1b 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
@@ -38,17 +38,6 @@
         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: |
diff --git a/deploy/adapters/ansible/roles/odl_cluster/templates/acl_conf.sh b/deploy/adapters/ansible/roles/odl_cluster/templates/acl_conf.sh
index d05f33e5..4962a17c 100755
--- a/deploy/adapters/ansible/roles/odl_cluster/templates/acl_conf.sh
+++ b/deploy/adapters/ansible/roles/odl_cluster/templates/acl_conf.sh
@@ -1,5 +1,5 @@
 ##############################################################################
-# Copyright (c) 2016 HUAWEI TECHNOLOGIES CO.,LTD and others.
+# Copyright (c) 2017 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
diff --git a/deploy/adapters/ansible/roles/odl_cluster/templates/org.apache.karaf.features.cfg.Redhat b/deploy/adapters/ansible/roles/odl_cluster/templates/org.apache.karaf.features.cfg.Redhat
index 0691a984..3ffe830e 100755
--- a/deploy/adapters/ansible/roles/odl_cluster/templates/org.apache.karaf.features.cfg.Redhat
+++ b/deploy/adapters/ansible/roles/odl_cluster/templates/org.apache.karaf.features.cfg.Redhat
@@ -36,22 +36,12 @@
 #
 # Comma separated list of features repositories to register by default
 #
-featuresRepositories = mvn:org.apache.karaf.features/standard/3.0.3/xml/features,mvn:org.apache.karaf.features/enterprise/3.0.3/xml/features,mvn:org.ops4j.pax.web/pax-web-features/3.1.4/xml/features,mvn:org.apache.karaf.features/spring/3.0.3/xml/features,mvn:org.opendaylight.integration/features-integration-index/0.4.2-Beryllium-SR2/xml/features
-#featuresRepositories = mvn:org.apache.karaf.features/standard/3.0.3/xml/features,mvn:org.apache.karaf.features/enterprise/3.0.3/xml/features,mvn:org.ops4j.pax.web/pax-web-features/3.1.4/xml/features,mvn:org.apache.karaf.features/spring/3.0.3/xml/features,mvn:org.opendaylight.integration/features-integration-index/0.4.0-Beryllium/xml/features
-#featuresRepositories = mvn:org.apache.karaf.features/standard/3.0.3/xml/features,mvn:org.apache.karaf.features/enterprise/3.0.3/xml/features,mvn:org.ops4j.pax.web/pax-web-features/3.1.4/xml/features,mvn:org.apache.karaf.features/spring/3.0.3/xml/features,mvn:org.opendaylight.integration/features-integration-index/0.4.0-Beryllium-RC1/xml/features 
-#mvn:org.apache.karaf.features/standard/3.0.3/xml/features,mvn:org.apache.karaf.features/enterprise/3.0.3/xml/features,mvn:org.ops4j.pax.web/pax-web-features/3.1.4/xml/features,mvn:org.apache.karaf.features/spring/3.0.3/xml/features,mvn:org.opendaylight.integration/features-integration-index/0.3.3-Lithium-SR3/xml/features
-#mvn:org.apache.karaf.features/standard/3.0.3/xml/features,mvn:org.apache.karaf.features/enterprise/3.0.3/xml/features,mvn:org.ops4j.pax.web/pax-web-features/3.1.4/xml/features,mvn:org.apache.karaf.features/spring/3.0.3/xml/features,mvn:org.opendaylight.integration/features-integration-index/0.3.2-Lithium-SR2/xml/features
+featuresRepositories = mvn:org.apache.karaf.features/standard/3.0.7/xml/features,mvn:org.apache.karaf.features/enterprise/3.0.7/xml/features,mvn:org.ops4j.pax.web/pax-web-features/3.2.9/xml/features,mvn:org.apache.karaf.features/spring/3.0.7/xml/features,mvn:org.opendaylight.integration/features-integration-index/0.5.2-Boron-SR2/xml/features
 
 #
 # Comma separated list of features to install at startup
 #
-#featuresBoot=config,standard,region,package,kar,ssh,management,odl-restconf-all,odl-aaa-authn,odl-dlux-all,odl-ovsdb-openstack
-featuresBoot=config,standard,region,package,kar,ssh,management,odl-ovsdb-openstack
-
-#,odl-restconf-all,odl-aaa-authn,odl-dlux-all
-
-# odl-base-all,odl-restconf,odl-ovsdb-openstack,odl-dlux-all,odl-mdsal-apidocs
-#,odl-mdsal-clustering,odl-openflowplugin-flow-services
+featuresBoot=config,standard,region,package,kar,ssh,management,odl-restconf-all,odl-aaa-authn,odl-dlux-all,odl-ovsdb-openstack,odl-mdsal-apidocs,odl-dlux-core,odl-openflowplugin-nxm-extensions
 
 #
 # Defines if the boot features are started in asynchronous mode (in a dedicated thread)
diff --git a/deploy/adapters/ansible/roles/odl_cluster/vars/Debian.yml b/deploy/adapters/ansible/roles/odl_cluster/vars/Debian.yml
index 65666203..c78c5221 100755
--- a/deploy/adapters/ansible/roles/odl_cluster/vars/Debian.yml
+++ b/deploy/adapters/ansible/roles/odl_cluster/vars/Debian.yml
@@ -18,4 +18,4 @@ service_file:
   src: opendaylight.service
   dst: /lib/systemd/system/opendaylight.service
 
-networking_odl_pkg_name: networking-odl-3.2.0.tar.gz
+# networking_odl_pkg_name: networking-odl-3.2.0.tar.gz
diff --git a/deploy/adapters/ansible/roles/odl_cluster/vars/RedHat.yml b/deploy/adapters/ansible/roles/odl_cluster/vars/RedHat.yml
index ef92dff6..a2e6d01d 100755
--- a/deploy/adapters/ansible/roles/odl_cluster/vars/RedHat.yml
+++ b/deploy/adapters/ansible/roles/odl_cluster/vars/RedHat.yml
@@ -15,5 +15,5 @@ service_ovs_name: openvswitch
 service_ovs_agent_name: neutron-openvswitch-agent
 
 service_file:
-  src: opendaylight
-  dst: /etc/init.d/opendaylight
+  src: opendaylight.service
+  dst: /lib/systemd/system/opendaylight.service
diff --git a/deploy/adapters/ansible/roles/odl_cluster/vars/main.yml b/deploy/adapters/ansible/roles/odl_cluster/vars/main.yml
index fac2a11e..f038c7a9 100755
--- a/deploy/adapters/ansible/roles/odl_cluster/vars/main.yml
+++ b/deploy/adapters/ansible/roles/odl_cluster/vars/main.yml
@@ -52,4 +52,6 @@ jdk8_script_name: install_jdk8.tar
 common_packages_noarch: []
 
 odl_pip:
-  - networking_odl
+  - networking-odl-3.2.0
+
+networking_odl_pkg_name: networking-odl-3.2.0.tar.gz