diff --git a/roles/aws/aws_ec2_autoscale_cluster/tasks/main.yml b/roles/aws/aws_ec2_autoscale_cluster/tasks/main.yml index 3dcf5766b..7141d4b59 100644 --- a/roles/aws/aws_ec2_autoscale_cluster/tasks/main.yml +++ b/roles/aws/aws_ec2_autoscale_cluster/tasks/main.yml @@ -30,6 +30,21 @@ when: aws_ec2_autoscale_cluster.vpc_name is not defined or (aws_ec2_autoscale_cluster.vpc_name | length) == 0 - name: Create matching Security Group. + 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: + - proto: all + group_name: "{{ aws_ec2_autoscale_cluster.name }}" ansible.builtin.include_role: name: aws/aws_vpc tasks_from: security_group @@ -54,6 +69,10 @@ ansible.builtin.set_fact: _aws_ec2_autoscale_cluster_security_group: "{{ aws_vpc._result[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] }}" + - name: Reset subnets lists. ansible.builtin.set_fact: _aws_ec2_autoscale_cluster_subnets_ids: [] @@ -778,10 +797,3 @@ 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 }}" diff --git a/roles/debian/pam_ldap/tasks/main.yml b/roles/debian/pam_ldap/tasks/main.yml index b2a4de250..53f7854f3 100644 --- a/roles/debian/pam_ldap/tasks/main.yml +++ b/roles/debian/pam_ldap/tasks/main.yml @@ -124,17 +124,31 @@ regexp: "AuthorizedKeysCommandUser " line: AuthorizedKeysCommandUser root +- name: Check if nslcd service exists. + ansible.builtin.systemd: + name: nslcd + register: _nslcd_service_check + failed_when: false + changed_when: false + - name: Restart nslcd service. ansible.builtin.service: name: nslcd state: restarted - when: ansible_facts.services['nslcd.service'] is defined + when: _nslcd_service_check is defined + +- name: Check if nscd service exists. + ansible.builtin.systemd: + name: nscd + register: _nscd_service_check + failed_when: false + changed_when: false - name: Restart nscd service. ansible.builtin.service: name: nscd state: restarted - when: ansible_facts.services['nscd.service'] is defined + when: _nscd_service_check is defined - name: Restart SSH service. ansible.builtin.service: