From: Loic Dachary <ldachary@redhat.com>
Date: Sat, 5 Mar 2016 01:57:46 +0000 (+0700)
Subject: openstack: install docker in the teuthology instance
X-Git-Tag: 1.1.0~211^2~92
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=cfae9ad2bea1b5fb52398dc248559e35558d6a24;p=teuthology.git

openstack: install docker in the teuthology instance

Signed-off-by: Loic Dachary <loic@dachary.org>
---

diff --git a/teuthology/openstack/setup-openstack.sh b/teuthology/openstack/setup-openstack.sh
index 3be3cc65..b6647bb2 100755
--- a/teuthology/openstack/setup-openstack.sh
+++ b/teuthology/openstack/setup-openstack.sh
@@ -99,6 +99,18 @@ EOF
     return 0
 }
 
+function setup_docker() {
+    if test -f /etc/apt/sources.list.d/docker.list ; then
+        echo "OK docker is installed"
+    else
+        sudo apt-key adv --keyserver hkp://p80.pool.sks-keyservers.net:80 --recv-keys 58118E89F3A912897C070ADBF76221572C52609D
+        echo deb https://apt.dockerproject.org/repo ubuntu-trusty main | sudo tee -a /etc/apt/sources.list.d/docker.list
+        sudo apt-get update
+        sudo apt-get -qq install -y docker-engine
+        echo "INSTALLED docker"
+    fi
+}
+
 function teardown_paddles() {
     if pkill -f 'pecan' ; then
         echo "SHUTDOWN the paddles server"
@@ -473,6 +485,7 @@ function main() {
     local ceph_workbench_branch
 
     local do_setup_keypair=false
+    local do_setup_docker=false
     local do_ceph_workbench=false
     local do_create_config=false
     local do_setup_dnsmasq=false
@@ -524,6 +537,9 @@ function main() {
             --config)
                 do_create_config=true
                 ;;
+            --setup-docker)
+                do_setup_docker=true
+                ;;
             --setup-keypair)
                 do_setup_keypair=true
                 ;;
@@ -547,6 +563,7 @@ function main() {
                 do_ceph_workbench=true
                 do_create_config=true
                 do_setup_keypair=true
+                do_setup_docker=true
                 do_setup_dnsmasq=true
                 do_setup_paddles=true
                 do_setup_pulpito=true
@@ -608,6 +625,10 @@ function main() {
         get_or_create_keypair $keypair || return 1
     fi
 
+    if $do_setup_docker ; then
+        setup_docker || return 1
+    fi
+
     if $do_setup_dnsmasq ; then
         setup_dnsmasq || return 1
         define_dnsmasq $subnet $labdomain || return 1