From 08fc4477bff0219d0277a63a9ab82a03087f7ef5 Mon Sep 17 00:00:00 2001
From: Harry Huang <huangxiangyu5@huawei.com>
Date: Wed, 25 Jan 2017 20:54:29 +0800
Subject: 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>
---
 .../roles/odl_cluster/templates/acl_conf.sh        | 12 +++++++
 .../roles/odl_cluster/templates/opendaylight       | 31 ----------------
 .../roles/odl_cluster/templates/opendaylight.conf  | 42 ----------------------
 .../templates/org.apache.karaf.features.cfg.Debian |  4 +--
 4 files changed, 14 insertions(+), 75 deletions(-)
 create mode 100755 deploy/adapters/ansible/roles/odl_cluster/templates/acl_conf.sh
 delete mode 100755 deploy/adapters/ansible/roles/odl_cluster/templates/opendaylight
 delete mode 100755 deploy/adapters/ansible/roles/odl_cluster/templates/opendaylight.conf

(limited to 'deploy/adapters/ansible/roles/odl_cluster/templates')

diff --git a/deploy/adapters/ansible/roles/odl_cluster/templates/acl_conf.sh b/deploy/adapters/ansible/roles/odl_cluster/templates/acl_conf.sh
new file mode 100755
index 00000000..d05f33e5
--- /dev/null
+++ b/deploy/adapters/ansible/roles/odl_cluster/templates/acl_conf.sh
@@ -0,0 +1,12 @@
+##############################################################################
+# 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
+##############################################################################
+mkdir -p {{ odl_home }}etc/opendaylight/datastore/initial/config/
+CONFFILE=$(find {{ odl_home }} -name "*aclservice*config.xml")
+cp $CONFFILE {{ odl_home }}etc/opendaylight/datastore/initial/config/netvirt-aclservice-config.xml
+sed -i s/stateful/transparent/ {{ odl_home }}etc/opendaylight/datastore/initial/config/netvirt-aclservice-config.xml
diff --git a/deploy/adapters/ansible/roles/odl_cluster/templates/opendaylight b/deploy/adapters/ansible/roles/odl_cluster/templates/opendaylight
deleted file mode 100755
index 90a267d6..00000000
--- a/deploy/adapters/ansible/roles/odl_cluster/templates/opendaylight
+++ /dev/null
@@ -1,31 +0,0 @@
-#!/bin/bash
-# chkconfig: 345 98 2
-# description: ODL controller
-# OpenDaylight service controller script
-export JAVA_HOME=/usr/lib/jvm/java-8-oracle
-USER=odl
-
-cd /opt/opendaylight-0.3.0
-case "$1" in
-    start)
-        /bin/su -m $USER -s /bin/bash -c ./bin/start
-        ;;
-    stop)
-        /bin/su -m $USER -s /bin/bash -c ./bin/stop
-        ;;
-    status)
-        PID=`ps aux | grep java | grep karaf | awk '{print $2}'`
-        if test -z $PID
-        then
-          echo "ODL is down..."
-          exit 1
-        else
-          echo "ODL is running... PID $PID"
-          exit 0
-        fi
-        ;;
-    *)
-        echo "Usage: $0 {start|stop|status}"
-        exit 1
-        ;;
-esac
diff --git a/deploy/adapters/ansible/roles/odl_cluster/templates/opendaylight.conf b/deploy/adapters/ansible/roles/odl_cluster/templates/opendaylight.conf
deleted file mode 100755
index 105bb265..00000000
--- a/deploy/adapters/ansible/roles/odl_cluster/templates/opendaylight.conf
+++ /dev/null
@@ -1,42 +0,0 @@
-
-# vim:set ft=upstart ts=2 et:
-description "OpenDaylight controller"
-author "mskalski@miranits.com"
-
-start on runlevel [2345]
-stop on runlevel [!2345]
-
-#setgid odl
-#setuid odl
-
-env KARAF_HOME="/opt/opendaylight-0.3.0"
-#env JAVA_HOME="/usr/lib/jvm/java-7-openjdk-amd64"
-env JAVA_HOME="/usr/lib/jvm/java-8-oracle"
-env JAVA_OPTS="-server -Xms128M -Xmx4096M -XX:+UnlockDiagnosticVMOptions -XX:+UnsyncloadClass -XX:MaxPermSize=512M -Dcom.sun.management.jmxremote"
-env OPTS="-Dkaraf.startLocalConsole=true -Dkaraf.startRemoteShell=true"
-env MAIN="org.apache.karaf.main.Main"
-
-
-chdir /opt/opendaylight-0.3.0
-
-script
-  export KARAF_BASE="$KARAF_HOME"
-  export KARAF_DATA="$KARAF_BASE/data"
-  export KARAF_ETC="$KARAF_BASE/etc"
-  export LD_LIBRARY_PATH="${LD_LIBRARY_PATH}:$KARAF_BASE/lib"
-  export JAVA_ENDORSED_DIRS="${JAVA_HOME}/jre/lib/endorsed:${JAVA_HOME}/lib/endorsed:${KARAF_HOME}/lib/endorsed"
-  export JAVA_EXT_DIRS="${JAVA_HOME}/jre/lib/ext:${JAVA_HOME}/lib/ext:${KARAF_HOME}/lib/ext"
-  export JAVA_SECURITY_PRO="${KARAF_HOME}/etc/odl.java.security"
-
-    for file in "$KARAF_HOME"/lib/karaf*.jar
-    do
-        if [ -z "$CLASSPATH" ]; then
-            CLASSPATH="$file"
-        else
-            CLASSPATH="$CLASSPATH:$file"
-        fi
-    done
-
-    exec $JAVA_HOME/bin/java -Djava.security.properties="${JAVA_SECURITY_PRO}" $JAVA_OPTS -Djava.endorsed.dirs="${JAVA_ENDORSED_DIRS}" -Djava.ext.dirs="${JAVA_EXT_DIRS}" -Dkaraf.instances="${KARAF_HOME}/instances" -Dkaraf.home="$KARAF_HOME" -Dkaraf.base="$KARAF_BASE" -Dkaraf.data="$KARAF_DATA" -Dkaraf.etc="$KARAF_ETC" -Djava.io.tmpdir="$KARAF_DATA/tmp" -Djava.util.logging.config.file="$KARAF_BASE/etc/java.util.logging.properties" $KARAF_OPTS $OPTS -classpath "$CLASSPATH" $MAIN
-
-end script
diff --git a/deploy/adapters/ansible/roles/odl_cluster/templates/org.apache.karaf.features.cfg.Debian b/deploy/adapters/ansible/roles/odl_cluster/templates/org.apache.karaf.features.cfg.Debian
index f3f6ad54..eebd47a6 100755
--- a/deploy/adapters/ansible/roles/odl_cluster/templates/org.apache.karaf.features.cfg.Debian
+++ b/deploy/adapters/ansible/roles/odl_cluster/templates/org.apache.karaf.features.cfg.Debian
@@ -36,12 +36,12 @@
 #
 # Comma separated list of features repositories to register by default
 #
-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.0-Boron/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,odl-base-all,odl-nsf-all,odl-adsal-northbound,odl-mdsal-apidocs,odl-ovsdb-northbound,odl-dlux-core
+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)
-- 
cgit 1.2.3-korg