Updating pam ldap condition pr devel 2.x

roles/aws/aws_ec2_autoscale_cluster/tasks/main.yml

@@ -34,7 +34,7 @@
     name: aws/aws_vpc
     tasks_from: security_group
   vars:
-    aws_vpc:
+    aws_vpc_sg:
       name: "{{ aws_ec2_autoscale_cluster.name }}"
       profile: "{{ aws_ec2_autoscale_cluster.aws_profile }}"
       region: "{{ aws_ec2_autoscale_cluster.region }}"
@@ -45,29 +45,10 @@
       rules:
         - proto: all
           group_name: "{{ aws_ec2_autoscale_cluster.name }}"
-  ansible.builtin.include_role:
-    name: aws/aws_vpc
-    tasks_from: security_group
-  vars:
-    aws_vpc:
-      name: "{{ aws_ec2_autoscale_cluster.name }}"
-      profile: "{{ aws_ec2_autoscale_cluster.aws_profile }}"
-      region: "{{ aws_ec2_autoscale_cluster.region }}"
-      tags: "{{ aws_ec2_autoscale_cluster.tags | combine({'Name': aws_ec2_autoscale_cluster.name}) }}"
-      state: "{{ aws_ec2_autoscale_cluster.state }}"
-      id: "{{ _aws_ec2_autoscale_cluster_vpc_id }}"
-      description: "Allow internal traffic for cluster {{ aws_ec2_autoscale_cluster.name }}"
-      rules:
+      rules_egress:
         - proto: all
           group_name: "{{ aws_ec2_autoscale_cluster.name }}"
-    rules_egress:
-      - proto: all
-        group_name: "{{ aws_ec2_autoscale_cluster.name }}"
-        rule_desc: "Allow internal traffic for cluster {{ aws_ec2_autoscale_cluster.name }}"
-
-- name: Set _aws_ec2_autoscale_cluster_security_group variable.
-  ansible.builtin.set_fact:
-    _aws_ec2_autoscale_cluster_security_group: "{{ aws_vpc._result[aws_ec2_autoscale_cluster.name] }}"
+          rule_desc: "Allow internal traffic for cluster {{ aws_ec2_autoscale_cluster.name }}"
 
 - name: Set _aws_ec2_autoscale_cluster_security_group variable.
   ansible.builtin.set_fact:
@@ -797,3 +778,10 @@
   when:
     - aws_ec2_autoscale_cluster.route_53.zone is defined
     - aws_ec2_autoscale_cluster.route_53.zone | length > 0
+
+#- name: Copy AMI to backup region.
+#  community.aws.ec2_ami_copy:
+#    aws_profile: "{{ aws_ec2_autoscale_cluster.aws_profile }}"
+#    source_region: "{{ aws_ec2_autoscale_cluster.region }}"
+#    region: "{{ aws_backup.copy_vault.region }}"
+#    source_image_id: "{{ aws_ec2_autoscale_cluster_image_latest.image_id }}"

roles/debian/pam_ldap/tasks/main.yml

@@ -14,14 +14,14 @@
   ansible.builtin.file:
     path: /etc/ldap/ssl
     state: directory
-  when: pam_ldap.ssl_certificate is defined and pam_ldap.ssl_certificate
+  when: pam_ldap.ssl_certificate is defined and pam_ldap.ssl_certificate | length > 0
 
 - name: Copy certificate.
   ansible.builtin.copy:
     src: "{{ pam_ldap.ssl_certificate }}"
     dest: "/etc/ldap/ssl/{{ pam_ldap.ssl_certificate | basename }}"
     mode: "0666"
-  when: pam_ldap.ssl_certificate is defined and pam_ldap.ssl_certificate
+  when: pam_ldap.ssl_certificate is defined and pam_ldap.ssl_certificate | length > 0
 
 - name: Copy nslcd config.
   ansible.builtin.template: