Delivering script for use with ODL automation to start ODL in daemon mode only.

To start ODL after a fuel deployment simply run "/opt/opnfv/odl/stage_odl.sh" and the DLUX GUI
will be listening at http://<br-ex ip>:8181/dlux/index.html

Usage / Order:
  - after you have deployed login to controller and run config_net.sh
  - do the same for your compute nodes
  - login to controller and run stage_odl.sh
	note: Ensure that you are able to reach the internet / and resolv.conf is set to a valid DNS
  - create neutron networks and look in gui that your Nodes show up.

Change-Id: Iba3d99152052e9e31a6f709b510a30c8b080aa26
JIRA: 0
Signed-off-by: Dan Smith <daniel.smith@ericsson.com>

5 files changed, 390 insertions, 0 deletions

diff --git a/fuel/build/f_odl_docker/puppet/modules/opnfv/manifests/odl_docker.pp b/fuel/build/f_odl_docker/puppet/modules/opnfv/manifests/odl_docker.pp
index 7370169..24f28e4 100644
--- a/fuel/build/f_odl_docker/puppet/modules/opnfv/manifests/odl_docker.pp
+++ b/fuel/build/f_odl_docker/puppet/modules/opnfv/manifests/odl_docker.pp
@@ -35,6 +35,17 @@ class opnfv::odl_docker
         source => '/etc/puppet/modules/opnfv/scripts/start_odl_container.sh',
         mode   => 750,
       }
+      file { '/opt/opnfv/odl/stage_odl.sh':
+        ensure => present,
+        source => '/etc/puppet/modules/opnfv/scripts/stage_odl.sh',
+        mode   => 750,
+      }
+      file { '/opt/opnfv/odl/config_net.sh':
+        ensure => present,
+        source => '/etc/puppet/modules/opnfv/scripts/config_net.sh',
+        mode   => 750,
+      }
+
 
       # fix failed to find the cgroup root issue
       # https://github.com/docker/docker/issues/8791
diff --git a/fuel/build/f_odl_docker/puppet/modules/opnfv/scripts/config_net_odl.sh b/fuel/build/f_odl_docker/puppet/modules/opnfv/scripts/config_net_odl.sh
new file mode 100755
index 0000000..d292acd
--- /dev/null
+++ b/fuel/build/f_odl_docker/puppet/modules/opnfv/scripts/config_net_odl.sh
@@ -0,0 +1,164 @@
+#!/bin/bash
+#
+# Author: Daniel Smith (Ericsson)
+#
+# Script to update neutron configuration for OVSDB/ODL integratino
+#
+#  Usage - Set / pass CONTROL_HOST to your needs
+#
+CONTROL_HOST=172.30.9.70
+
+# ENV
+source ~/openrc
+
+# VARS
+ML2_CONF=/etc/neutron/plugins/ml2/ml2_conf.ini
+MODE=0
+
+
+# FUNCTIONS
+
+# Update ml2_conf.ini
+function update_ml2conf {
+        echo "Backing up and modifying ml2_conf.ini"
+        cp $ML2_CONF $ML2_CONF.bak
+        sed -i -e 's/mechanism_drivers =openvswitch/mechanism_drivers = opendaylight/g' $ML2_CONF
+        sed -i -e 's/tenant_network_types = flat,vlan,gre,vxlan/tenant_network_types = vxlan/g' $ML2_CONF
+        cat "[ml2_odl]" >> $ML2_CONF
+        cat "password = admin" >> $ML2_CONF
+        cat "username = admin" >> $ML2_CONF
+        cat "url = http://${CONTROL_HOST}:8080/controller/nb/v2/neutron" >> $ML2_CONF
+}
+
+function reset_neutrondb {
+        echo "Reseting DB"
+        mysql -e "drop database if exists neutron_ml2;"
+        mysql -e "create database neutron_ml2 character set utf8;"
+        mysql -e "grant all on neutron_ml2.* to 'neutron'@'%';"
+        neutron-db-manage --config-file /etc/neutron/neutron.conf --config-file /etc/neutron/plugin.ini upgrade head
+}
+
+function restart_neutron {
+        echo "Restarting Neutron Server"
+        service neutron-server restart
+        echo "Should see Neutron runing now"
+        service neutron-server status
+        echo "Shouldnt be any nets, but should work (return empty)"
+        neutron net-list
+}
+
+function stop_neutron {
+        echo "Stopping Neutron / OVS components"
+        service  neutron-plugin-openvswitch-agent stop
+        if [ $MODE == "0" ]
+        then
+                service neutron-server stop
+        fi
+}
+
+
+
+function verify_ML2_working {
+        echo "checking that we can talk via ML2 properly"
+        curl -u admin:admin http://${CONTROL_HOST}:8080/controller/nb/v2/neutron/networks > /tmp/check_ml2
+        if grep "network" /tmp/check_ml2
+        then
+                echo "Success - ML2 to ODL is working"
+        else
+                echo "im sorry Jim, but its dead"
+        fi
+
+}
+
+
+function set_mode {
+        if ls -l /var/lib/glance/images
+        then
+                echo "Controller Mode"
+                MODE=0
+        else
+                echo "Compute Mode"
+                MODE=1
+        fi
+}
+
+function stop_ovs {
+        echo "Stopping OpenVSwitch"
+        service openvswitch-switch stop
+
+}
+
+function control_setup {
+        echo "Modifying Controller"
+        stop_neutron
+        stop_ovs
+        rm -rf /var/log/openvswitch/*
+        mkdir -p /opt/opnfv/odl/ovs_back
+        mv /etc/openvswitch/conf.db /opt/opnfv/odl/ovs_back/.
+        mv /etc/openvswitch/.conf*lock* /opt/opnfv/odl/ovs_back/.
+        service openvswitch-switch start
+        ovs-vsctl set-manager tcp:172.30.9.70:6640
+        ovs-vsctl add-br br-eth0
+        ovs-vsctl add-br br-ex
+        ovs-vsctl add-port br-eth0 eth0
+        ovs-vsctl add-port br-eth0 br-eth0--br-ex
+        ovs-vsctl add-port br-ex br-ex--br-eth0
+        ovs-vsctl set interface br-ex--br-eth0 type=patch
+        ovs-vsctl set interface br-eth0--br-ex type=patch
+        ovs-vsctl set interface br-ex--br-eth0 options:peer=br-eth0--br-ex
+        ovs-vsctl set interface br-eth0--br-ex options:peer=br-ex--br-eth0
+        ifconfig br-ex 172.30.9.70/24 up
+        service neutron-server restart
+
+        echo "setting up networks"
+        ip link add link eth1 name br-mgmt type vlan id 300
+        ip link add link eth1 name br-storage type vlan id 301
+        /etc/init.d/networking restart
+
+
+        echo "Reset Neutron DB"
+        #reset_neutrondb
+        echo "Restarting Neutron Components"
+        #restart_neutron
+        echo "Verifying ODL ML2 plugin is working"
+        verify_ML2_working
+
+}
+
+function compute_setup {
+        echo "do compute stuff here"
+        echo "stopping neutron openvswitch plugin"
+        stop_neutron
+        ip link add link eth1 name br-mgmt type vlan id 300
+        ifconfig br-mgmt `grep address /etc/network/interfaces.d/ifcfg-br-mgmt | awk -F" " '{print $2}'`/24
+        ip link add link eth1 name br-storage type vlan id 301
+        ifconfig br-storage `grep address /etc/network/interfaces.d/ifcfg-br-storage | awk -F" " '{print $2}'`/24
+        ifconfig eth1 `grep address /etc/network/interfaces.d/ifcfg-br-fw-mgmt | awk -F" " '{print $2}'`/24
+        echo "set manager, and route for ODL controller"
+        ovs-vsctl set-manager tcp:192.168.0.2:6640
+        route add 172.17.0.1 gw 192.168.0.2
+        verify_ML2_working
+}
+
+
+# MAIN
+echo "Starting to make call"
+update_ml2conf
+echo "Check Mode"
+set_mode
+
+if [ $MODE == "0" ];
+then
+        echo "Calling control setup"
+        control_setup
+elif [ $MODE == "1" ];
+then
+        echo "Calling compute setup"
+        compute_setup
+
+else
+        echo "Something is bad - call for help"
+        exit
+fi
+
+
diff --git a/fuel/build/f_odl_docker/puppet/modules/opnfv/scripts/stage_odl.sh b/fuel/build/f_odl_docker/puppet/modules/opnfv/scripts/stage_odl.sh
new file mode 100755
index 0000000..a7613c3
--- /dev/null
+++ b/fuel/build/f_odl_docker/puppet/modules/opnfv/scripts/stage_odl.sh
@@ -0,0 +1,49 @@
+#!/bin/bash
+#   Author: Daniel Smith (Ericsson)
+#   Stages ODL Controlleer
+#   Inputs:  odl_docker_image.tar
+#   Usage:  ./stage_odl.sh
+
+# ENVS
+source ~/.bashrc
+source ~/openrc
+
+LOCALPATH=/opt/opnfv/odl
+DOCKERBIN=docker-latest
+ODLIMGNAME=odl_docker_image.tar
+DNS=8.8.8.8
+HOST_IP=`ifconfig br-ex | grep -i "inet addr" | awk -F":" '{print $2}' | awk -F" " '{print $1}'`
+
+
+# DEBUG ECHOS
+echo $LOCALPATH
+echo $DOCKERBIN
+echo $ODLIMGNAME
+echo $DNS
+echo $HOST_IP
+
+
+
+# Start Docker daemon and in background
+echo "Starting Docker"
+chmod +x $LOCALPATH/$DOCKERBIN
+$LOCALPATH/$DOCKERBIN -d &
+#courtesy sleep for virtual env
+sleep 2
+
+# Import the ODL Container
+echo "Importing ODL Container"
+$LOCALPATH/$DOCKERBIN load -i $LOCALPATH/$ODLIMGNAME
+
+# Start ODL, load DLUX and OVSDB modules
+echo "Removing any old install found - file not found is ok here"
+$LOCALPATH/$DOCKERBIN rm odl_docker
+echo "Starting up ODL controller in Daemon mode - no shell possible"
+$LOCALPATH/$DOCKERBIN  run --name odl_docker -p 8181:8181 -p 8185:8185 -p 9000:9000 -p 1099:1099 -p 8101:8101 -p 6633:6633 -p 43506:43506 -p 44444:44444 -p 6653:6653 -p 12001:12001 -p 6400:6400 -p 6640:6640 -p 8080:8080 -p 7800:7800 -p 55130:55130 -p 52150:52150 -p 36826:26826 -i -d -t loving_daniel
+
+# Following, you should see the docker ps listed and a port opened
+echo " you should reach ODL controller at http://HOST_IP:8181/dlux/index.html"
+$LOCALPATH/$DOCKERBINNAME ps -a
+netstat -lnt
+
+
diff --git a/fuel/build/f_odl_docker/puppet/modules/opnfv/scripts/start_odl_container.sh b/fuel/build/f_odl_docker/puppet/modules/opnfv/scripts/start_odl_container.sh
index 0bddd20..347ac74 100755
--- a/fuel/build/f_odl_docker/puppet/modules/opnfv/scripts/start_odl_container.sh
+++ b/fuel/build/f_odl_docker/puppet/modules/opnfv/scripts/start_odl_container.sh
@@ -8,6 +8,8 @@
 #   Inputs:  odl_docker_image.tar
 #
 #   Usage:  ./start_odl_docker.sh
+echo "DEPRECATED - USE stage_odl.sh instead  - this will be removed shortly once automated deployment is working - SR1"
+
 
 # ENVS
 source ~/.bashrc
diff --git a/fuel/build/f_odl_docker/scripts/config_net_odl.sh b/fuel/build/f_odl_docker/scripts/config_net_odl.sh
new file mode 100644
index 0000000..d292acd
--- /dev/null
+++ b/fuel/build/f_odl_docker/scripts/config_net_odl.sh
@@ -0,0 +1,164 @@
+#!/bin/bash
+#
+# Author: Daniel Smith (Ericsson)
+#
+# Script to update neutron configuration for OVSDB/ODL integratino
+#
+#  Usage - Set / pass CONTROL_HOST to your needs
+#
+CONTROL_HOST=172.30.9.70
+
+# ENV
+source ~/openrc
+
+# VARS
+ML2_CONF=/etc/neutron/plugins/ml2/ml2_conf.ini
+MODE=0
+
+
+# FUNCTIONS
+
+# Update ml2_conf.ini
+function update_ml2conf {
+        echo "Backing up and modifying ml2_conf.ini"
+        cp $ML2_CONF $ML2_CONF.bak
+        sed -i -e 's/mechanism_drivers =openvswitch/mechanism_drivers = opendaylight/g' $ML2_CONF
+        sed -i -e 's/tenant_network_types = flat,vlan,gre,vxlan/tenant_network_types = vxlan/g' $ML2_CONF
+        cat "[ml2_odl]" >> $ML2_CONF
+        cat "password = admin" >> $ML2_CONF
+        cat "username = admin" >> $ML2_CONF
+        cat "url = http://${CONTROL_HOST}:8080/controller/nb/v2/neutron" >> $ML2_CONF
+}
+
+function reset_neutrondb {
+        echo "Reseting DB"
+        mysql -e "drop database if exists neutron_ml2;"
+        mysql -e "create database neutron_ml2 character set utf8;"
+        mysql -e "grant all on neutron_ml2.* to 'neutron'@'%';"
+        neutron-db-manage --config-file /etc/neutron/neutron.conf --config-file /etc/neutron/plugin.ini upgrade head
+}
+
+function restart_neutron {
+        echo "Restarting Neutron Server"
+        service neutron-server restart
+        echo "Should see Neutron runing now"
+        service neutron-server status
+        echo "Shouldnt be any nets, but should work (return empty)"
+        neutron net-list
+}
+
+function stop_neutron {
+        echo "Stopping Neutron / OVS components"
+        service  neutron-plugin-openvswitch-agent stop
+        if [ $MODE == "0" ]
+        then
+                service neutron-server stop
+        fi
+}
+
+
+
+function verify_ML2_working {
+        echo "checking that we can talk via ML2 properly"
+        curl -u admin:admin http://${CONTROL_HOST}:8080/controller/nb/v2/neutron/networks > /tmp/check_ml2
+        if grep "network" /tmp/check_ml2
+        then
+                echo "Success - ML2 to ODL is working"
+        else
+                echo "im sorry Jim, but its dead"
+        fi
+
+}
+
+
+function set_mode {
+        if ls -l /var/lib/glance/images
+        then
+                echo "Controller Mode"
+                MODE=0
+        else
+                echo "Compute Mode"
+                MODE=1
+        fi
+}
+
+function stop_ovs {
+        echo "Stopping OpenVSwitch"
+        service openvswitch-switch stop
+
+}
+
+function control_setup {
+        echo "Modifying Controller"
+        stop_neutron
+        stop_ovs
+        rm -rf /var/log/openvswitch/*
+        mkdir -p /opt/opnfv/odl/ovs_back
+        mv /etc/openvswitch/conf.db /opt/opnfv/odl/ovs_back/.
+        mv /etc/openvswitch/.conf*lock* /opt/opnfv/odl/ovs_back/.
+        service openvswitch-switch start
+        ovs-vsctl set-manager tcp:172.30.9.70:6640
+        ovs-vsctl add-br br-eth0
+        ovs-vsctl add-br br-ex
+        ovs-vsctl add-port br-eth0 eth0
+        ovs-vsctl add-port br-eth0 br-eth0--br-ex
+        ovs-vsctl add-port br-ex br-ex--br-eth0
+        ovs-vsctl set interface br-ex--br-eth0 type=patch
+        ovs-vsctl set interface br-eth0--br-ex type=patch
+        ovs-vsctl set interface br-ex--br-eth0 options:peer=br-eth0--br-ex
+        ovs-vsctl set interface br-eth0--br-ex options:peer=br-ex--br-eth0
+        ifconfig br-ex 172.30.9.70/24 up
+        service neutron-server restart
+
+        echo "setting up networks"
+        ip link add link eth1 name br-mgmt type vlan id 300
+        ip link add link eth1 name br-storage type vlan id 301
+        /etc/init.d/networking restart
+
+
+        echo "Reset Neutron DB"
+        #reset_neutrondb
+        echo "Restarting Neutron Components"
+        #restart_neutron
+        echo "Verifying ODL ML2 plugin is working"
+        verify_ML2_working
+
+}
+
+function compute_setup {
+        echo "do compute stuff here"
+        echo "stopping neutron openvswitch plugin"
+        stop_neutron
+        ip link add link eth1 name br-mgmt type vlan id 300
+        ifconfig br-mgmt `grep address /etc/network/interfaces.d/ifcfg-br-mgmt | awk -F" " '{print $2}'`/24
+        ip link add link eth1 name br-storage type vlan id 301
+        ifconfig br-storage `grep address /etc/network/interfaces.d/ifcfg-br-storage | awk -F" " '{print $2}'`/24
+        ifconfig eth1 `grep address /etc/network/interfaces.d/ifcfg-br-fw-mgmt | awk -F" " '{print $2}'`/24
+        echo "set manager, and route for ODL controller"
+        ovs-vsctl set-manager tcp:192.168.0.2:6640
+        route add 172.17.0.1 gw 192.168.0.2
+        verify_ML2_working
+}
+
+
+# MAIN
+echo "Starting to make call"
+update_ml2conf
+echo "Check Mode"
+set_mode
+
+if [ $MODE == "0" ];
+then
+        echo "Calling control setup"
+        control_setup
+elif [ $MODE == "1" ];
+then
+        echo "Calling compute setup"
+        compute_setup
+
+else
+        echo "Something is bad - call for help"
+        exit
+fi
+
+