summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDan Smith <daniel.smith@ericsson.com>2015-05-15 16:22:35 -0400
committerDan Smith <daniel.smith@ericsson.com>2015-05-15 16:22:35 -0400
commit9c13f3590337816816a09954cb7bd3be0302a383 (patch)
treeab9f81d78d1784f7a42b092a9d28f24c4db2b462
parent2debee7a4f97a6a9d90aa55877264b3c62e3e2df (diff)
Update for SR3 Helium for ODL and refactoring other files.
Change-Id: I5e616652f1084211bab4f8054dbf700112a89774 JIRA: 0 Signed-off-by: Dan Smith <daniel.smith@ericsson.com>
-rwxr-xr-xfuel/build/f_odl_docker/dockerfile/Dockerfile4
-rwxr-xr-xfuel/build/f_odl_docker/dockerfile/container_scripts/check_feature.sh2
-rwxr-xr-xfuel/build/f_odl_docker/dockerfile/container_scripts/speak.sh3
-rwxr-xr-xfuel/build/f_odl_docker/dockerfile/container_scripts/start_odl_docker.sh4
4 files changed, 7 insertions, 6 deletions
diff --git a/fuel/build/f_odl_docker/dockerfile/Dockerfile b/fuel/build/f_odl_docker/dockerfile/Dockerfile
index e8d5953..e3c7ee5 100755
--- a/fuel/build/f_odl_docker/dockerfile/Dockerfile
+++ b/fuel/build/f_odl_docker/dockerfile/Dockerfile
@@ -32,11 +32,11 @@ RUN bash -c 'echo "export JAVA_HOME=/usr/lib/jvm/java-7-openjdk-amd64" >> ~/.bas
#Now lets got and fetch the ODL distribution
RUN echo "Fetching ODL"
-RUN wget https://nexus.opendaylight.org/content/groups/public/org/opendaylight/integration/distribution-karaf/0.2.2-Helium-SR2/distribution-karaf-0.2.2-Helium-SR2.tar.gz -O /opt/odl_source/distribution-karaf-0.2.2-Helium-SR2.tar.gz
+RUN wget https://nexus.opendaylight.org/content/groups/public/org/opendaylight/integration/distribution-karaf/0.2.3-Helium-SR3/distribution-karaf-0.2.3-Helium-SR3.tar.gz -O /opt/odl_source/distribution-karaf-0.2.3-Helium-SR3.tar.gz
RUN echo "Untarring ODL inplace"
RUN mkdir -p /opt/odl
-RUN tar zxvf /opt/odl_source/distribution-karaf-0.2.2-Helium-SR2.tar.gz -C /opt/odl
+RUN tar zxvf /opt/odl_source/distribution-karaf-0.2.3-Helium-SR3.tar.gz -C /opt/odl
RUN echo "Installing DLUX and other features into ODL"
COPY tmp/dockerfile/container_scripts/start_odl_docker.sh /etc/init.d/start_odl_docker.sh
diff --git a/fuel/build/f_odl_docker/dockerfile/container_scripts/check_feature.sh b/fuel/build/f_odl_docker/dockerfile/container_scripts/check_feature.sh
index fc21fc9..3e5d0b2 100755
--- a/fuel/build/f_odl_docker/dockerfile/container_scripts/check_feature.sh
+++ b/fuel/build/f_odl_docker/dockerfile/container_scripts/check_feature.sh
@@ -1,5 +1,5 @@
#!/usr/bin/expect
-spawn /opt/odl/distribution-karaf-0.2.2-Helium-SR2/bin/client
+spawn /opt/odl/distribution-karaf-0.2.3-Helium-SR3/bin/client
expect "root>"
send "feature:list | grep -i odl-restconf\r"
send "\r\r\r"
diff --git a/fuel/build/f_odl_docker/dockerfile/container_scripts/speak.sh b/fuel/build/f_odl_docker/dockerfile/container_scripts/speak.sh
index 2d363c9..3ba07a8 100755
--- a/fuel/build/f_odl_docker/dockerfile/container_scripts/speak.sh
+++ b/fuel/build/f_odl_docker/dockerfile/container_scripts/speak.sh
@@ -6,8 +6,9 @@
# Simple expect script to start up ODL client and load feature set for DLUX and OVSDB
#
# NOTE: THIS WILL BE REPLACED WITH A PROGRAMATIC METHOD SHORTLY
+# DEPRECATED AFTER ARNO
-spawn /opt/odl/distribution-karaf-0.2.2-Helium-SR2/bin/client
+spawn /opt/odl/distribution-karaf-0.2.3-Helium-SR3/bin/client
expect "root>"
send "feature:install odl-base-all odl-aaa-authn odl-restconf odl-nsf-all odl-adsal-northbound odl-mdsal-apidocs odl-ovsdb-openstack odl-ovsdb-northbound odl-dlux-core"
send "\r\r\r"
diff --git a/fuel/build/f_odl_docker/dockerfile/container_scripts/start_odl_docker.sh b/fuel/build/f_odl_docker/dockerfile/container_scripts/start_odl_docker.sh
index a985b97..1c72dda 100755
--- a/fuel/build/f_odl_docker/dockerfile/container_scripts/start_odl_docker.sh
+++ b/fuel/build/f_odl_docker/dockerfile/container_scripts/start_odl_docker.sh
@@ -13,7 +13,7 @@ export JAVA_HOME=/usr/lib/jvm/java-7-openjdk-amd64
#MAIN
echo "Starting up the da Sheilds..."
-/opt/odl/distribution-karaf-0.2.2-Helium-SR2/bin/karaf server &
+/opt/odl/distribution-karaf-0.2.3-Helium-SR3/bin/karaf server &
echo "Sleeping 5 bad hack"
sleep 10
echo "should see stuff listening now"
@@ -33,6 +33,6 @@ ps -efa
while true;
do
echo "Checking status of ODL:"
- /opt/odl/distribution-karaf-0.2.2-Helium-SR2/bin/status
+ /opt/odl/distribution-karaf-0.2.3-Helium-SR3/bin/status
sleep 60
done