summaryrefslogtreecommitdiffstats
path: root/fuel/build/f_odl_docker
diff options
context:
space:
mode:
authorJonas Bjurel <jonas.bjurel@ericsson.com>2015-06-20 16:38:21 +0000
committerGerrit Code Review <gerrit@172.30.200.206>2015-06-20 16:38:21 +0000
commit4f2ea18e79939bf71476fe010a3a6ee65660349f (patch)
tree04c5669909464f8a28d95e23fdb5f1b6170ae40d /fuel/build/f_odl_docker
parent8d3f8f9eb6633352f4cc4dcc93f1cfb5c2e15940 (diff)
parenta7c763a679eab63a8887bb85158ebdd38213e9a0 (diff)
Merge "Fix typo: conatiner => container"
Diffstat (limited to 'fuel/build/f_odl_docker')
-rw-r--r--fuel/build/f_odl_docker/puppet/modules/opnfv/manifests/odl_docker.pp2
-rwxr-xr-xfuel/build/f_odl_docker/puppet/modules/opnfv/scripts/start_odl_container.sh4
2 files changed, 3 insertions, 3 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 c286127..56f0216 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
@@ -30,7 +30,7 @@ class opnfv::odl_docker
mode => 750,
}
- file { '/opt/opnfv/odl/start_odl_conatiner.sh':
+ file { '/opt/opnfv/odl/start_odl_container.sh':
ensure => present,
source => '/etc/puppet/modules/opnfv/scripts/start_odl_container.sh',
mode => 750,
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 347ac74..7b91f4f 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
@@ -2,7 +2,7 @@
# Ericsson Canada Inc.
# Authoer: Daniel Smith
#
-# A helper script to install and setup the ODL docker conatiner on the controller
+# A helper script to install and setup the ODL docker container on the controller
#
#
# Inputs: odl_docker_image.tar
@@ -86,7 +86,7 @@ then
echo "Starting Container in Interactive Mode (/bin/bash will be provided, you will need to run ./start_odl_docker.sh inside the container yourself)"
$LOCALPATH/$DOCKERBINNAME 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 -t loving_daniel /bin/bash
else
- echo "Starting Conatiner in Daemon mode - no shell will be provided and docker attach will not provide shell)"
+ echo "Starting Container in Daemon mode - no shell will be provided and docker attach will not provide shell)"
$LOCALPATH/$DOCKERBINNAME 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
echo "should see the process listed here in docker ps -a"
$LOCALPATH/$DOCKERBINNAME ps -a;