summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--tools/multi_nodes_gate/airship_gate/lib/airship.sh2
-rw-r--r--tools/multi_nodes_gate/airship_gate/lib/virsh.sh4
-rwxr-xr-xtools/multi_nodes_gate/airship_gate/stages/build-scripts.sh2
-rwxr-xr-xtools/multi_nodes_gate/airship_gate/stages/generate-certificates.sh2
-rwxr-xr-xtools/multi_nodes_gate/airship_gate/stages/shipyard-load-design.sh2
5 files changed, 6 insertions, 6 deletions
diff --git a/tools/multi_nodes_gate/airship_gate/lib/airship.sh b/tools/multi_nodes_gate/airship_gate/lib/airship.sh
index 39f5ec3..13af063 100644
--- a/tools/multi_nodes_gate/airship_gate/lib/airship.sh
+++ b/tools/multi_nodes_gate/airship_gate/lib/airship.sh
@@ -140,7 +140,7 @@ collect_ssh_key() {
140 ssh_keypair_declare 140 ssh_keypair_declare
141 fi 141 fi
142 142
143 if [[ "${USE_EXISTING_SECRETS}" ]]; then 143 if [[ -n "${USE_EXISTING_SECRETS}" ]]; then
144 log "Using existing manifests for secrets" 144 log "Using existing manifests for secrets"
145 return 0 145 return 0
146 fi 146 fi
diff --git a/tools/multi_nodes_gate/airship_gate/lib/virsh.sh b/tools/multi_nodes_gate/airship_gate/lib/virsh.sh
index 1e3323f..b6fcf83 100644
--- a/tools/multi_nodes_gate/airship_gate/lib/virsh.sh
+++ b/tools/multi_nodes_gate/airship_gate/lib/virsh.sh
@@ -324,9 +324,9 @@ install_libvirt_key() {
324 sudo chmod 700 ~virtmgr/.ssh 324 sudo chmod 700 ~virtmgr/.ssh
325 sudo chmod 600 ~virtmgr/.ssh/authorized_keys 325 sudo chmod 600 ~virtmgr/.ssh/authorized_keys
326 326
327 if [[ "${USE_EXISTING_SECRETS}" ]]; then 327 if [[ -n "${USE_EXISTING_SECRETS}" ]]; then
328 log "Using existing manifests for secrets" 328 log "Using existing manifests for secrets"
329 return 0 329 return 0
330 fi 330 fi
331 331
332 mkdir -p "${GATE_DEPOT}" 332 mkdir -p "${GATE_DEPOT}"
diff --git a/tools/multi_nodes_gate/airship_gate/stages/build-scripts.sh b/tools/multi_nodes_gate/airship_gate/stages/build-scripts.sh
index 6fe0682..cce2d90 100755
--- a/tools/multi_nodes_gate/airship_gate/stages/build-scripts.sh
+++ b/tools/multi_nodes_gate/airship_gate/stages/build-scripts.sh
@@ -19,7 +19,7 @@ done
19 19
20CERTS_PATH="/certs/*.yaml" 20CERTS_PATH="/certs/*.yaml"
21KEYS_PATH="/gate/*.yaml" 21KEYS_PATH="/gate/*.yaml"
22if [[ "${USE_EXISTING_SECRETS}" ]] 22if [[ -n "${USE_EXISTING_SECRETS}" ]]
23then 23then
24 CERTS_PATH="" 24 CERTS_PATH=""
25 KEYS_PATH="" 25 KEYS_PATH=""
diff --git a/tools/multi_nodes_gate/airship_gate/stages/generate-certificates.sh b/tools/multi_nodes_gate/airship_gate/stages/generate-certificates.sh
index 80e5694..c56f4de 100755
--- a/tools/multi_nodes_gate/airship_gate/stages/generate-certificates.sh
+++ b/tools/multi_nodes_gate/airship_gate/stages/generate-certificates.sh
@@ -30,7 +30,7 @@ GATE_FILES=($(find "${GATE_DEPOT}" -name '*.yaml' | xargs -n 1 basename | xargs
30mkdir -p "${CERT_DEPOT}" 30mkdir -p "${CERT_DEPOT}"
31chmod 777 "${CERT_DEPOT}" 31chmod 777 "${CERT_DEPOT}"
32 32
33if [[ "${USE_EXISTING_SECRETS}" ]] 33if [[ -n "${USE_EXISTING_SECRETS}" ]]
34then 34then
35 log Certificates already provided by manifests 35 log Certificates already provided by manifests
36 exit 0 36 exit 0
diff --git a/tools/multi_nodes_gate/airship_gate/stages/shipyard-load-design.sh b/tools/multi_nodes_gate/airship_gate/stages/shipyard-load-design.sh
index a8fb887..cb06956 100755
--- a/tools/multi_nodes_gate/airship_gate/stages/shipyard-load-design.sh
+++ b/tools/multi_nodes_gate/airship_gate/stages/shipyard-load-design.sh
@@ -60,7 +60,7 @@ sleep 120
60check_configdocs_result "$(shipyard_cmd create configdocs design --directory=${BUILD_WORK_DIR}/site --replace)" 60check_configdocs_result "$(shipyard_cmd create configdocs design --directory=${BUILD_WORK_DIR}/site --replace)"
61 61
62# Skip certs/gate if already part of site manifests 62# Skip certs/gate if already part of site manifests
63if [[ "${USE_EXISTING_SECRETS}" ]] 63if [[ -n "${USE_EXISTING_SECRETS}" ]]
64then 64then
65 OMIT_CERTS=1 65 OMIT_CERTS=1
66 OMIT_GATE=1 66 OMIT_GATE=1