Fix issue with force web instance

mageops · May 10, 2024 · 912e3c9 · 912e3c9
1 parent 24c07c8
commit 912e3c9
Show file tree

Hide file tree

Showing 4 changed files with 29 additions and 8 deletions.
diff --git a/group_vars/all.yml b/group_vars/all.yml
@@ -405,8 +405,8 @@ aws_persistent_node_create: yes
 
 # EC2 Instance types
 aws_app_node_instance_type: t3a.micro
-aws_app_builder_node_instance_type: "{{ aws_app_node_instance_type }}"
-aws_extra_app_node_instance_type: "{{ aws_app_node_instance_type }}"
+aws_app_builder_node_instance_type: "{{ aws_app_node_instance_type_forced | default(aws_app_node_instance_type, true) }}"
+aws_extra_app_node_instance_type: "{{ aws_app_node_instance_type_forced | default(aws_app_node_instance_type, true) }}"
 aws_persistent_node_instance_type: t3a.micro
 
 # EC2 Elastic IPs

diff --git a/roles/cs.aws-ami-facts/tasks/find-app-node-ami.yml b/roles/cs.aws-ami-facts/tasks/find-app-node-ami.yml
@@ -1,4 +1,4 @@
-- name: Find app node AMIs
+- name: Find app node AMIs with the same architecure
   amazon.aws.ec2_ami_info:
     region: "{{ aws_region }}"
     filters: >-
@@ -10,14 +10,35 @@
     ami_facts_app_node_tag_filters: "{{ ami_facts_app_node_tags | prefix_keys('tag:') }}"
   register: ami_app_node_facts
 
+- name: Find app node AMIs
+  amazon.aws.ec2_ami_info:
+    region: "{{ aws_region }}"
+    filters: >-
+      {{  ami_facts_app_node_base_filters | combine(
+          ami_facts_app_node_filters,
+          ami_facts_app_node_tag_filters) }}
+  vars:
+    ami_facts_app_node_tag_filters: "{{ ami_facts_app_node_tags | prefix_keys('tag:') }}"
+  register: ami_app_node_all_facts
+
 - name: Set latest app node AMI facts if found
   when: ami_app_node_facts.images | length > 0
   block:
     - name: Set latest app node AMI info
       set_fact:
         aws_ami_app_node_info: "{{ ami_app_node_facts.images | sort(attribute='creation_date') | last }}"
 
+    - name: Set latest app node AMI info with all architecture
+      set_fact:
+        aws_ami_app_node_all_info: "{{ ami_app_node_all_facts.images | sort(attribute='creation_date') | last }}"
+
+    - name: Show if last AMI has proper architecture
+      when: ( aws_ami_app_node_info.image_id  == aws_ami_app_node_all_info.image_id )
+      debug:
+        msg: "Last AMI has proper architecture {{ aws_ami_app_node_info.image_id }} = {{ aws_ami_app_node_all_info.image_id }}"
+
     - name: Set latest app node AMI facts
+      when:  ( aws_ami_app_node_info.image_id  == aws_ami_app_node_all_info.image_id )
       set_fact:
         aws_ami_app_node_id: "{{ aws_ami_app_node_info.image_id }}"
         aws_ami_app_node_name: "{{ aws_ami_app_node_info.name }}"
@@ -26,7 +47,7 @@
         aws_ami_app_node_artifact_build_nr: "{{ aws_ami_app_node_info.tags.ArtifactBuildNr | default('null') | from_json }}"
 
 - name: Print information about newest app node AMI found
-  when: (ami_app_node_facts.images | length > 0) and ( aws_ami_app_node_info.Architecture == ami_facts_architecture )
+  when: (ami_app_node_facts.images | length > 0) and ( aws_ami_app_node_info.image_id  == aws_ami_app_node_all_info.image_id )
   debug:
     msg: |
       ===============================================================
@@ -48,6 +69,6 @@
       {{ aws_ami_app_node_info.tags | default({}) | to_nice_yaml }}
 
 - name: Print information if no images were found
-  when: ami_app_node_facts.images | length == 0
+  when: ami_app_node_facts.images | length == 0 or ( aws_ami_app_node_info.image_id  != aws_ami_app_node_all_info.image_id )
   debug:
     msg: "No previous app node AMI was found! Clean build is coming..."
diff --git a/roles/cs.pio/defaults/main.yml b/roles/cs.pio/defaults/main.yml
@@ -31,6 +31,6 @@ pio_resize_strategy: Contain
 # Url to pio-worker rpm
 pio_package_url_rpm:
   x86_64:
-  arm64:
+  aarch64:
 
 pio_worker_cpu_shares: 2
diff --git a/site.step-60-autoscaling.yml b/site.step-60-autoscaling.yml
@@ -5,7 +5,7 @@
   gather_facts: no
   roles:
     - role: cs.aws-ami-facts
-      ami_facts_instance: "{{ aws_app_node_instance_type }}"
+      ami_facts_instance: "{{ aws_app_node_instance_type_forced | default(aws_app_node_instance_type, true) }}"
       delegate_to: localhost
   tasks:
     - block:
@@ -61,7 +61,7 @@
         }}
   roles:
     - role: cs.aws-ami-facts
-      ami_facts_instance: "{{ aws_app_node_instance_type }}"
+      ami_facts_instance: "{{ aws_app_node_instance_type_forced | default(aws_app_node_instance_type, true) }}"
       delegate_to: localhost
     - role: cs.aws-autoscaling
       autoscaling_assign_public_ip: yes