Fix & improve the disable/enable ARA scripts (#2480)

Signed-off-by: Christian Berendt <[email protected]>

scripts/deploy-manager.sh

@@ -72,6 +72,11 @@ fi
 wait_for_container_healthy 60 kolla-ansible
 wait_for_container_healthy 60 osism-ansible
 
+# disable ara service
+if [[ -e /etc/osism-ci-image || "$ARA" == "false" ]]; then
+ sh -c '/opt/configuration/scripts/disable-ara.sh'
+fi
+
 # gather facts
 osism apply gather-facts
 

scripts/disable-ara.sh

@@ -1,5 +1,5 @@
 #!/usr/bin/env bash
 
 for name in ceph-ansible kolla-ansible osism-ansible osism-kubernetes; do
- [[ ! -z "$(docker ps -a | grep $name )" ]] && docker exec -t $name mv /ansible/ara.env /ansible/ara.env.disabled || echo "ARA in $name already disabled."
+ [[ ! -z "$(docker ps -a | grep $name )" ]] && docker exec -t $name bash -c "mv /ansible/ara.env /ansible/ara.env.disabled 2>/dev/null" || echo "ARA in $name already disabled."
 done

scripts/enable-ara.sh

@@ -1,5 +1,5 @@
 #!/usr/bin/env bash
 
 for name in ceph-ansible kolla-ansible osism-ansible osism-kubernetes; do
- [[ ! -z "$(docker ps -a | grep $name )" ]] && docker exec -t $name mv /ansible/ara.env.disabled /ansible/ara.env || echo "ARA in $name already enabled."
+ [[ ! -z "$(docker ps -a | grep $name )" ]] && docker exec -t $name bash -c "mv /ansible/ara.env.disabled /ansible/ara.env 2>/dev/null" || echo "ARA in $name already enabled."
 done

terraform/environments/ci-centos-stream-9.tfvars

@@ -15,3 +15,4 @@ network_availability_zone = "nova"
 volume_availability_zone = "nova"
 public = "public"
 number_of_nodes = 6
+ara = false

terraform/environments/ci-debian-12.tfvars

@@ -15,3 +15,4 @@ network_availability_zone = "nova"
 volume_availability_zone = "nova"
 public = "public"
 number_of_nodes = 6
+ara = false

terraform/environments/ci-ubuntu-22.04.tfvars

@@ -15,3 +15,4 @@ network_availability_zone = "nova"
 volume_availability_zone = "nova"
 public = "public"
 number_of_nodes = 6
+ara = false

terraform/environments/ci-ubuntu-24.04.tfvars

@@ -15,3 +15,4 @@ network_availability_zone = "nova"
 volume_availability_zone = "nova"
 public = "public"
 number_of_nodes = 6
+ara = false