remove tests directory from the octavia_preconf role and enclose vari…

…able names in double quotes in shell scripts
rackerlabs · Jan 17, 2025 · e9f473b · e9f473b
1 parent 75ab80d
commit e9f473b
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 20 deletions.
diff --git a/ansible/roles/octavia_preconf/files/create_health_mgr_ports.sh b/ansible/roles/octavia_preconf/files/create_health_mgr_ports.sh
@@ -20,15 +20,15 @@ CONTROLLER_IP_PORT_LIST=''
 CTRLS=$(kubectl get nodes -l openstack-control-plane=enabled -o name | awk -F"/" '{print $2}')
 for node in $CTRLS
 do
-  node_short=$(echo $node | awk -F"." '{print $1}')
+  node_short=$(echo "$node" | awk -F"." '{print $1}')
   PORTNAME=octavia-health-manager-port-$node_short
-  PORT_ID=$(openstack port create $PORTNAME --security-group $SECGRP_ID --device-owner Octavia:health-mgr --host=$node -c id -f value --network $NET_ID)
-  IP=$(openstack port show $PORT_ID -c fixed_ips -f yaml | grep ip_address | awk -F':' '{print $2}')
-  if [ -z $CONTROLLER_IP_PORT_LIST ]; then
+  PORT_ID=$(openstack port create "$PORTNAME" --security-group "$SECGRP_ID" --device-owner Octavia:health-mgr --host="$node" -c id -f value --network "$NET_ID")
+  IP=$(openstack port show "$PORT_ID" -c fixed_ips -f yaml | grep ip_address | awk -F':' '{print $2}')
+  if [ -z "$CONTROLLER_IP_PORT_LIST" ]; then
     CONTROLLER_IP_PORT_LIST=$IP:5555
   else
     CONTROLLER_IP_PORT_LIST=$CONTROLLER_IP_PORT_LIST,$IP:5555
   fi
 done
 
-echo $CONTROLLER_IP_PORT_LIST > /tmp/octavia_hm_controller_ip_port_list
+echo "$CONTROLLER_IP_PORT_LIST" > /tmp/octavia_hm_controller_ip_port_list
diff --git a/ansible/roles/octavia_preconf/files/create_k8s_secret.sh b/ansible/roles/octavia_preconf/files/create_k8s_secret.sh
@@ -14,7 +14,7 @@ CLIENT_KEY_CERT=$4
 function encod_base64()
 {
   local file_path=$1
-  cat $file_path | base64 -w0 | tr -d '\n'
+  cat "$file_path" | base64 -w0 | tr -d '\n'
 }
 
 cat <<EOF> /tmp/k8s_secret.yml
@@ -26,8 +26,8 @@ metadata:
   namespace: openstack
 type: Opaque
 data:
-  server_ca.cert.pem: $(encod_base64 $SERVER_CA)
-  server_ca.key.pem: $(encod_base64 $SERVER_CA_KEY)
-  client_ca.cert.pem: $(encod_base64 $CLIENT_CA)
-  client.key-and-cert.pem: $(encod_base64 $CLIENT_KEY_CERT)
+  server_ca.cert.pem: $(encod_base64 "$SERVER_CA")
+  server_ca.key.pem: $(encod_base64 "$SERVER_CA_KEY")
+  client_ca.cert.pem: $(encod_base64 "$CLIENT_CA")
+  client.key-and-cert.pem: $(encod_base64 "$CLIENT_KEY_CERT")
 EOF
diff --git a/ansible/roles/octavia_preconf/tasks/octavia_cert.yml b/ansible/roles/octavia_preconf/tasks/octavia_cert.yml
@@ -119,9 +119,6 @@
     cmd: create_k8s_secret.sh {{ octavia_server_ca_cert }} {{ octavia_serverca_privkey }} {{ octavia_client_ca_cert }} {{ octavia_client_key_cert }}
     creates: /tmp/k8s_secret.yml
 
-#- name: Create the "octavia-certs" secret in the openstack namespace
-#  command:
-#    cmd: kubectl apply -f /tmp/k8s_secret.yml
 - name: Create the "octavia-certs" secret in the openstack namespace
   k8s:
     state: present

diff --git a/ansible/roles/octavia_preconf/tests/inventory b/ansible/roles/octavia_preconf/tests/inventory
diff --git a/ansible/roles/octavia_preconf/tests/test.yml b/ansible/roles/octavia_preconf/tests/test.yml