Multi-region

UNiXMIT · Mar 8, 2024 · e10049e · e10049e
1 parent ef8f381
commit e10049e
Show file tree

Hide file tree

Showing 8 changed files with 33 additions and 33 deletions.
diff --git a/db/initial.yml b/db/initial.yml
@@ -1,31 +1,30 @@
 - name: EMEA Region
   set_fact:
-    awsRegion: eu-west-2
-    availabilityZone: us-west-2a
-    awsAMI: ami-07fb9d5c721566c65
+    awsRegion: '{{ regionEMEA }}'
+    availabilityZone: '{{ azEMEA }}'
+    awsAMI: '{{ amiEMEA }}'
     securityGroups: '{{ securityGroupsEMEA }}'
   when: userRegion | default("1") == "1"
 
 - name: AMS Region
   set_fact:
-    awsRegion: us-east-2
-    availabilityZone: us-east-2a
-    awsAMI: ami-0d77c9d87c7e619f9
+    awsRegion: '{{ regionAMS }}'
+    availabilityZone: '{{ azAMS }}'
+    awsAMI: '{{ amiAMS }}'
     securityGroups: '{{ securityGroupsAMS }}'
   when: userRegion | default("1") == "2"
 
 - name: APJ Region
   set_fact:
-    awsRegion: ap-southeast-2
-    availabilityZone: ap-southeast-2a
-    awsAMI: ami-0d6857b844e855670
+    awsRegion: '{{ regionAPJ }}'
+    availabilityZone: '{{ azAPJ }}'
+    awsAMI: '{{ amiAPJ }}'
     securityGroups: '{{ securityGroupsAPJ }}'
   when: userRegion | default("1") == "3"
 
 - name: Set AWS Facts
   set_fact:
-    imageName: DB
-    instanceType: t3.xlarge
+    instanceType: t3.medium
     deviceName: /dev/sda1
     volumeType: gp3
     volumeSize: 30
diff --git a/db/podman.yml b/db/podman.yml
@@ -302,7 +302,7 @@
     region: "{{ hostvars['localhost']['awsRegion'] }}"
     resource: '{{ item }}'
     tags:
-      Name: "{{ semaphore_vars.task_details.username|upper }}-{{ hostvars['localhost']['imageName'] }} {{ DBSHORT }}"
+      Name: "{{ semaphore_vars.task_details.username|upper }}-imageName {{ DBSHORT }}"
       DB: '{{ DBNAME }}'
       DB_USER: '{{ DBUSER }}'
       DB_PORT: '{{ DBPORT }}'

diff --git a/db/variables.json b/db/variables.json
@@ -1,6 +1,7 @@
 {
   "myUsername": "support",
   "myPassword": "strongPassword",
+  "imageName": "DB",
   "keyName": "support",
   "keyLocation": "~/.ssh/support.pem",
   "securityGroupsEMEA": "['sg-XXXXXX','sg-XXXXXX']",

diff --git a/rhel/ed.yml b/rhel/ed.yml
@@ -64,7 +64,7 @@
     region: "{{ hostvars['localhost']['awsRegion'] }}"
     resource: '{{ item }}'
     tags:
-      Name: "{{ semaphore_vars.task_details.username|upper }}-{{ hostvars['localhost']['imageName'] }} {{ productName }}"
+      Name: "{{ semaphore_vars.task_details.username|upper }}-imageName {{ productName }}"
       ED: '{{ installerName }}'
     state: present
   loop: "{{ hostvars['localhost'].ec2.instance_ids }}"

diff --git a/rhel/extend.yml b/rhel/extend.yml
@@ -33,7 +33,7 @@
     region: "{{ hostvars['localhost']['awsRegion'] }}"
     resource: '{{ item }}'
     tags:
-      Name: "{{ semaphore_vars.task_details.username|upper }}-{{ hostvars['localhost']['imageName'] }} {{ productName }}"
+      Name: "{{ semaphore_vars.task_details.username|upper }}-imageName {{ productName }}"
       extend: '{{ installerName }}'
     state: present
   loop: "{{ hostvars['localhost'].ec2.instance_ids }}"

diff --git a/rhel/initial.yml b/rhel/initial.yml
@@ -1,30 +1,29 @@
 - name: EMEA Region
   set_fact:
-    awsRegion: eu-west-2
-    availabilityZone: us-west-2a
-    awsAMI: ami-07fb9d5c721566c65
+    awsRegion: '{{ regionEMEA }}'
+    availabilityZone: '{{ azEMEA }}'
+    awsAMI: '{{ amiEMEA }}'
     securityGroups: '{{ securityGroupsEMEA }}'
   when: userRegion | default("1") == "1"
 
 - name: AMS Region
   set_fact:
-    awsRegion: us-east-2
-    availabilityZone: us-east-2a
-    awsAMI: ami-0d77c9d87c7e619f9
+    awsRegion: '{{ regionAMS }}'
+    availabilityZone: '{{ azAMS }}'
+    awsAMI: '{{ amiAMS }}'
     securityGroups: '{{ securityGroupsAMS }}'
   when: userRegion | default("1") == "2"
 
 - name: APJ Region
   set_fact:
-    awsRegion: ap-southeast-2
-    availabilityZone: ap-southeast-2a
-    awsAMI: ami-0d6857b844e855670
+    awsRegion: '{{ regionAPJ }}'
+    availabilityZone: '{{ azAPJ }}'
+    awsAMI: '{{ amiAPJ }}'
     securityGroups: '{{ securityGroupsAPJ }}'
   when: userRegion | default("1") == "3"
 
 - name: Set AWS Facts
   set_fact:
-    imageName: RHEL9
     instanceType: t3.xlarge
     deviceName: /dev/sda1
     volumeType: gp3

diff --git a/rhel/variables.json b/rhel/variables.json
@@ -1,6 +1,7 @@
 {
   "myUsername": "support",
   "myPassword": "strongPassword",
+  "imageName": "RHEL9",
   "keyName": "support",
   "keyLocation": "~/.ssh/support.pem",
   "securityGroupsEMEA": "['sg-XXXXXX','sg-XXXXXX']",

diff --git a/win/initial.yml b/win/initial.yml
@@ -1,24 +1,24 @@
 - name: EMEA Region
   set_fact:
-    awsRegion: eu-west-2
-    availabilityZone: us-west-2a
-    awsAMI: ami-0be53fc5198dbd294
+    awsRegion: '{{ regionEMEA }}'
+    availabilityZone: '{{ azEMEA }}'
+    awsAMI: '{{ amiEMEA }}'
     securityGroups: '{{ securityGroupsEMEA }}'
   when: userRegion | default("1") == "1"
 
 - name: AMS Region
   set_fact:
-    awsRegion: us-east-2
-    availabilityZone: us-east-2a
-    awsAMI: ami-0e6aa5f69f06ffa91
+    awsRegion: '{{ regionAMS }}'
+    availabilityZone: '{{ azAMS }}'
+    awsAMI: '{{ amiAMS }}'
     securityGroups: '{{ securityGroupsAMS }}'
   when: userRegion | default("1") == "2"
 
 - name: APJ Region
   set_fact:
-    awsRegion: ap-southeast-2
-    availabilityZone: ap-southeast-2a
-    awsAMI: ami-02ed1a17d1bd5f706
+    awsRegion: '{{ regionAPJ }}'
+    availabilityZone: '{{ azAPJ }}'
+    awsAMI: '{{ amiAPJ }}'
     securityGroups: '{{ securityGroupsAPJ }}'
   when: userRegion | default("1") == "3"