summaryrefslogtreecommitdiffstats
path: root/common/puppet-opnfv
diff options
context:
space:
mode:
authorDan Smith <daniel.smith@ericsson.com>2015-06-03 10:42:21 -0400
committerDan Smith <daniel.smith@ericsson.com>2015-06-03 10:42:59 -0400
commit63c018f2bd68f5fb197299beb1dba5dc2be7f90a (patch)
treec5d0a4dda43b01f1d263cb306b2bd00721f31815 /common/puppet-opnfv
parent43e4f62a1bab53966fef803b69cf0724a279ec4f (diff)
Fixed scripts inside ODL container to match SR3 release naming.
Change-Id: I3c9b7acb8972bd34afc01f3aad9a1f5ec9a1b99f JIRA: 0 Signed-off-by: Dan Smith <daniel.smith@ericsson.com>
Diffstat (limited to 'common/puppet-opnfv')
-rw-r--r--common/puppet-opnfv/manifests/templates/dockerfile/container_scripts/check_feature.sh2
-rw-r--r--common/puppet-opnfv/manifests/templates/dockerfile/container_scripts/speak.sh2
-rw-r--r--common/puppet-opnfv/manifests/templates/dockerfile/container_scripts/start_odl_docker_container.sh4
3 files changed, 4 insertions, 4 deletions
diff --git a/common/puppet-opnfv/manifests/templates/dockerfile/container_scripts/check_feature.sh b/common/puppet-opnfv/manifests/templates/dockerfile/container_scripts/check_feature.sh
index 5062a46..533942e 100644
--- a/common/puppet-opnfv/manifests/templates/dockerfile/container_scripts/check_feature.sh
+++ b/common/puppet-opnfv/manifests/templates/dockerfile/container_scripts/check_feature.sh
@@ -8,7 +8,7 @@
##############################################################################
#!/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/common/puppet-opnfv/manifests/templates/dockerfile/container_scripts/speak.sh b/common/puppet-opnfv/manifests/templates/dockerfile/container_scripts/speak.sh
index d5fb217..95bbaf4 100644
--- a/common/puppet-opnfv/manifests/templates/dockerfile/container_scripts/speak.sh
+++ b/common/puppet-opnfv/manifests/templates/dockerfile/container_scripts/speak.sh
@@ -12,7 +12,7 @@
# NOTE: THIS WILL BE REPLACED WITH A PROGRAMATIC METHOD SHORTLY
#################################################################################
-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/common/puppet-opnfv/manifests/templates/dockerfile/container_scripts/start_odl_docker_container.sh b/common/puppet-opnfv/manifests/templates/dockerfile/container_scripts/start_odl_docker_container.sh
index 46049be..8ae05f7 100644
--- a/common/puppet-opnfv/manifests/templates/dockerfile/container_scripts/start_odl_docker_container.sh
+++ b/common/puppet-opnfv/manifests/templates/dockerfile/container_scripts/start_odl_docker_container.sh
@@ -21,7 +21,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"
@@ -41,7 +41,7 @@ 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