Bug fixes 2.x pr 2.x

roles/aws/aws_ec2_autoscale_cluster/tasks/main.yml

@@ -379,10 +379,11 @@
   ansible.builtin.include_role:
     name: aws/aws_security_groups
   vars:
-    profile: "{{ aws_ec2_autoscale_cluster.aws_profile }}"
-    region: "{{ aws_ec2_autoscale_cluster.region }}"
-    group_names: "{{ aws_ec2_autoscale_cluster.alb_security_groups }}"
-    return_type: ids
+    aws_security_groups:
+      profile: "{{ aws_ec2_autoscale_cluster.aws_profile }}"
+      region: "{{ aws_ec2_autoscale_cluster.region }}"
+      group_names: "{{ aws_ec2_autoscale_cluster.alb_security_groups }}"
+      return_type: ids
   when:
     - aws_ec2_autoscale_cluster.alb_security_groups | length > 0
     - aws_ec2_autoscale_cluster.create_elb
@@ -425,10 +426,11 @@
   ansible.builtin.include_role:
     name: aws/aws_security_groups
   vars:
-    profile: "{{ aws_ec2_autoscale_cluster.aws_profile }}"
-    region: "{{ aws_ec2_autoscale_cluster.region }}"
-    group_names: "{{ aws_ec2_autoscale_cluster.cluster_security_groups }}"
-    return_type: ids
+    aws_security_groups:
+      profile: "{{ aws_ec2_autoscale_cluster.aws_profile }}"
+      region: "{{ aws_ec2_autoscale_cluster.region }}"
+      group_names: "{{ aws_ec2_autoscale_cluster.cluster_security_groups }}"
+      return_type: ids
   when:
     - aws_ec2_autoscale_cluster.cluster_security_groups | length > 0
     - aws_ec2_autoscale_cluster.asg_refresh

roles/aws/aws_ec2_with_eip/tasks/main.yml

@@ -95,10 +95,11 @@
   ansible.builtin.include_role:
     name: aws/aws_security_groups
   vars:
-    profile: "{{ aws_ec2_with_eip.aws_profile }}"
-    region: "{{ aws_ec2_with_eip.region }}"
-    group_names: "{{ aws_ec2_with_eip.security_groups }}"
-    return_type: ids
+    aws_security_groups:
+      profile: "{{ aws_ec2_with_eip.aws_profile }}"
+      region: "{{ aws_ec2_with_eip.region }}"
+      group_names: "{{ aws_ec2_with_eip.security_groups }}"
+      return_type: ids
   when: aws_ec2_with_eip.security_groups | length > 0
 
 # Do not create an instance if _aws_hostname is not an EC2 generated address unless `force: true`

roles/aws/aws_efs/tasks/main.yml

@@ -3,10 +3,11 @@
   ansible.builtin.include_role:
     name: aws/aws_security_groups
   vars:
-    profile: "{{ aws_efs.aws_profile }}"
-    region: "{{ aws_efs.region }}"
-    group_names: "{{ aws_efs.security_groups }}"
-    return_type: ids
+    aws_security_groups:
+      profile: "{{ aws_efs.aws_profile }}"
+      region: "{{ aws_efs.region }}"
+      group_names: "{{ aws_efs.security_groups }}"
+      return_type: ids
   when: aws_efs.security_groups | length > 0
 
 - name: Reset subnet ids info

roles/aws/aws_elasticache/tasks/main.yml

@@ -3,10 +3,11 @@
   ansible.builtin.include_role:
     name: aws/aws_security_groups
   vars:
-    profile: "{{ aws_elasticache.aws_profile }}"
-    region: "{{ aws_elasticache.region }}"
-    group_names: "{{ aws_elasticache.elasticache_security_groups }}"
-    return_type: ids
+    aws_security_groups:
+      profile: "{{ aws_elasticache.aws_profile }}"
+      region: "{{ aws_elasticache.region }}"
+      group_names: "{{ aws_elasticache.elasticache_security_groups }}"
+      return_type: ids
   when: aws_elasticache.elasticache_security_groups | length > 0
 
 - name: Create ElastiCache subnet group.

roles/aws/aws_elb/tasks/main.yml

@@ -113,10 +113,11 @@
   ansible.builtin.include_role:
     name: aws/aws_security_groups
   vars:
-    profile: "{{ aws_elb.aws_profile }}"
-    region: "{{ aws_elb.region }}"
-    group_names: "{{ aws_elb.elb_security_groups }}"
-    return_type: ids
+    aws_security_groups:
+      profile: "{{ aws_elb.aws_profile }}"
+      region: "{{ aws_elb.region }}"
+      group_names: "{{ aws_elb.elb_security_groups }}"
+      return_type: ids
   when: aws_elb.elb_security_groups | length > 0
 
 - name: Create the ALB.

roles/aws/aws_opensearch/tasks/main.yml

@@ -4,10 +4,11 @@
   ansible.builtin.include_role:
     name: aws/aws_security_groups
   vars:
-    profile: "{{ aws_opensearch.aws_profile }}"
-    region: "{{ aws_opensearch.region }}"
-    group_names: "{{ aws_opensearch.security_groups }}"
-    return_type: ids
+    aws_security_groups:
+      profile: "{{ aws_opensearch.aws_profile }}"
+      region: "{{ aws_opensearch.region }}"
+      group_names: "{{ aws_opensearch.security_groups }}"
+      return_type: ids
   when: aws_opensearch.security_groups | length > 0
 
 - name: Get the current AWS account caller identity information

roles/aws/aws_rds/tasks/main.yml

@@ -67,10 +67,11 @@
   ansible.builtin.include_role:
     name: aws/aws_security_groups
   vars:
-    profile: "{{ aws_rds.aws_profile }}"
-    region: "{{ aws_rds.region }}"
-    group_names: "{{ aws_rds.security_groups }}"
-    return_type: ids
+    aws_security_groups:
+      profile: "{{ aws_rds.aws_profile }}"
+      region: "{{ aws_rds.region }}"
+      group_names: "{{ aws_rds.security_groups }}"
+      return_type: ids
   when: aws_rds.security_groups | length > 0
 
 - name: Create RDS instance

roles/debian/ansible/tasks/main.yml

@@ -4,12 +4,17 @@
     pkg: ansible
     state: absent
 
-- name: Ensure Ansible is not installed globally with pip3 on older versions of Debian.
+- name: Ensure Ansible is not installed globally with pip or pip3 on older versions of Debian.
   ansible.builtin.pip:
-    name: ansible
+    name:
+      - ansible
+      - ansible-core
     state: absent
-    executable: pip3
+    executable: "{{ item }}"
   when: ansible_distribution_major_version | int < 12
+  with_items:
+    - pip
+    - pip3
   failed_when: false # don't stop the build if there's no system pip
 
 - name: Set up Python packages.

roles/debian/gitlab_runner/tasks/main.yml

@@ -42,11 +42,12 @@
     apply:
       delegate_to: localhost # this is how you delegate the include_role module
   vars:
-    profile: "{{ gitlab_runner.fargate.profile }}"
-    region: "{{ gitlab_runner.fargate.region }}"
-    group_names:
-      - "{{ gitlab_runner.fargate.security_group }}"
-    return_type: ids
+    aws_security_groups:
+      profile: "{{ gitlab_runner.fargate.profile }}"
+      region: "{{ gitlab_runner.fargate.region }}"
+      group_names:
+        - "{{ gitlab_runner.fargate.security_group }}"
+      return_type: ids
   when: gitlab_runner.install_fargate
 
 - name: Create the Fargate driver directory if it does not exist.

scripts/_common.sh

@@ -34,10 +34,12 @@ if [ ! -d "$ANSIBLE_DATA_DIR" ]; then
     mkdir "$ANSIBLE_DATA_DIR"
 fi
 # Load the contents of profile.d in case we added items to $PATH there.
-for f in /etc/profile.d/*; do
-# shellcheck source=/dev/null
-   . "$f"
-done
+if [ -n "$(ls -A /etc/profile.d)" ]; then
+  for f in /etc/profile.d/*; do
+  # shellcheck source=/dev/null
+    . "$f"
+  done
+fi
 # Parse options arguments.
 parse_options(){
   while [ "${1:-}" ]; do