Skip to content
This repository was archived by the owner on Oct 7, 2025. It is now read-only.

Commit 94538eb

Browse files
committed
Updating-pam-ldap-condition-PR-devel-2.x
2 parents 91523bd + b4e8d45 commit 94538eb

File tree

2 files changed

+21
-36
lines changed

2 files changed

+21
-36
lines changed

roles/aws/aws_ec2_autoscale_cluster/tasks/main.yml

Lines changed: 19 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -30,36 +30,18 @@
3030
when: aws_ec2_autoscale_cluster.vpc_name is not defined or (aws_ec2_autoscale_cluster.vpc_name | length) == 0
3131

3232
- name: Create matching Security Group.
33-
ansible.builtin.include_role:
34-
name: aws/aws_vpc
35-
tasks_from: security_group
36-
vars:
37-
aws_vpc:
38-
name: "{{ aws_ec2_autoscale_cluster.name }}"
39-
profile: "{{ aws_ec2_autoscale_cluster.aws_profile }}"
40-
region: "{{ aws_ec2_autoscale_cluster.region }}"
41-
tags: "{{ aws_ec2_autoscale_cluster.tags | combine({'Name': aws_ec2_autoscale_cluster.name}) }}"
42-
state: "{{ aws_ec2_autoscale_cluster.state }}"
43-
id: "{{ _aws_ec2_autoscale_cluster_vpc_id }}"
44-
description: "Allow internal traffic for cluster {{ aws_ec2_autoscale_cluster.name }}"
45-
rules:
46-
- proto: all
47-
group_name: "{{ aws_ec2_autoscale_cluster.name }}"
48-
ansible.builtin.include_role:
49-
name: aws/aws_vpc
50-
tasks_from: security_group
51-
vars:
52-
aws_vpc:
53-
name: "{{ aws_ec2_autoscale_cluster.name }}"
54-
profile: "{{ aws_ec2_autoscale_cluster.aws_profile }}"
55-
region: "{{ aws_ec2_autoscale_cluster.region }}"
56-
tags: "{{ aws_ec2_autoscale_cluster.tags | combine({'Name': aws_ec2_autoscale_cluster.name}) }}"
57-
state: "{{ aws_ec2_autoscale_cluster.state }}"
58-
id: "{{ _aws_ec2_autoscale_cluster_vpc_id }}"
59-
description: "Allow internal traffic for cluster {{ aws_ec2_autoscale_cluster.name }}"
60-
rules:
61-
- proto: all
62-
group_name: "{{ aws_ec2_autoscale_cluster.name }}"
33+
amazon.aws.ec2_security_group:
34+
profile: "{{ aws_ec2_autoscale_cluster.aws_profile }}"
35+
region: "{{ aws_ec2_autoscale_cluster.region }}"
36+
name: "{{ aws_ec2_autoscale_cluster.name }}"
37+
tags: "{{ aws_ec2_autoscale_cluster.tags | combine({'Name': aws_ec2_autoscale_cluster.name}) }}"
38+
state: "{{ aws_ec2_autoscale_cluster.state }}"
39+
vpc_id: "{{ _aws_ec2_autoscale_cluster_vpc_id }}"
40+
description: "Allow internal traffic for cluster {{ aws_ec2_autoscale_cluster.name }}"
41+
rules:
42+
- proto: all
43+
group_name: "{{ aws_ec2_autoscale_cluster.name }}"
44+
rule_desc: "Allow internal traffic for cluster {{ aws_ec2_autoscale_cluster.name }}"
6345
rules_egress:
6446
- proto: all
6547
group_name: "{{ aws_ec2_autoscale_cluster.name }}"
@@ -69,10 +51,6 @@
6951
ansible.builtin.set_fact:
7052
_aws_ec2_autoscale_cluster_security_group: "{{ aws_vpc._result[aws_ec2_autoscale_cluster.name] }}"
7153

72-
- name: Set _aws_ec2_autoscale_cluster_security_group variable.
73-
ansible.builtin.set_fact:
74-
_aws_ec2_autoscale_cluster_security_group: "{{ aws_vpc._result[aws_ec2_autoscale_cluster.name] }}"
75-
7654
- name: Reset subnets lists.
7755
ansible.builtin.set_fact:
7856
_aws_ec2_autoscale_cluster_subnets_ids: []
@@ -797,3 +775,10 @@
797775
when:
798776
- aws_ec2_autoscale_cluster.route_53.zone is defined
799777
- aws_ec2_autoscale_cluster.route_53.zone | length > 0
778+
779+
#- name: Copy AMI to backup region.
780+
# community.aws.ec2_ami_copy:
781+
# aws_profile: "{{ aws_ec2_autoscale_cluster.aws_profile }}"
782+
# source_region: "{{ aws_ec2_autoscale_cluster.region }}"
783+
# region: "{{ aws_backup.copy_vault.region }}"
784+
# source_image_id: "{{ aws_ec2_autoscale_cluster_image_latest.image_id }}"

roles/debian/pam_ldap/tasks/main.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,14 +14,14 @@
1414
ansible.builtin.file:
1515
path: /etc/ldap/ssl
1616
state: directory
17-
when: pam_ldap.ssl_certificate is defined and pam_ldap.ssl_certificate
17+
when: pam_ldap.ssl_certificate is defined and pam_ldap.ssl_certificate | length > 0
1818

1919
- name: Copy certificate.
2020
ansible.builtin.copy:
2121
src: "{{ pam_ldap.ssl_certificate }}"
2222
dest: "/etc/ldap/ssl/{{ pam_ldap.ssl_certificate | basename }}"
2323
mode: "0666"
24-
when: pam_ldap.ssl_certificate is defined and pam_ldap.ssl_certificate
24+
when: pam_ldap.ssl_certificate is defined and pam_ldap.ssl_certificate | length > 0
2525

2626
- name: Copy nslcd config.
2727
ansible.builtin.template:

0 commit comments

Comments
 (0)