From c8948c19d2a4a2042d47ddbb3bccec408c0a952f Mon Sep 17 00:00:00 2001
From: Carsten Schafer <Carsten.Schafer@kinarasystems.com>
Date: Wed, 15 May 2024 12:01:11 -0400
Subject: [PATCH] WIFI-13361 - try to fix workflows not getting to ec2
 instances

Signed-off-by: Carsten Schafer <Carsten.Schafer@kinarasystems.com>
---
 .../deploy-sdk-docker-compose/action.yml      | 19 ++++++++++---------
 .../ow_docker-compose-upgrade-test.yml        | 10 +++++-----
 .github/workflows/ow_docker-compose.yml       |  8 ++++----
 3 files changed, 19 insertions(+), 18 deletions(-)

diff --git a/.github/actions/deploy-sdk-docker-compose/action.yml b/.github/actions/deploy-sdk-docker-compose/action.yml
index e56be6a6e..4773eea45 100644
--- a/.github/actions/deploy-sdk-docker-compose/action.yml
+++ b/.github/actions/deploy-sdk-docker-compose/action.yml
@@ -119,17 +119,18 @@ runs:
           "deb [arch=$(dpkg --print-architecture) signed-by=/usr/share/keyrings/docker-archive-keyring.gpg] https://download.docker.com/linux/ubuntu \
           $(lsb_release -cs) stable" | sudo tee /etc/apt/sources.list.d/docker.list > /dev/null;
           apt-get update && apt install -y docker-ce docker-ce-cli containerd.io docker-compose-plugin docker-compose;
-          cat << EOT > /etc/docker/daemon.json
-        {
-          "log-driver": "syslog",
-          "log-opts": {
-          "syslog-address": "tcp://k8s-monitori-logstash-fdd0ff34dd-2abb6df4e49f3d1a.elb.us-east-2.amazonaws.com:514",
-          "tag": "{{.Name}}/ow-docker-compose-${{ github.run_id }}"
-          }
-        }
-        EOT
           systemctl restart docker
         EOF
+# no longer exists:
+#          cat << EOT > /etc/docker/daemon.json
+#        {
+#          "log-driver": "syslog",
+#          "log-opts": {
+#          "syslog-address": "tcp://k8s-monitori-logstash-fdd0ff34dd-2abb6df4e49f3d1a.elb.us-east-2.amazonaws.com:514",
+#          "tag": "{{.Name}}/ow-docker-compose-${{ github.run_id }}"
+#          }
+#        }
+#        EOT
 
     - name: Deploy target CloudSDK in EC2
       shell: bash
diff --git a/.github/workflows/ow_docker-compose-upgrade-test.yml b/.github/workflows/ow_docker-compose-upgrade-test.yml
index e38d9eca9..95385d8d0 100644
--- a/.github/workflows/ow_docker-compose-upgrade-test.yml
+++ b/.github/workflows/ow_docker-compose-upgrade-test.yml
@@ -37,7 +37,7 @@ jobs:
     runs-on: ubuntu-latest
     env:
       AWS_DEFAULT_OUTPUT: json
-      AWS_DEFAULT_REGION: us-east-2
+      AWS_DEFAULT_REGION: ap-south-1
     outputs:
       gateway_url: ${{ steps.deploy-sdk-docker-compose.outputs.gateway_url }}
       sec_url: ${{ steps.deploy-sdk-docker-compose.outputs.sec_url }}
@@ -66,7 +66,7 @@ jobs:
     needs: [deploy-controller]
     runs-on: ubuntu-latest
     env:
-      AWS_DEFAULT_REGION: us-east-1
+      AWS_DEFAULT_REGION: ap-south-1
     outputs:
       serial_number: ${{ steps.deploy-virtual-ap-instance.outputs.serial_number }}
       instance_id: ${{ steps.deploy-virtual-ap-instance.outputs.instance_id }}
@@ -119,7 +119,7 @@ jobs:
   upgrade-controller-deployment:
     name: Upgrade OpenWiFi Cloud SDK
     env:
-      AWS_DEFAULT_REGION: us-east-2
+      AWS_DEFAULT_REGION: ap-south-1
     needs: [deploy-controller, test]
     runs-on: ubuntu-latest
     steps:
@@ -198,7 +198,7 @@ jobs:
     needs: [deploy-controller, test-after-upgrade]
     runs-on: ubuntu-latest
     env:
-      AWS_DEFAULT_REGION: us-east-2
+      AWS_DEFAULT_REGION: ap-south-1
     if: always()
     steps:
       - name: Delete EC2 instance
@@ -212,7 +212,7 @@ jobs:
     needs: [deploy-virtual-ap-instance, test-after-upgrade]
     runs-on: ubuntu-latest
     env:
-      AWS_DEFAULT_REGION: us-east-1
+      AWS_DEFAULT_REGION: ap-south-1
     if: always()
     steps:
       - name: Terminate virtual AP EC2 instance
diff --git a/.github/workflows/ow_docker-compose.yml b/.github/workflows/ow_docker-compose.yml
index 30b147b9f..c87ca50d8 100644
--- a/.github/workflows/ow_docker-compose.yml
+++ b/.github/workflows/ow_docker-compose.yml
@@ -61,7 +61,7 @@ jobs:
     runs-on: ubuntu-latest
     env:
       AWS_DEFAULT_OUTPUT: json
-      AWS_DEFAULT_REGION: us-east-2
+      AWS_DEFAULT_REGION: ap-south-1
     outputs:
       gateway_url: ${{ steps.deploy-sdk-docker-compose.outputs.gateway_url }}
       sec_url: ${{ steps.deploy-sdk-docker-compose.outputs.sec_url }}
@@ -96,7 +96,7 @@ jobs:
     needs: deploy-controller
     runs-on: ubuntu-latest
     env:
-      AWS_DEFAULT_REGION: us-east-1
+      AWS_DEFAULT_REGION: ap-south-1
     outputs:
       serial_number: ${{ steps.deploy-virtual-ap-instance.outputs.serial_number }}
       instance_id: ${{ steps.deploy-virtual-ap-instance.outputs.instance_id }}
@@ -154,7 +154,7 @@ jobs:
     needs: [deploy-controller, test]
     runs-on: ubuntu-latest
     env:
-      AWS_DEFAULT_REGION: us-east-2
+      AWS_DEFAULT_REGION: ap-south-1
     if: always()
     steps:
       - name: Delete EC2 instance
@@ -167,7 +167,7 @@ jobs:
     needs: [deploy-virtual-ap-instance, test]
     runs-on: ubuntu-latest
     env:
-      AWS_DEFAULT_REGION: us-east-1
+      AWS_DEFAULT_REGION: ap-south-1
     if: always()
     steps:
       - name: Terminate virtual AP EC2 instance