aboutsummaryrefslogtreecommitdiff
path: root/docker/nova-compute
diff options
context:
space:
mode:
authorChen Zhiwei <zhiwchen@cn.ibm.com>2015-04-27 11:59:55 +0800
committerChen Zhiwei <zhiwchen@cn.ibm.com>2015-04-27 13:26:37 +0800
commit76c1fe63717492fbe84b86c7f5c87b1b042cf446 (patch)
tree6463500a8da572ac13e7cf775091abf1161223df /docker/nova-compute
parent8781dc570b81c19bb570331dc9fc6ac482e7df0f (diff)
downloadkolla-76c1fe63717492fbe84b86c7f5c87b1b042cf446.tar.gz
kolla-76c1fe63717492fbe84b86c7f5c87b1b042cf446.zip
Change the default shell to bash
Unify the shell to bash in all Kolla scripts. Change-Id: Ib9591b2f8f344eb88455c5e9b7ecf2164fb5960a Implements: blueprint use-bash-shell
Diffstat (limited to 'docker/nova-compute')
-rwxr-xr-xdocker/nova-compute/nova-compute/config-nova-compute.sh2
-rwxr-xr-xdocker/nova-compute/nova-compute/start.sh2
-rwxr-xr-xdocker/nova-compute/nova-libvirt/start.sh2
-rwxr-xr-xdocker/nova-compute/nova-network/config-nova-network.sh2
-rwxr-xr-xdocker/nova-compute/nova-network/start.sh2
5 files changed, 5 insertions, 5 deletions
diff --git a/docker/nova-compute/nova-compute/config-nova-compute.sh b/docker/nova-compute/nova-compute/config-nova-compute.sh
index 6235e5426..cb1b01fa1 100755
--- a/docker/nova-compute/nova-compute/config-nova-compute.sh
+++ b/docker/nova-compute/nova-compute/config-nova-compute.sh
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
. /opt/kolla/kolla-common.sh
. /opt/kolla/config-nova.sh
diff --git a/docker/nova-compute/nova-compute/start.sh b/docker/nova-compute/nova-compute/start.sh
index 47354f866..bafe37add 100755
--- a/docker/nova-compute/nova-compute/start.sh
+++ b/docker/nova-compute/nova-compute/start.sh
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
set -e
diff --git a/docker/nova-compute/nova-libvirt/start.sh b/docker/nova-compute/nova-libvirt/start.sh
index 04e5f9792..47a09399b 100755
--- a/docker/nova-compute/nova-libvirt/start.sh
+++ b/docker/nova-compute/nova-libvirt/start.sh
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
if [[ $(cat /proc/cpuinfo | grep vmx) ]]; then
modprobe kvm_intel
diff --git a/docker/nova-compute/nova-network/config-nova-network.sh b/docker/nova-compute/nova-network/config-nova-network.sh
index f8e036fda..6976d3a20 100755
--- a/docker/nova-compute/nova-network/config-nova-network.sh
+++ b/docker/nova-compute/nova-network/config-nova-network.sh
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
. /opt/kolla/config-nova.sh
diff --git a/docker/nova-compute/nova-network/start.sh b/docker/nova-compute/nova-network/start.sh
index b5fc89f85..b39a18ceb 100755
--- a/docker/nova-compute/nova-network/start.sh
+++ b/docker/nova-compute/nova-network/start.sh
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
set -e