Merge ~paride/autopkgtest-cloud:lint-shellscripts into autopkgtest-cloud:master
- Git
- lp:~paride/autopkgtest-cloud
- lint-shellscripts
- Merge into master
Proposed by
Paride Legovini
Status: | Merged |
---|---|
Approved by: | Tim Andersson |
Approved revision: | ef73341a1cf9f455d77cc93d9b58c45530253045 |
Merged at revision: | ef73341a1cf9f455d77cc93d9b58c45530253045 |
Proposed branch: | ~paride/autopkgtest-cloud:lint-shellscripts |
Merge into: | autopkgtest-cloud:master |
Diff against target: |
341 lines (+61/-52) 12 files modified
.launchpad.yaml (+8/-0) .pre-commit-config.yaml (+5/-0) charms/focal/autopkgtest-cloud-worker/autopkgtest-cloud/tools/build-adt-image (+11/-10) charms/focal/autopkgtest-cloud-worker/autopkgtest-cloud/tools/create-nova-image-new-release (+19/-20) charms/focal/autopkgtest-cloud-worker/autopkgtest-cloud/tools/create-test-instances (+1/-1) charms/focal/autopkgtest-cloud-worker/autopkgtest-cloud/tools/ensure-keypair (+5/-4) charms/focal/autopkgtest-cloud-worker/autopkgtest-cloud/tools/exec-in-region (+2/-1) charms/focal/autopkgtest-cloud-worker/autopkgtest-cloud/worker-config-production/setup-canonical.sh (+2/-0) ci/lint_test (+0/-8) lxc-slave-admin/cmd (+5/-5) mojo/make-lxd-secgroup (+1/-1) mojo/postdeploy (+2/-2) |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Tim Andersson | Approve | ||
Review via email: mp+445422@code.launchpad.net |
Commit message
Description of the change
To post a comment you must log in.
Revision history for this message
Paride Legovini (paride) wrote : | # |
Revision history for this message
Tim Andersson (andersson123) : | # |
review:
Approve
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1 | diff --git a/.launchpad.yaml b/.launchpad.yaml | |||
2 | index b08e2c3..a744b71 100755 | |||
3 | --- a/.launchpad.yaml | |||
4 | +++ b/.launchpad.yaml | |||
5 | @@ -1,8 +1,16 @@ | |||
6 | 1 | pipeline: | 1 | pipeline: |
7 | 2 | - pre_commit | ||
8 | 2 | - build_charms | 3 | - build_charms |
9 | 3 | - lint_test | 4 | - lint_test |
10 | 4 | 5 | ||
11 | 5 | jobs: | 6 | jobs: |
12 | 7 | pre_commit: | ||
13 | 8 | series: jammy | ||
14 | 9 | architectures: amd64 | ||
15 | 10 | packages: | ||
16 | 11 | - git | ||
17 | 12 | - pre-commit | ||
18 | 13 | run: pre-commit run --all-files --show-diff-on-failure | ||
19 | 6 | build_charms: | 14 | build_charms: |
20 | 7 | series: focal | 15 | series: focal |
21 | 8 | architectures: amd64 | 16 | architectures: amd64 |
22 | diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml | |||
23 | 9 | new file mode 100644 | 17 | new file mode 100644 |
24 | index 0000000..eb05b79 | |||
25 | --- /dev/null | |||
26 | +++ b/.pre-commit-config.yaml | |||
27 | @@ -0,0 +1,5 @@ | |||
28 | 1 | repos: | ||
29 | 2 | - repo: https://github.com/shellcheck-py/shellcheck-py | ||
30 | 3 | rev: v0.9.0.5 | ||
31 | 4 | hooks: | ||
32 | 5 | - id: shellcheck | ||
33 | diff --git a/charms/focal/autopkgtest-cloud-worker/autopkgtest-cloud/tools/build-adt-image b/charms/focal/autopkgtest-cloud-worker/autopkgtest-cloud/tools/build-adt-image | |||
34 | index be6b4d3..a0ad87a 100755 | |||
35 | --- a/charms/focal/autopkgtest-cloud-worker/autopkgtest-cloud/tools/build-adt-image | |||
36 | +++ b/charms/focal/autopkgtest-cloud-worker/autopkgtest-cloud/tools/build-adt-image | |||
37 | @@ -1,10 +1,11 @@ | |||
38 | 1 | #!/bin/bash | 1 | #!/bin/bash |
39 | 2 | # Build adt cloud images with create-nova-image-new-release for the given | 2 | # Build adt cloud images with create-nova-image-new-release for the given |
40 | 3 | # cloud, release and arch | 3 | # cloud, release and arch |
41 | 4 | # shellcheck disable=SC1090 | ||
42 | 4 | 5 | ||
43 | 5 | set -eu | 6 | set -eu |
44 | 6 | 7 | ||
46 | 7 | IFS="[- ]" read -r RELEASE REGION ARCH bootstrap <<< "$@" | 8 | IFS="[- ]" read -r RELEASE REGION ARCH _bootstrap <<< "$@" |
47 | 8 | 9 | ||
48 | 9 | if [ -z "${RELEASE}" ] || [ -z "${REGION}" ] || [ -z "${ARCH}" ]; then | 10 | if [ -z "${RELEASE}" ] || [ -z "${REGION}" ] || [ -z "${ARCH}" ]; then |
49 | 10 | echo "Usage: $0 RELEASE REGION ARCH" >&2 | 11 | echo "Usage: $0 RELEASE REGION ARCH" >&2 |
50 | @@ -12,8 +13,8 @@ if [ -z "${RELEASE}" ] || [ -z "${REGION}" ] || [ -z "${ARCH}" ]; then | |||
51 | 12 | fi | 13 | fi |
52 | 13 | 14 | ||
53 | 14 | if [ -z "${MIRROR:-}" ]; then | 15 | if [ -z "${MIRROR:-}" ]; then |
56 | 15 | if [ -e ~/mirror-${REGION}.rc ]; then | 16 | if [ -e ~/mirror-"${REGION}".rc ]; then |
57 | 16 | . ~/mirror-${REGION}.rc | 17 | . ~/mirror-"${REGION}".rc |
58 | 17 | else | 18 | else |
59 | 18 | . ~/mirror.rc | 19 | . ~/mirror.rc |
60 | 19 | fi | 20 | fi |
61 | @@ -24,10 +25,10 @@ export MIRROR | |||
62 | 24 | export NET_NAME | 25 | export NET_NAME |
63 | 25 | 26 | ||
64 | 26 | if [ -z "${USE_CLOUD_CONFIG_FROM_ENV:-}" ]; then | 27 | if [ -z "${USE_CLOUD_CONFIG_FROM_ENV:-}" ]; then |
67 | 27 | if [ -e ~/cloudrcs/${REGION}-${ARCH}.rc ]; then | 28 | if [ -e ~/cloudrcs/"${REGION}"-"${ARCH}".rc ]; then |
68 | 28 | . ~/cloudrcs/${REGION}-${ARCH}.rc | 29 | . ~/cloudrcs/"${REGION}"-"${ARCH}".rc |
69 | 29 | else | 30 | else |
71 | 30 | . ~/cloudrcs/${REGION}.rc | 31 | . ~/cloudrcs/"${REGION}".rc |
72 | 31 | fi | 32 | fi |
73 | 32 | fi | 33 | fi |
74 | 33 | 34 | ||
75 | @@ -73,11 +74,11 @@ fi | |||
76 | 73 | 74 | ||
77 | 74 | echo "$REGION-$ARCH: using image $IMG" | 75 | echo "$REGION-$ARCH: using image $IMG" |
78 | 75 | KEYNAME=${KEYNAME:-testbed-$(hostname)} | 76 | KEYNAME=${KEYNAME:-testbed-$(hostname)} |
80 | 76 | $(dirname $0)/create-nova-image-new-release $RELEASE $ARCH $IMG "${KEYNAME}" "$IMAGE_NAME" | 77 | "$(dirname "${0}")/create-nova-image-new-release" "${RELEASE}" "${ARCH}" "${IMG}" "${KEYNAME}" "${IMAGE_NAME}" |
81 | 77 | # clean old images | 78 | # clean old images |
84 | 78 | openstack image list --private -f value | grep --color=none -v "$IMAGE_NAME" | while read id img state; do | 79 | openstack image list --private -f value | grep --color=none -v "$IMAGE_NAME" | while read -r id img state; do |
85 | 79 | if $(echo ${img} | grep -qs "adt/ubuntu-${RELEASE}-${ARCH}") && [ ${state} = active ]; then | 80 | if echo "${img}" | grep -qs "adt/ubuntu-${RELEASE}-${ARCH}" && [ "${state}" = active ]; then |
86 | 80 | echo "Cleaning up old image $img ($id)" | 81 | echo "Cleaning up old image $img ($id)" |
88 | 81 | openstack image delete $id | 82 | openstack image delete "${id}" |
89 | 82 | fi | 83 | fi |
90 | 83 | done | 84 | done |
91 | diff --git a/charms/focal/autopkgtest-cloud-worker/autopkgtest-cloud/tools/create-nova-image-new-release b/charms/focal/autopkgtest-cloud-worker/autopkgtest-cloud/tools/create-nova-image-new-release | |||
92 | index bc51ff1..349c217 100755 | |||
93 | --- a/charms/focal/autopkgtest-cloud-worker/autopkgtest-cloud/tools/create-nova-image-new-release | |||
94 | +++ b/charms/focal/autopkgtest-cloud-worker/autopkgtest-cloud/tools/create-nova-image-new-release | |||
95 | @@ -1,6 +1,7 @@ | |||
96 | 1 | #!/bin/bash | 1 | #!/bin/bash |
97 | 2 | # create an autopkgtest nova image for a new release, based on a generic image | 2 | # create an autopkgtest nova image for a new release, based on a generic image |
98 | 3 | # Author: Martin Pitt <martin.pitt@ubuntu.com> | 3 | # Author: Martin Pitt <martin.pitt@ubuntu.com> |
99 | 4 | # shellcheck disable=SC2154 | ||
100 | 4 | set -eu | 5 | set -eu |
101 | 5 | RELEASE="${1:-}" | 6 | RELEASE="${1:-}" |
102 | 6 | ARCH="${2:-}" | 7 | ARCH="${2:-}" |
103 | @@ -48,9 +49,9 @@ else | |||
104 | 48 | fi | 49 | fi |
105 | 49 | 50 | ||
106 | 50 | # unbreak my server option :-( | 51 | # unbreak my server option :-( |
110 | 51 | userdata=`mktemp` | 52 | userdata=$(mktemp) |
111 | 52 | trap "rm $userdata" EXIT TERM INT QUIT PIPE | 53 | trap 'rm ${userdata}' EXIT TERM INT QUIT PIPE |
112 | 53 | cat <<EOF > $userdata | 54 | cat <<EOF > "${userdata}" |
113 | 54 | #cloud-config | 55 | #cloud-config |
114 | 55 | 56 | ||
115 | 56 | manage_etc_hosts: true | 57 | manage_etc_hosts: true |
116 | @@ -67,13 +68,13 @@ EOF | |||
117 | 67 | 68 | ||
118 | 68 | # create new instance | 69 | # create new instance |
119 | 69 | INSTNAME="${BASEIMG}-adt-prepare" | 70 | INSTNAME="${BASEIMG}-adt-prepare" |
121 | 70 | eval "$(openstack network show -f shell ${NET_NAME})" | 71 | eval "$(openstack network show -f shell "${NET_NAME}")" |
122 | 71 | 72 | ||
124 | 72 | NET_ID=${id} | 73 | NET_ID="${id}" |
125 | 73 | 74 | ||
126 | 74 | retries=20 | 75 | retries=20 |
127 | 75 | while true; do | 76 | while true; do |
129 | 76 | eval "$(openstack server create -f shell --flavor autopkgtest --image $BASEIMG --user-data $userdata --key-name $KEYNAME --wait $INSTNAME --nic net-id=${NET_ID})" | 77 | eval "$(openstack server create -f shell --flavor autopkgtest --image "${BASEIMG}" --user-data "${userdata}" --key-name "${KEYNAME}" --wait "${INSTNAME}" --nic net-id="${NET_ID}")" |
130 | 77 | if openstack server show "${id}" >/dev/null 2>/dev/null; then | 78 | if openstack server show "${id}" >/dev/null 2>/dev/null; then |
131 | 78 | break | 79 | break |
132 | 79 | fi | 80 | fi |
133 | @@ -90,27 +91,25 @@ done | |||
134 | 90 | 91 | ||
135 | 91 | SRVID="${id}" | 92 | SRVID="${id}" |
136 | 92 | 93 | ||
138 | 93 | trap "openstack server delete ${SRVID}" EXIT TERM INT QUIT PIPE | 94 | trap 'openstack server delete ${SRVID}' EXIT TERM INT QUIT PIPE |
139 | 94 | 95 | ||
140 | 95 | # determine IP address | 96 | # determine IP address |
143 | 96 | eval "$(openstack server show -f shell ${SRVID})" | 97 | eval "$(openstack server show -f shell "${SRVID}")" |
144 | 97 | ipaddr=$(echo ${addresses} | awk 'BEGIN { FS="=" } { print $2 }') | 98 | ipaddr=$(echo "${addresses}" | awk 'BEGIN { FS="=" } { print $2 }') |
145 | 98 | 99 | ||
146 | 99 | SSH_CMD="ssh -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no ubuntu@$ipaddr" | 100 | SSH_CMD="ssh -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no ubuntu@$ipaddr" |
147 | 100 | echo "Waiting for ssh (may cause some error messages)..." | 101 | echo "Waiting for ssh (may cause some error messages)..." |
148 | 101 | timeout 300 sh -c "while ! $SSH_CMD true; do sleep 5; done" | 102 | timeout 300 sh -c "while ! $SSH_CMD true; do sleep 5; done" |
149 | 102 | 103 | ||
150 | 103 | echo "Waiting until cloud-init is done..." | 104 | echo "Waiting until cloud-init is done..." |
152 | 104 | timeout 25m $SSH_CMD 'while [ ! -e /var/lib/cloud/instance/boot-finished ]; do sleep 1; done' | 105 | timeout 25m "${SSH_CMD}" 'while [ ! -e /var/lib/cloud/instance/boot-finished ]; do sleep 1; done' |
153 | 105 | 106 | ||
154 | 106 | echo "Running setup script..." | 107 | echo "Running setup script..." |
156 | 107 | cat "${SETUP_TESTBED}" | $SSH_CMD "sudo env MIRROR='${MIRROR:-}' RELEASE='$RELEASE' sh -" | 108 | "${SSH_CMD}" "sudo env MIRROR='${MIRROR:-}' RELEASE='$RELEASE' sh -" < "${SETUP_TESTBED}" |
157 | 108 | 109 | ||
158 | 109 | echo "Running Canonical setup script..." | 110 | echo "Running Canonical setup script..." |
163 | 110 | CANONICAL_SCRIPT=$(dirname $(dirname $(readlink -f $0)))/worker-config-production/setup-canonical.sh | 111 | CANONICAL_SCRIPT="$(dirname "$(dirname "$(readlink -f "${0}")")")"/worker-config-production/setup-canonical.sh |
164 | 111 | cat "$CANONICAL_SCRIPT" | $SSH_CMD "sudo env MIRROR='${MIRROR:-}' RELEASE='$RELEASE' sh -" | 112 | "${SSH_CMD}" "sudo env MIRROR='${MIRROR:-}' RELEASE='$RELEASE' sh -" < "${CANONICAL_SCRIPT}" |
161 | 112 | |||
162 | 113 | arch=$($SSH_CMD dpkg --print-architecture) | ||
165 | 114 | 113 | ||
166 | 115 | echo "Check that the upgraded image boots..." | 114 | echo "Check that the upgraded image boots..." |
167 | 116 | while true; do | 115 | while true; do |
168 | @@ -138,10 +137,10 @@ $SSH_CMD sudo journalctl --rotate --vacuum-time=12h || true | |||
169 | 138 | 137 | ||
170 | 139 | echo "Powering off to get a clean file system..." | 138 | echo "Powering off to get a clean file system..." |
171 | 140 | $SSH_CMD sudo poweroff || true | 139 | $SSH_CMD sudo poweroff || true |
174 | 141 | eval "$(openstack server show -f shell ${SRVID})" | 140 | eval "$(openstack server show -f shell "${SRVID}")" |
175 | 142 | while [ ${os_ext_sts_vm_state} != "stopped" ]; do | 141 | while [ "${os_ext_sts_vm_state}" != "stopped" ]; do |
176 | 143 | sleep 1 | 142 | sleep 1 |
178 | 144 | eval "$(openstack server show -f shell ${SRVID})" | 143 | eval "$(openstack server show -f shell "${SRVID}")" |
179 | 145 | done | 144 | done |
180 | 146 | 145 | ||
181 | 147 | echo "Creating image $IMAGE_NAME ..." | 146 | echo "Creating image $IMAGE_NAME ..." |
182 | @@ -155,8 +154,8 @@ while true; do | |||
183 | 155 | while [ $inner_retries -gt 0 ]; do | 154 | while [ $inner_retries -gt 0 ]; do |
184 | 156 | # server image create often loses its connection but it's actually | 155 | # server image create often loses its connection but it's actually |
185 | 157 | # working - if the image is uploading, wait a bit for it to finish | 156 | # working - if the image is uploading, wait a bit for it to finish |
188 | 158 | eval $(openstack image show -f shell --prefix=image_ "${IMAGE_NAME}") | 157 | eval "$(openstack image show -f shell --prefix=image_ "${IMAGE_NAME}")" |
189 | 159 | eval $(openstack server show -f shell --prefix=server_ "${SRVID}") | 158 | eval "$(openstack server show -f shell --prefix=server_ "${SRVID}")" |
190 | 160 | if [ "${server_os_ext_sts_task_state}" = "image_uploading" ] || | 159 | if [ "${server_os_ext_sts_task_state}" = "image_uploading" ] || |
191 | 161 | [ "${image_status}" = "saving" ]; then | 160 | [ "${image_status}" = "saving" ]; then |
192 | 162 | echo "image ${IMAGE_NAME} is uploading, waiting..." >&2 | 161 | echo "image ${IMAGE_NAME} is uploading, waiting..." >&2 |
193 | diff --git a/charms/focal/autopkgtest-cloud-worker/autopkgtest-cloud/tools/create-test-instances b/charms/focal/autopkgtest-cloud-worker/autopkgtest-cloud/tools/create-test-instances | |||
194 | index 6730c03..450ea83 100755 | |||
195 | --- a/charms/focal/autopkgtest-cloud-worker/autopkgtest-cloud/tools/create-test-instances | |||
196 | +++ b/charms/focal/autopkgtest-cloud-worker/autopkgtest-cloud/tools/create-test-instances | |||
197 | @@ -13,5 +13,5 @@ IMAGE=$(openstack image list | grep "adt/ubuntu-$DEVEL-$ARCH" | cut -d' ' -f2) | |||
198 | 13 | NET_ID=$(openstack network list | grep 'net_prod-proposed-migration' | cut -d' ' -f2) | 13 | NET_ID=$(openstack network list | grep 'net_prod-proposed-migration' | cut -d' ' -f2) |
199 | 14 | 14 | ||
200 | 15 | for i in $(seq 1 10); do | 15 | for i in $(seq 1 10); do |
202 | 16 | openstack server create --image $IMAGE --flavor cpu4-ram8-disk50 --nic net-id=$NET_ID -- "creation-test-$ARCH-$i" | 16 | openstack server create --image "${IMAGE}" --flavor cpu4-ram8-disk50 --nic net-id="${NET_ID}" -- "creation-test-$ARCH-$i" |
203 | 17 | done | 17 | done |
204 | diff --git a/charms/focal/autopkgtest-cloud-worker/autopkgtest-cloud/tools/ensure-keypair b/charms/focal/autopkgtest-cloud-worker/autopkgtest-cloud/tools/ensure-keypair | |||
205 | index be664d6..4ef1daa 100755 | |||
206 | --- a/charms/focal/autopkgtest-cloud-worker/autopkgtest-cloud/tools/ensure-keypair | |||
207 | +++ b/charms/focal/autopkgtest-cloud-worker/autopkgtest-cloud/tools/ensure-keypair | |||
208 | @@ -2,12 +2,13 @@ | |||
209 | 2 | 2 | ||
210 | 3 | set -eu | 3 | set -eu |
211 | 4 | 4 | ||
213 | 5 | IFS="[- ]" read -r RELEASE REGION ARCH bootstrap <<< "$@" | 5 | IFS="[- ]" read -r _RELEASE REGION ARCH _bootstrap <<< "$@" |
214 | 6 | 6 | ||
217 | 7 | if [ -e ~/cloudrcs/${REGION}-${ARCH}.rc ]; then | 7 | # shellcheck disable=SC1090 |
218 | 8 | . ~/cloudrcs/${REGION}-${ARCH}.rc | 8 | if [ -e ~/cloudrcs/"${REGION}"-"${ARCH}".rc ]; then |
219 | 9 | . ~/cloudrcs/"${REGION}"-"${ARCH}".rc | ||
220 | 9 | else | 10 | else |
222 | 10 | . ~/cloudrcs/${REGION}.rc | 11 | . ~/cloudrcs/"${REGION}".rc |
223 | 11 | fi | 12 | fi |
224 | 12 | 13 | ||
225 | 13 | if ! [ -e "${HOME}/.ssh/id_rsa" ]; then | 14 | if ! [ -e "${HOME}/.ssh/id_rsa" ]; then |
226 | diff --git a/charms/focal/autopkgtest-cloud-worker/autopkgtest-cloud/tools/exec-in-region b/charms/focal/autopkgtest-cloud-worker/autopkgtest-cloud/tools/exec-in-region | |||
227 | index 0261108..2e78e83 100755 | |||
228 | --- a/charms/focal/autopkgtest-cloud-worker/autopkgtest-cloud/tools/exec-in-region | |||
229 | +++ b/charms/focal/autopkgtest-cloud-worker/autopkgtest-cloud/tools/exec-in-region | |||
230 | @@ -1,5 +1,6 @@ | |||
231 | 1 | #!/bin/sh | 1 | #!/bin/sh |
232 | 2 | # usage: exec-in-region <region name> <command> <argument>... | 2 | # usage: exec-in-region <region name> <command> <argument>... |
233 | 3 | # shellcheck disable=SC1090 | ||
234 | 3 | 4 | ||
235 | 4 | set -e | 5 | set -e |
236 | 5 | 6 | ||
237 | @@ -25,7 +26,7 @@ export REGION | |||
238 | 25 | if [ "${REGION#lxd-}" != "$REGION" ]; then | 26 | if [ "${REGION#lxd-}" != "$REGION" ]; then |
239 | 26 | LXD_ARCH=${REGION#*-}; LXD_ARCH=${LXD_ARCH%%-*} | 27 | LXD_ARCH=${REGION#*-}; LXD_ARCH=${LXD_ARCH%%-*} |
240 | 27 | else | 28 | else |
242 | 28 | . ${HOME}/cloudrcs/${REGION}.rc | 29 | . "${HOME}"/cloudrcs/"${REGION}".rc |
243 | 29 | fi | 30 | fi |
244 | 30 | 31 | ||
245 | 31 | exec "$@" | 32 | exec "$@" |
246 | diff --git a/charms/focal/autopkgtest-cloud-worker/autopkgtest-cloud/worker-config-production/setup-canonical.sh b/charms/focal/autopkgtest-cloud-worker/autopkgtest-cloud/worker-config-production/setup-canonical.sh | |||
247 | index 93d48d8..7cd94c8 100644 | |||
248 | --- a/charms/focal/autopkgtest-cloud-worker/autopkgtest-cloud/worker-config-production/setup-canonical.sh | |||
249 | +++ b/charms/focal/autopkgtest-cloud-worker/autopkgtest-cloud/worker-config-production/setup-canonical.sh | |||
250 | @@ -1,3 +1,4 @@ | |||
251 | 1 | #!/bin/sh | ||
252 | 1 | # Canonical/Ubuntu specific testbed setup | 2 | # Canonical/Ubuntu specific testbed setup |
253 | 2 | 3 | ||
254 | 3 | # Remove trailing dot from the machine fqdn. | 4 | # Remove trailing dot from the machine fqdn. |
255 | @@ -70,6 +71,7 @@ if type iptables >/dev/null 2>&1; then | |||
256 | 70 | iptables -w -t mangle -A FORWARD -p tcp --tcp-flags SYN,RST SYN -j TCPMSS --clamp-mss-to-pmtu || true | 71 | iptables -w -t mangle -A FORWARD -p tcp --tcp-flags SYN,RST SYN -j TCPMSS --clamp-mss-to-pmtu || true |
257 | 71 | EOF | 72 | EOF |
258 | 72 | chmod 755 /etc/rc.local | 73 | chmod 755 /etc/rc.local |
259 | 74 | # shellcheck disable=SC1091 | ||
260 | 73 | . /etc/rc.local | 75 | . /etc/rc.local |
261 | 74 | fi | 76 | fi |
262 | 75 | 77 | ||
263 | diff --git a/ci/lint_test b/ci/lint_test | |||
264 | index e52edc4..15fc01d 100755 | |||
265 | --- a/ci/lint_test | |||
266 | +++ b/ci/lint_test | |||
267 | @@ -94,14 +94,6 @@ if __name__=="__main__": | |||
268 | 94 | "output": "", | 94 | "output": "", |
269 | 95 | "code": 0 | 95 | "code": 0 |
270 | 96 | }, | 96 | }, |
271 | 97 | "shellcheck": { | ||
272 | 98 | "files": [], | ||
273 | 99 | "extensions": [".sh", ".bash"], | ||
274 | 100 | "shebangs": ["#!/bin/bash", "#!/bin/sh"], | ||
275 | 101 | "args": None, | ||
276 | 102 | "output": "", | ||
277 | 103 | "code": 0 | ||
278 | 104 | }, | ||
279 | 105 | 'yamllint': { | 97 | 'yamllint': { |
280 | 106 | "files": ["../"], | 98 | "files": ["../"], |
281 | 107 | "extensions": None, | 99 | "extensions": None, |
282 | diff --git a/lxc-slave-admin/cmd b/lxc-slave-admin/cmd | |||
283 | index ff991ff..0700964 100755 | |||
284 | --- a/lxc-slave-admin/cmd | |||
285 | +++ b/lxc-slave-admin/cmd | |||
286 | @@ -1,6 +1,6 @@ | |||
287 | 1 | #!/bin/sh | 1 | #!/bin/sh |
288 | 2 | set -e | 2 | set -e |
290 | 3 | MYDIR=`dirname $0` | 3 | MYDIR=$(dirname "${0}") |
291 | 4 | 4 | ||
292 | 5 | if [ -z "$1" ]; then | 5 | if [ -z "$1" ]; then |
293 | 6 | echo "Usage: $0 <hosts> <commands or .commands file>" >&2 | 6 | echo "Usage: $0 <hosts> <commands or .commands file>" >&2 |
294 | @@ -8,11 +8,11 @@ if [ -z "$1" ]; then | |||
295 | 8 | fi | 8 | fi |
296 | 9 | 9 | ||
297 | 10 | if [ "$1" = "all" ]; then | 10 | if [ "$1" = "all" ]; then |
299 | 11 | for f in $MYDIR/*.hosts; do | 11 | for f in "${MYDIR}"/*.hosts; do |
300 | 12 | hosts="$hosts -h $f"; | 12 | hosts="$hosts -h $f"; |
301 | 13 | done | 13 | done |
302 | 14 | else | 14 | else |
304 | 15 | if [ -e ${1} ]; then | 15 | if [ -e "${1}" ]; then |
305 | 16 | hosts="-h ${1}" | 16 | hosts="-h ${1}" |
306 | 17 | elif [ -e "${1}.hosts" ]; then | 17 | elif [ -e "${1}.hosts" ]; then |
307 | 18 | hosts="-h ${1}.hosts" | 18 | hosts="-h ${1}.hosts" |
308 | @@ -29,8 +29,8 @@ if [ "${1%.commands}" != "$1" ]; then | |||
309 | 29 | exit 1 | 29 | exit 1 |
310 | 30 | fi | 30 | fi |
311 | 31 | # command file | 31 | # command file |
313 | 32 | cat "$1" | parallel-ssh -x "-F $MYDIR/ssh_config" -OUserKnownHostsFile=/dev/null -OStrictHostKeyChecking=no -OIdentitiesOnly=yes $hosts -p8 -t 0 -i -I | 32 | parallel-ssh -x "-F ${MYDIR}/ssh_config" -OUserKnownHostsFile=/dev/null -OStrictHostKeyChecking=no -OIdentitiesOnly=yes "${hosts}" -p8 -t 0 -i -I < "${1}" |
314 | 33 | else | 33 | else |
315 | 34 | # command | 34 | # command |
317 | 35 | parallel-ssh -x "-F $MYDIR/ssh_config" -OUserKnownHostsFile=/dev/null -OStrictHostKeyChecking=no -OIdentitiesOnly=yes $hosts -p8 -t 0 -i -- "$@" | 35 | parallel-ssh -x "-F ${MYDIR}/ssh_config" -OUserKnownHostsFile=/dev/null -OStrictHostKeyChecking=no -OIdentitiesOnly=yes "${hosts}" -p8 -t 0 -i -- "$@" |
318 | 36 | fi | 36 | fi |
319 | diff --git a/mojo/make-lxd-secgroup b/mojo/make-lxd-secgroup | |||
320 | index d41274c..3199669 100755 | |||
321 | --- a/mojo/make-lxd-secgroup | |||
322 | +++ b/mojo/make-lxd-secgroup | |||
323 | @@ -1,5 +1,5 @@ | |||
324 | 1 | #!/bin/sh | 1 | #!/bin/sh |
326 | 2 | 2 | # shellcheck disable=SC1090 | |
327 | 3 | set -eu | 3 | set -eu |
328 | 4 | 4 | ||
329 | 5 | # there's apparently no way to get this dynamically | 5 | # there's apparently no way to get this dynamically |
330 | diff --git a/mojo/postdeploy b/mojo/postdeploy | |||
331 | index 0f857ae..79fe50a 100755 | |||
332 | --- a/mojo/postdeploy | |||
333 | +++ b/mojo/postdeploy | |||
334 | @@ -11,5 +11,5 @@ if [ "${MOJO_STAGE_NAME}" == "staging" ]; then | |||
335 | 11 | fi | 11 | fi |
336 | 12 | 12 | ||
337 | 13 | echo "Setting up the floating IP address of the front end..." | 13 | echo "Setting up the floating IP address of the front end..." |
340 | 14 | $(dirname $0)/add-floating-ip haproxy | 14 | "$(dirname "$0")/add-floating-ip" haproxy |
341 | 15 | $(dirname $0)/add-floating-ip rabbitmq-server | 15 | "$(dirname "$0")/add-floating-ip" rabbitmq-server |
WIP branch to work at linting with Tim.