Merge "Upgrade odl from carbon to nitrogen"

10 files changed, 44 insertions, 35 deletions

diff --git a/plugins/odl_sfc/roles/setup-odl-sfc/files/odl_pkg.sh b/plugins/odl_sfc/roles/setup-odl-sfc/files/odl_pkg.sh
new file mode 100755
index 00000000..d93da3fd
--- /dev/null
+++ b/plugins/odl_sfc/roles/setup-odl-sfc/files/odl_pkg.sh
@@ -0,0 +1,21 @@
+#!/bin/bash
+
+rm -rf /home/networking
+rm -rf /home/tmp
+
+mkdir -p /home/networking
+mkdir -p /home/tmp
+
+cd /home/networking
+
+git clone https://github.com/openstack/networking-odl.git -b stable/ocata
+git clone https://github.com/openstack/networking-sfc.git -b stable/ocata
+
+sed -i 's/^Babel.*/Babel!=2.4.0,>=2.3.4/' /home/networking/networking-odl/requirements.txt
+
+pip wheel /home/networking/networking-odl/ -w /home/tmp/
+pip wheel /home/networking/networking-sfc/ -w /home/tmp/
+
+cp /home/tmp/networking* /var/www/repo/os-releases/15.1.4/ubuntu-16.04-x86_64/
+
+sleep 30
diff --git a/plugins/odl_sfc/roles/setup-odl-sfc/files/opendaylight.service b/plugins/odl_sfc/roles/setup-odl-sfc/files/opendaylight.service
index f4801a36..a6966d82 100755
--- a/plugins/odl_sfc/roles/setup-odl-sfc/files/opendaylight.service
+++ b/plugins/odl_sfc/roles/setup-odl-sfc/files/opendaylight.service
@@ -10,7 +10,7 @@ Type=simple
 WorkingDirectory=/opt/opendaylight
 PermissionsStartOnly=true
 ExecStartPre=
-ExecStart=/usr/lib/jvm/java-8-oracle/bin/java -Djava.security.properties=/opt/opendaylight/etc/odl.java.security -server -Xms128M -Xmx2048m -XX:+UnlockDiagnosticVMOptions -XX:+UnsyncloadClass -XX:+HeapDumpOnOutOfMemoryError -Dcom.sun.management.jmxremote -Djava.security.egd=file:/dev/./urandom -Djava.endorsed.dirs=/usr/lib/jvm/java-8-oracle/jre/lib/endorsed:/usr/lib/jvm/java-8-oracle/lib/endorsed:/opt/opendaylight/lib/endorsed -Djava.ext.dirs=/usr/lib/jvm/java-8-oracle/jre/lib/ext:/usr/lib/jvm/java-8-oracle/lib/ext:/opt/opendaylight/lib/ext -Dkaraf.instances=/opt/opendaylight/instances -Dkaraf.home=/opt/opendaylight -Dkaraf.base=/opt/opendaylight -Dkaraf.data=/opt/opendaylight/data -Dkaraf.etc=/opt/opendaylight/etc -Djava.io.tmpdir=/opt/opendaylight/data/tmp -Djava.util.logging.config.file=/opt/opendaylight/etc/java.util.logging.properties -Dkaraf.startLocalConsole=false -Dkaraf.startRemoteShell=true -classpath /opt/opendaylight/lib/karaf.branding-1.8.1-SNAPSHOT.jar:/opt/opendaylight/lib/karaf-jaas-boot.jar:/opt/opendaylight/lib/karaf.jar:/opt/opendaylight/lib/karaf-org.osgi.core.jar org.apache.karaf.main.Main
+ExecStart=/usr/lib/jvm/java-8-oracle/bin/java -Djava.security.properties=/opt/opendaylight/etc/odl.java.security -server -Xms128M -Xmx2048m -XX:+UnlockDiagnosticVMOptions -XX:+UnsyncloadClass -XX:+HeapDumpOnOutOfMemoryError -Dcom.sun.management.jmxremote -Djava.security.egd=file:/dev/./urandom -Djava.endorsed.dirs=/usr/lib/jvm/java-8-oracle/jre/lib/endorsed:/usr/lib/jvm/java-8-oracle/lib/endorsed:/opt/opendaylight/lib/endorsed -Djava.ext.dirs=/usr/lib/jvm/java-8-oracle/jre/lib/ext:/usr/lib/jvm/java-8-oracle/lib/ext:/opt/opendaylight/lib/ext -Dkaraf.instances=/opt/opendaylight/instances -Dkaraf.home=/opt/opendaylight -Dkaraf.base=/opt/opendaylight -Dkaraf.data=/opt/opendaylight/data -Dkaraf.etc=/opt/opendaylight/etc -Dkaraf.restart.jvm.supported=true -Djava.io.tmpdir=/opt/opendaylight/data/tmp -Djava.util.logging.config.file=/opt/opendaylight/etc/java.util.logging.properties -Dkaraf.startLocalConsole=false -Dkaraf.startRemoteShell=true -classpath /opt/opendaylight/lib/boot/org.apache.karaf.diagnostic.boot-4.0.9.jar:/opt/opendaylight/lib/boot/org.apache.karaf.jaas.boot-4.0.9.jar:/opt/opendaylight/lib/boot/org.apache.karaf.main-4.0.9.jar:/opt/opendaylight/lib/boot/org.osgi.core-6.0.0.jar org.apache.karaf.main.Main
 Restart=on-failure
 LimitNOFILE=65535
 TimeoutStopSec=15
diff --git a/plugins/odl_sfc/roles/setup-odl-sfc/tasks/control-agents-1.yml b/plugins/odl_sfc/roles/setup-odl-sfc/tasks/control-agents-1.yml
index dc071cc7..684f314c 100755
--- a/plugins/odl_sfc/roles/setup-odl-sfc/tasks/control-agents-1.yml
+++ b/plugins/odl_sfc/roles/setup-odl-sfc/tasks/control-agents-1.yml
@@ -8,7 +8,6 @@
 - name: install networking-odl
   pip:
     name: networking-odl
-    version: "{{ networking_odl_version }}"
     virtualenv: /openstack/venvs/neutron-15.1.4
 
 - name: configure vsctl for dhcp agent
diff --git a/plugins/odl_sfc/roles/setup-odl-sfc/tasks/control-hosts-1.yml b/plugins/odl_sfc/roles/setup-odl-sfc/tasks/control-hosts-1.yml
index 6879340e..9ca27e0a 100755
--- a/plugins/odl_sfc/roles/setup-odl-sfc/tasks/control-hosts-1.yml
+++ b/plugins/odl_sfc/roles/setup-odl-sfc/tasks/control-hosts-1.yml
@@ -94,6 +94,11 @@
     sed -i 's/port="8282"/port="8081"/'
     {{ odl_home }}configuration/tomcat-server.xml
 
+- name: modify 8181 to 8081
+  shell: >
+    sed -i 's/8181/8081/'
+    {{ odl_home }}etc/org.ops4j.pax.web.cfg
+
 - name: remove karaf data directory
   file:
     path: "{{ odl_home }}data"
diff --git a/plugins/odl_sfc/roles/setup-odl-sfc/tasks/control-repos-1.yml b/plugins/odl_sfc/roles/setup-odl-sfc/tasks/control-repos-1.yml
index 2e58e141..7b699a35 100755
--- a/plugins/odl_sfc/roles/setup-odl-sfc/tasks/control-repos-1.yml
+++ b/plugins/odl_sfc/roles/setup-odl-sfc/tasks/control-repos-1.yml
@@ -1,27 +1,9 @@
 ---
+- name: copy download script
+  copy:
+    src: odl_pkg.sh
+    dest: /opt/odl_pkg.sh
+    mode: 0777
 
-- name: download networking-odl
-  get_url:
-    url: "{{ odl_pip }}"
-    dest: /var/www/repo/os-releases/15.1.4/ubuntu-16.04-x86_64
-
-- name: download networking-sfc
-  shell: |
-    mkdir -p /opt/tmp
-    pip install networking-sfc==4.0.0 -d /opt/tmp/
-    cp /opt/tmp/networking* /var/www/repo/os-releases/15.1.4/ubuntu-16.04-x86_64/
-    rm -rf /opt/tmp
-  when:
-    - odl_sfc == "Enable"
-    - inventory_hostname in groups['repo_container'][0]
-
-- name: patch networking-odl to fix a bug
-  shell: |
-    cd /var/www/repo/os-releases/15.1.4/ubuntu-16.04-x86_64/
-    tar -zxf networking-odl-4.0.0.tar.gz # hard code, need to modify
-    rm -rf networking-odl-4.0.0.tar.gz
-    sed -i 's/^Babel.*/Babel!=2.4.0,>=2.3.4/' networking-odl-4.0.0/requirements.txt
-    tar -zcf networking-odl-4.0.0.tar.gz networking-odl-4.0.0/
-    rm -rf networking-odl-4.0.0/
-    pip install networking-odl-4.0.0.tar.gz -d ./
-    cd -
+- name: download networking sfc and odl
+  command: su -s /bin/sh -c "/opt/odl_pkg.sh"
diff --git a/plugins/odl_sfc/roles/setup-odl-sfc/tasks/control-servers-1.yml b/plugins/odl_sfc/roles/setup-odl-sfc/tasks/control-servers-1.yml
index e2dd128d..40149346 100755
--- a/plugins/odl_sfc/roles/setup-odl-sfc/tasks/control-servers-1.yml
+++ b/plugins/odl_sfc/roles/setup-odl-sfc/tasks/control-servers-1.yml
@@ -8,13 +8,11 @@
 - name: install networking-odl
   pip:
     name: networking-odl
-    version: "{{ networking_odl_version }}"
     virtualenv: /openstack/venvs/neutron-15.1.4    # Todo: hardcode, need to modify
 
 - name: install networking-sfc
   pip:
     name: networking-sfc
-    version: "4.0.0"
     virtualenv: /openstack/venvs/neutron-15.1.4
   when: odl_sfc == "Enable"
 
diff --git a/plugins/odl_sfc/roles/setup-odl-sfc/tasks/control-utility-1.yml b/plugins/odl_sfc/roles/setup-odl-sfc/tasks/control-utility-1.yml
index 613c796b..d10634fa 100755
--- a/plugins/odl_sfc/roles/setup-odl-sfc/tasks/control-utility-1.yml
+++ b/plugins/odl_sfc/roles/setup-odl-sfc/tasks/control-utility-1.yml
@@ -3,5 +3,4 @@
 - name: Install networking-sfc for CLI
   pip:
     name: networking-sfc
-    version: "4.0.0"
   when: odl_sfc == "Enable"
diff --git a/plugins/odl_sfc/roles/setup-odl-sfc/tasks/odl-cluster.yml b/plugins/odl_sfc/roles/setup-odl-sfc/tasks/odl-cluster.yml
index a22e980f..09faaa27 100755
--- a/plugins/odl_sfc/roles/setup-odl-sfc/tasks/odl-cluster.yml
+++ b/plugins/odl_sfc/roles/setup-odl-sfc/tasks/odl-cluster.yml
@@ -15,7 +15,7 @@
 - include: control-repos-1.yml
   vars:
     odl_pip: "{{ networking_odl_url }}"
-  when: inventory_hostname in groups['repo_container']
+  when: inventory_hostname == groups['repo_container'][0]
 
 - include: control-servers-1.yml
   when: inventory_hostname in groups['neutron_server']
diff --git a/plugins/odl_sfc/roles/setup-odl-sfc/templates/org.apache.karaf.features.cfg b/plugins/odl_sfc/roles/setup-odl-sfc/templates/org.apache.karaf.features.cfg
index b07e028f..afb7e6b5 100755
--- a/plugins/odl_sfc/roles/setup-odl-sfc/templates/org.apache.karaf.features.cfg
+++ b/plugins/odl_sfc/roles/setup-odl-sfc/templates/org.apache.karaf.features.cfg
@@ -36,12 +36,15 @@
 #
 # Comma separated list of features repositories to register by default
 #
-featuresRepositories = mvn:org.apache.karaf.features/standard/3.0.8/xml/features,mvn:org.apache.karaf.features/enterprise/3.0.8/xml/features,mvn:org.ops4j.pax.web/pax-web-features/3.2.9/xml/features,mvn:org.apache.karaf.features/spring/3.0.8/xml/features,mvn:org.opendaylight.integration/features-integration-index/0.6.1-SNAPSHOT/xml/features
+featuresRepositories = \
+    mvn:org.opendaylight.integration/features-index/0.7.0/xml/features, \
+    mvn:org.apache.karaf.features/framework/4.0.9/xml/features, \
+    mvn:org.apache.karaf.features/standard/4.0.9/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-netvirt-openstack,odl-mdsal-apidocs,odl-dlux-core,odl-dluxapps-nodes,odl-dluxapps-topology,odl-dluxapps-yangui,odl-dluxapps-yangvisualizer,odl-l2switch-switch,odl-l2switch-switch-ui,odl-ovsdb-hwvtepsouthbound-ui,odl-ovsdb-southbound-impl-ui,odl-netvirt-ui,odl-openflowplugin-flow-services-ui,odl-neutron-logger,odl-netvirt-sfc
+featuresBoot=config,standard,wrap,package,kar,ssh,management,odl-restconf-all,odl-aaa-authn,odl-netvirt-openstack,odl-mdsal-apidocs,odl-dlux-core,odl-netvirt-ui,odl-netvirt-sfc
 
 #
 # Defines if the boot features are started in asynchronous mode (in a dedicated thread)
diff --git a/plugins/odl_sfc/roles/setup-odl-sfc/vars/main.yml b/plugins/odl_sfc/roles/setup-odl-sfc/vars/main.yml
index a9466ea0..b3d71edb 100755
--- a/plugins/odl_sfc/roles/setup-odl-sfc/vars/main.yml
+++ b/plugins/odl_sfc/roles/setup-odl-sfc/vars/main.yml
@@ -7,6 +7,8 @@
 # http://www.apache.org/licenses/LICENSE-2.0
 ##############################################################################
 ---
+openstack_passwd_file: /etc/openstack_deploy/user_secrets.yml
+
 odl_username: admin
 odl_password: admin
 odl_api_port: 8181
@@ -16,8 +18,8 @@ sfc_plugins:
   src: sfc.conf
   dst: /opt/sfc.conf
 
-odl_pkg_url: distribution-karaf-0.6.1-Carbon.tar.gz
-odl_pkg_name: distribution-karaf-0.6.1-Carbon.tar.gz
+odl_pkg_url: karaf-0.7.0.tar.gz
+odl_pkg_name: karaf-0.7.0.tar.gz
 odl_home: "/opt/opendaylight/"
 odl_base_features:
   - config