Checking for docker binary along with the package

Juniper · Dec 2, 2015 · 43db30d · 43db30d
1 parent 16d06b2
commit 43db30d
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 6 deletions.
diff --git a/cluster/manifests.hash b/cluster/manifests.hash
@@ -9,9 +9,9 @@ contrail-vrouter-agent.manifest md5=75706835d2b6b3ba1be0228e9cbb30e7
 contrail-web.manifest md5=2c773343f4b4f421d7d4d9c06f0850ad
 ifmap-server.manifest md5=f27327ed74c803a53809aad5e26cbc45
 kube-network-manager.manifest md5=9b4bbd234cd058ef8f151b8ac99c5c1f
-provision_gateway.sh md5=4412540af29e907ffbf06df57172a6bc
-provision_kubelet_plugin.sh md5=f816d53b0b1da563360b0a0d0f790eb1
-provision_master.sh md5=cffdd70e3793643c5e29cf849ddaeb1b
+provision_gateway.sh md5=6394c93170d3e4311fcc18ff15eebff2
+provision_kubelet_plugin.sh md5=1808bc7b35619d2eb9cb5638730f0516
+provision_master.sh md5=c65610bbb7f0b811b669e626c5ead574
 provision_minion.sh md5=f3c5e20e5b97178ba3fb6a87b1857f71
 provision_vrouter_kernel.sh md5=d380ec23b5d9dc20b635edb1d9aa96e2
 rabbitmq.manifest md5=fe26b2f66c2adfd94c85c1971be50267

diff --git a/cluster/provision_gateway.sh b/cluster/provision_gateway.sh
@@ -262,13 +262,14 @@ function update_vhost_pre_up()
 
 function prereq_vrouter_agent()
 {
+  doc=$(which docker)
   if [ "$OS_TYPE" == $REDHAT ]; then
      docon=$(rpm -qa | grep docker)
   elif [ "$OS_TYPE" == $UBUNTU ]; then
      docon=$(dpkg -l | grep docker)
   fi
 
-  if [ -z "$docon" ]; then
+  if [ -z "$docon" ] && [ -z "$doc" ]; then
      curl -sSL https://get.docker.com/ | sh
      if [ ! -f /usr/bin/docker ]; then
          if [ "$OS_TYPE" == $REDHAT ]; then

diff --git a/cluster/provision_kubelet_plugin.sh b/cluster/provision_kubelet_plugin.sh
@@ -88,13 +88,14 @@ function prep_to_install()
 
 function prereq_install_contrail()
 {
+  doc=$(which docker)
   if [ "$OS_TYPE" == $REDHAT ]; then
      docon=$(rpm -qa | grep docker)
   elif [ "$OS_TYPE" == $UBUNTU ]; then
      docon=$(dpkg -l | grep docker)
   fi
 
-  if [ -z "$docon" ]; then
+  if [ -z "$docon" ] && [ -z "$doc" ]; then
      curl -sSL https://get.docker.com/ | sh
      if [ ! -f /usr/bin/docker ]; then
          if [ "$OS_TYPE" == $REDHAT ]; then

diff --git a/cluster/provision_master.sh b/cluster/provision_master.sh
@@ -75,13 +75,14 @@ function isGceVM()
 
 function prereq_install_contrail()
 {
+  doc=$(which docker)
   if [ "$OS_TYPE" == $REDHAT ]; then
      docon=$(rpm -qa | grep docker)
   elif [ "$OS_TYPE" == $UBUNTU ]; then
      docon=$(dpkg -l | grep docker)
   fi
 
-  if [ -z "$docon" ] && [ ! -f /usr/bin/docker ]; then
+  if [ -z "$docon" ] && [ -z "$doc" ]; then
      curl -sSL https://get.docker.com/ | sh
      if [ ! -f /usr/bin/docker ]; then
          if [ "$OS_TYPE" == $REDHAT ]; then