Browse Source

Minor fixes as follow-up for new Pegleg

Change-Id: Ice3d03f5cf890cca55f191bbb3f6252fc2901997
SKELS, KASPARS (ks3019) 1 month ago
parent
commit
7cf604036f

+ 1
- 1
tools/multi_nodes_gate/airship_gate/lib/airship.sh View File

@@ -140,7 +140,7 @@ collect_ssh_key() {
140 140
     ssh_keypair_declare
141 141
   fi
142 142
 
143
-  if [[ "${USE_EXISTING_SECRETS}" ]]; then
143
+  if [[ -n "${USE_EXISTING_SECRETS}" ]]; then
144 144
       log "Using existing manifests for secrets"
145 145
       return 0
146 146
   fi

+ 2
- 2
tools/multi_nodes_gate/airship_gate/lib/virsh.sh View File

@@ -324,9 +324,9 @@ install_libvirt_key() {
324 324
     sudo chmod 700 ~virtmgr/.ssh
325 325
     sudo chmod 600 ~virtmgr/.ssh/authorized_keys
326 326
 
327
-    if [[ "${USE_EXISTING_SECRETS}" ]]; then
327
+    if [[ -n "${USE_EXISTING_SECRETS}" ]]; then
328 328
         log "Using existing manifests for secrets"
329
-	return 0
329
+        return 0
330 330
     fi
331 331
 
332 332
     mkdir -p "${GATE_DEPOT}"

+ 1
- 1
tools/multi_nodes_gate/airship_gate/stages/build-scripts.sh View File

@@ -19,7 +19,7 @@ done
19 19
 
20 20
 CERTS_PATH="/certs/*.yaml"
21 21
 KEYS_PATH="/gate/*.yaml"
22
-if [[ "${USE_EXISTING_SECRETS}" ]]
22
+if [[ -n "${USE_EXISTING_SECRETS}" ]]
23 23
 then
24 24
     CERTS_PATH=""
25 25
     KEYS_PATH=""

+ 1
- 1
tools/multi_nodes_gate/airship_gate/stages/generate-certificates.sh View File

@@ -30,7 +30,7 @@ GATE_FILES=($(find "${GATE_DEPOT}" -name '*.yaml' | xargs -n 1 basename | xargs
30 30
 mkdir -p "${CERT_DEPOT}"
31 31
 chmod 777 "${CERT_DEPOT}"
32 32
 
33
-if [[ "${USE_EXISTING_SECRETS}" ]]
33
+if [[ -n "${USE_EXISTING_SECRETS}" ]]
34 34
 then
35 35
   log Certificates already provided by manifests
36 36
   exit 0

+ 1
- 1
tools/multi_nodes_gate/airship_gate/stages/shipyard-load-design.sh View File

@@ -60,7 +60,7 @@ sleep 120
60 60
 check_configdocs_result "$(shipyard_cmd create configdocs design --directory=${BUILD_WORK_DIR}/site --replace)"
61 61
 
62 62
 # Skip certs/gate if already part of site manifests
63
-if [[ "${USE_EXISTING_SECRETS}" ]]
63
+if [[ -n "${USE_EXISTING_SECRETS}" ]]
64 64
 then
65 65
   OMIT_CERTS=1
66 66
   OMIT_GATE=1

Loading…
Cancel
Save