Skip to content

Commit

Permalink
support for debian wheezy backports for docker provisioning
Browse files Browse the repository at this point in the history
  • Loading branch information
sanju-a committed Dec 9, 2015
1 parent 3d0d281 commit f18be05
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 5 deletions.
2 changes: 1 addition & 1 deletion cluster/manifests.hash
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ ifmap-server.manifest md5=f27327ed74c803a53809aad5e26cbc45
kube-network-manager.manifest md5=9b4bbd234cd058ef8f151b8ac99c5c1f
provision_gateway.sh md5=09bbf72327df335f76eb83442f5e6613
provision_kubelet_plugin.sh md5=a74fad60dfc14f2ab034c132ed5afa12
provision_master.sh md5=83fa8fa2f9ccfe2035ce4add71df7433
provision_master.sh md5=28d70c337931cb93603bad764e1a0a0a
provision_minion.sh md5=5dcbc05af65c24aeafa080571e6bcebb
provision_vrouter_kernel.sh md5=d380ec23b5d9dc20b635edb1d9aa96e2
rabbitmq.manifest md5=fe26b2f66c2adfd94c85c1971be50267
Expand Down
11 changes: 7 additions & 4 deletions cluster/provision_master.sh
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,11 @@ set -o pipefail
LOG_FILE=/var/log/contrail/provision_master.log
mkdir -p /var/log/contrail
runok="/etc/contrail/opencontrail_control_prov_run.ok"
exec 1<&- # Close STDOUT file descriptor
exec 2<&- # Close STDERR FD
exec 1<>$LOG_FILE # Open STDOUT as $LOG_FILE file for read and write.
exec 2>&1 # Redirect STDERR to STDOUT
#exec 1<&- # Close STDOUT file descriptor
#exec 2<&- # Close STDERR FD
#exec 1<>$LOG_FILE # Open STDOUT as $LOG_FILE file for read and write.
#exec 2>&1 # Redirect STDERR to STDOUT
exec 2>&1 &> >(tee -a "$LOG_FILE")

# contrail-kubernetes setup and provisioning script. For more info, please refer to
# https://github.com/Juniper/contrail-kubernetes
Expand Down Expand Up @@ -75,6 +76,7 @@ function isGceVM()

function prereq_install_contrail()
{
set +e
doc=$(which docker)
if [ "$OS_TYPE" == $REDHAT ]; then
docon=$(rpm -qa | grep docker)
Expand All @@ -93,6 +95,7 @@ function prereq_install_contrail()
curl -sSL https://get.docker.com/ | sh
fi
fi
set -e
}

# This is to support VM images that
Expand Down

0 comments on commit f18be05

Please sign in to comment.