diff options
| author | Jenkins <jenkins@review.openstack.org> | 2015-09-28 10:34:58 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2015-09-28 10:34:58 +0000 |
| commit | aadbbcbee0d19f60d7a8f6d3d04f61c1f1e48f30 (patch) | |
| tree | a131cd99311e41a6656773095e8bf02561a6b856 /docker/designate | |
| parent | 762b24cc1a29f6ba803ee2045d41f98d6adbed05 (diff) | |
| parent | 160f1cc0116bf93cfceffeb0149e525ba08eed3f (diff) | |
| download | kolla-aadbbcbee0d19f60d7a8f6d3d04f61c1f1e48f30.tar.gz kolla-aadbbcbee0d19f60d7a8f6d3d04f61c1f1e48f30.zip | |
Merge "remove set_configs"
Diffstat (limited to 'docker/designate')
| -rwxr-xr-x | docker/designate/designate-api/start.sh | 5 | ||||
| -rwxr-xr-x | docker/designate/designate-backend-bind9/start.sh | 5 | ||||
| -rwxr-xr-x | docker/designate/designate-central/start.sh | 5 | ||||
| -rwxr-xr-x | docker/designate/designate-mdns/start.sh | 5 | ||||
| -rwxr-xr-x | docker/designate/designate-poolmanager/start.sh | 5 | ||||
| -rwxr-xr-x | docker/designate/designate-sink/start.sh | 5 |
6 files changed, 6 insertions, 24 deletions
diff --git a/docker/designate/designate-api/start.sh b/docker/designate/designate-api/start.sh index fe556225b..816715fa9 100755 --- a/docker/designate/designate-api/start.sh +++ b/docker/designate/designate-api/start.sh @@ -1,15 +1,12 @@ #!/bin/bash - set -o errexit + CMD="/usr/bin/designate-api" ARGS="" # Loading common functions. source /opt/kolla/kolla-common.sh -# Execute config strategy -set_configs - # Bootstrap and exit if KOLLA_BOOTSTRAP variable is set. This catches all cases # of the KOLLA_BOOTSTRAP variable being set, including empty. if [[ "${!KOLLA_BOOTSTRAP[@]}" ]]; then diff --git a/docker/designate/designate-backend-bind9/start.sh b/docker/designate/designate-backend-bind9/start.sh index 11922974a..bd3f8c401 100755 --- a/docker/designate/designate-backend-bind9/start.sh +++ b/docker/designate/designate-backend-bind9/start.sh @@ -1,13 +1,10 @@ #!/bin/bash - set -o errexit + CMD="/usr/sbin/named" ARGS="-u named -g" # Execute config strategy source /opt/kolla/kolla-common.sh -# Execute config strategy -set_configs - exec $CMD $ARGS diff --git a/docker/designate/designate-central/start.sh b/docker/designate/designate-central/start.sh index eac012d3d..760f7eacd 100755 --- a/docker/designate/designate-central/start.sh +++ b/docker/designate/designate-central/start.sh @@ -1,13 +1,10 @@ #!/bin/bash - set -o errexit + CMD="/usr/bin/designate-central" ARGS="" # Loading common functions. source /opt/kolla/kolla-common.sh -# Execute config strategy -set_configs - exec $CMD $ARGS diff --git a/docker/designate/designate-mdns/start.sh b/docker/designate/designate-mdns/start.sh index b4bcda20c..026e8e6c3 100755 --- a/docker/designate/designate-mdns/start.sh +++ b/docker/designate/designate-mdns/start.sh @@ -1,13 +1,10 @@ #!/bin/bash - set -o errexit + CMD="/usr/bin/designate-mdns" ARGS="" # Loading common functions. source /opt/kolla/kolla-common.sh -# Execute config strategy -set_configs - exec $CMD $ARGS diff --git a/docker/designate/designate-poolmanager/start.sh b/docker/designate/designate-poolmanager/start.sh index 0752b9847..a648b9b37 100755 --- a/docker/designate/designate-poolmanager/start.sh +++ b/docker/designate/designate-poolmanager/start.sh @@ -1,13 +1,10 @@ #!/bin/bash - set -o errexit + CMD="/usr/bin/designate-pool-manager" ARGS="" # Loading common functions. source /opt/kolla/kolla-common.sh -# Execute config strategy -set_configs - exec $CMD $ARGS diff --git a/docker/designate/designate-sink/start.sh b/docker/designate/designate-sink/start.sh index d2f93e26f..94c70470c 100755 --- a/docker/designate/designate-sink/start.sh +++ b/docker/designate/designate-sink/start.sh @@ -1,13 +1,10 @@ #!/bin/bash - set -o errexit + CMD="/usr/bin/designate-sink" ARGS="" # Loading common functions. source /opt/kolla/kolla-common.sh -# Execute config strategy -set_configs - exec $CMD $ARGS |