Skip to content

Commit

Permalink
Revert "Add set -e to all the entrypoint scripts"
Browse files Browse the repository at this point in the history
We have always been ignoring errors from the iptables
commands(on master nodes). Revert this while we figure
out a way to eliminate them altogether.

This reverts commit 7e7eb9a.
  • Loading branch information
derekhiggins committed Jul 30, 2019
1 parent 5c2f1f8 commit 8123ac4
Show file tree
Hide file tree
Showing 5 changed files with 0 additions and 11 deletions.
2 changes: 0 additions & 2 deletions rundnsmasq.sh
Original file line number Diff line number Diff line change
@@ -1,7 +1,5 @@
#!/usr/bin/bash

set -e

PROVISIONING_INTERFACE=${PROVISIONING_INTERFACE:-"provisioning"}

HTTP_PORT=${HTTP_PORT:-"80"}
Expand Down
2 changes: 0 additions & 2 deletions runhttpd.sh
Original file line number Diff line number Diff line change
@@ -1,7 +1,5 @@
#!/usr/bin/bash

set -e

PROVISIONING_INTERFACE=${PROVISIONING_INTERFACE:-"provisioning"}
HTTP_PORT=${HTTP_PORT:-"80"}
HTTP_IP=$(ip -4 address show dev "$PROVISIONING_INTERFACE" | grep -oP '(?<=inet\s)\d+(\.\d+){3}' | head -n 1)
Expand Down
2 changes: 0 additions & 2 deletions runironic-api.sh
Original file line number Diff line number Diff line change
@@ -1,7 +1,5 @@
#!/usr/bin/bash

set -e

. /bin/configure-ironic.sh

# Allow access to Ironic
Expand Down
2 changes: 0 additions & 2 deletions runironic-conductor.sh
Original file line number Diff line number Diff line change
@@ -1,7 +1,5 @@
#!/usr/bin/bash

set -e

. /bin/configure-ironic.sh

# Allow access to mDNS
Expand Down
3 changes: 0 additions & 3 deletions runmariadb.sh
Original file line number Diff line number Diff line change
@@ -1,7 +1,4 @@
#!/usr/bin/bash

set -e

PATH=$PATH:/usr/sbin/
DATADIR="/var/lib/mysql"
MARIADB_PASSWORD=${MARIADB_PASSWORD:-"change_me"}
Expand Down

0 comments on commit 8123ac4

Please sign in to comment.