diff options
| author | Jenkins <jenkins@review.openstack.org> | 2015-04-28 12:40:43 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2015-04-28 12:40:43 +0000 |
| commit | 4887662c45863fff5771b4dbd10fbbdc75629539 (patch) | |
| tree | 5adea3a51a752b3466d5ccd565e8c1f9d1991524 /docker/nova-compute | |
| parent | 5f1cfa824ff79853ebe39244fc29a6f8add0e6ca (diff) | |
| parent | 76c1fe63717492fbe84b86c7f5c87b1b042cf446 (diff) | |
| download | kolla-4887662c45863fff5771b4dbd10fbbdc75629539.tar.gz kolla-4887662c45863fff5771b4dbd10fbbdc75629539.zip | |
Merge "Change the default shell to bash"
Diffstat (limited to 'docker/nova-compute')
| -rwxr-xr-x | docker/nova-compute/nova-compute/config-nova-compute.sh | 2 | ||||
| -rwxr-xr-x | docker/nova-compute/nova-compute/start.sh | 2 | ||||
| -rwxr-xr-x | docker/nova-compute/nova-libvirt/start.sh | 2 | ||||
| -rwxr-xr-x | docker/nova-compute/nova-network/config-nova-network.sh | 2 | ||||
| -rwxr-xr-x | docker/nova-compute/nova-network/start.sh | 2 |
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 |