From 8f692147c82a8d294ad5061288e5993b1438b31b Mon Sep 17 00:00:00 2001
From: Sergiy Markin <smarkin@mirantis.com>
Date: Tue, 12 Mar 2024 21:56:42 +0000
Subject: [PATCH] Armada command integration

This PS integrates armada command to tools/airship wrapper script.

Change-Id: I80fb6d8ebb14cc7a84f350a324ec3e847f5654d4
---
 .zuul.yaml                                    |  1 +
 tools/airship                                 | 23 +++++++++++++++++--
 .../developer/030-armada-bootstrap.sh         | 10 ++------
 tools/gate/playbooks/prepare-hosts.yaml       |  4 ++++
 4 files changed, 28 insertions(+), 10 deletions(-)

diff --git a/.zuul.yaml b/.zuul.yaml
index 2c918ce24..42efaf6a8 100644
--- a/.zuul.yaml
+++ b/.zuul.yaml
@@ -200,6 +200,7 @@
         - ./tools/deployment/airskiff/developer/017-make-all-images.sh
         - ./tools/deployment/airskiff/developer/025-start-artifactory.sh
         - ./tools/deployment/airskiff/developer/026-reduce-site.sh
+        - ./tools/deployment/airskiff/common/sleep.sh
         - ./tools/deployment/airskiff/developer/030-armada-bootstrap.sh
         - ./tools/deployment/airskiff/developer/100-deploy-osh.sh
         - ./tools/deployment/airskiff/common/os-env.sh
diff --git a/tools/airship b/tools/airship
index 384921a30..21099bbff 100755
--- a/tools/airship
+++ b/tools/airship
@@ -119,6 +119,7 @@ Examples:
   tools/airship promenade generate-certs -o /target/certs /target/collect/*.yaml
   tools/airship promenade build-all -o /target/bundle /target/collect/*.yaml /target/certs/*.yaml
   tools/airship shipyard get actions
+  tools/airship armada apply actions
 "
 }
 
@@ -189,13 +190,28 @@ shipyard() {
 
   versions_lookup "['data']['images']['ucp']['shipyard']['shipyard']"
 
-  SHIPYARD_IMAGE=$RESULT
+  IMAGE_SHIPYARD=$IMAGE_URL
   docker run   --rm --net=host $TERM_OPTS \
     -u "${USER}:${GROUP}" \
     -w /target \
     -v $(pwd):/target \
     --env-file $ENV_FILE \
-    $IMAGE_URL $@
+    $IMAGE_SHIPYARD $@
+}
+
+
+armada() {
+
+  versions_lookup "['data']['images']['ucp']['armada']['api']"
+
+  IMAGE_ARMADA=$IMAGE_URL
+  docker run --rm --net host $TERM_OPTS \
+    -u "${USER}:${GROUP}" \
+    -v ${HOME}/.kube/config:/armada/.kube/config \
+    -v "${INSTALL_PATH}":/airship-components \
+    --env-file $ENV_FILE \
+      $IMAGE_ARMADA $@
+
 }
 
 
@@ -210,6 +226,9 @@ case "$1" in
   shift;
   shipyard $@
   ;;
+'armada')
+  armada $@
+  ;;
 *) help
    exit 1
   ;;
diff --git a/tools/deployment/airskiff/developer/030-armada-bootstrap.sh b/tools/deployment/airskiff/developer/030-armada-bootstrap.sh
index 8cf4dd5c0..7a00ab74a 100755
--- a/tools/deployment/airskiff/developer/030-armada-bootstrap.sh
+++ b/tools/deployment/airskiff/developer/030-armada-bootstrap.sh
@@ -20,9 +20,8 @@ set -xe
 : "${INSTALL_PATH:="$(pwd)/../"}"
 : "${PEGLEG:="./tools/airship pegleg"}"
 : "${PL_SITE:="airskiff"}"
+: "${ARMADA:="./tools/airship armada"}"
 : "${TARGET_MANIFEST:="cluster-bootstrap"}"
-: "${DISTRO:=ubuntu_focal}"
-: "${DOCKER_REGISTRY:=quay.io}"
 
 
 # Render documents
@@ -37,12 +36,7 @@ sudo chmod 0644 airskiff.yaml
 # sudo chmod 0644 ~/.kube/config
 
 # Download latest Armada image and deploy Airship components
-docker run --rm --net host -p 8000:8000 --name armada \
-    -v ~/.kube/config:/armada/.kube/config \
-    -v "$(pwd)"/airskiff.yaml:/airskiff.yaml \
-    -v "${INSTALL_PATH}":/airship-components \
-    "${DOCKER_REGISTRY}/airshipit/armada:latest-${DISTRO}" \
-    apply /airskiff.yaml --debug --target-manifest "${TARGET_MANIFEST}"
+${ARMADA} apply /airskiff.yaml --debug --target-manifest "${TARGET_MANIFEST}"
 
 # # Set back permissions of the files
 sudo chmod "${AIRSKIFF_PERMISSIONS}" airskiff.yaml
diff --git a/tools/gate/playbooks/prepare-hosts.yaml b/tools/gate/playbooks/prepare-hosts.yaml
index c64aa0d65..c9b02e0f0 100644
--- a/tools/gate/playbooks/prepare-hosts.yaml
+++ b/tools/gate/playbooks/prepare-hosts.yaml
@@ -13,5 +13,9 @@
 ---
 - hosts: all
   roles:
+    - role: add-authorized-keys
+      public_keys:
+        - public_key: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQDA7eM8WFJrqQmki8rR0O3QBHyl8xq42jb1RduwuRwjWoGYJI5cX7Fx+7VR4A9ITCoiqxKS8DMfgKbt5jKC6SmvMALULZsnYlthB34KywurgxsW6fgp68DHWQ7J4CCBhoIpl0W3JW7s6b0vHLhab59r0E+AYemBVuWUqbFEy8nDAHcQv1S/2o1udhmljIN7c2ogO4KAJ7Lge0BoIP9ps4u6AVwyQZixp4anU9DHGNA/UQj4M5UyuALj5buEAuATBe9Vqj4sOvZjObPJAGPUrNRrGEWAFk+lSZHRzKXo0eeWtPqoh5UN9UDb5Pocg1krncMIZwjHKovlD1z/O1y91aY5LM1wxm/7aaIiX8eCihyVZaOuDCLF7WDT2SMs7ABcotX2MDtVQTrNNV3MmMAScFNDflzPKszd7cdjLl6PBq8bvPxmCkLmnitPTGOoh9d8i+JlbINvgx1pguYrpeciIyreCO1rjTW3MgB0tyoMEa31V+7HrauBMeNnE68YTqLTIB0= smarkin@mirantis.com
+
     - start-zuul-console
 ...