Skip to content

Commit 5e17162

Browse files
committed
Fix lint
1 parent 9228428 commit 5e17162

File tree

2 files changed

+16
-17
lines changed

2 files changed

+16
-17
lines changed

tests/roles/keystone_adoption/tasks/main.yaml

Lines changed: 15 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -22,24 +22,19 @@
2222
ipa_hostname: "ipa.{{ edpm_node_hostname.split('.')[1:] }}"
2323
ipa_basedn: "dc={{ edpm_node_hostname.split('.')[1:] | join(',dc=') }}"
2424

25-
- name: Set Keystone config key name
26-
ansible.builtin.set_fact:
27-
keystone_conf_key: "keystone.{{ ipa_domain | default('REDHAT') }}.conf"
2825

2926
- name: Create Keystone domain config secret for LDAP
30-
kubernetes.core.k8s:
31-
32-
state: present
33-
definition:
34-
apiVersion: v1
35-
kind: Secret
36-
metadata:
37-
name: keystone-domains
38-
namespace: openstack
39-
type: Opaque
40-
stringData: "{{ {keystone_conf_key: keystone_ldap_config_content} }}"
41-
vars:
42-
keystone_ldap_config_content: |
27+
ansible.builtin.shell: |
28+
{{ shell_header }}
29+
{{ oc_header }}
30+
cat <<EOF | oc apply -n openstack -f -
31+
apiVersion: v1
32+
kind: Secret
33+
metadata:
34+
name: keystone-domains
35+
type: Opaque
36+
stringData:
37+
keystone.{{ ipa_domain | default('REDHAT') }}.conf: |
4338
[identity]
4439
driver = ldap
4540
[ldap]
@@ -58,6 +53,10 @@
5853
group_name_attribute = cn
5954
group_member_attribute = member
6055
group_desc_attribute = description
56+
EOF
57+
vars:
58+
keystone_ldap_config_content: |
59+
6160
6261
- name: deploy podified Keystone
6362
ansible.builtin.shell: |

tests/roles/keystone_adoption/tasks/run_ipa_test.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -107,6 +107,7 @@
107107
when: enable_tlse
108108

109109
- name: Verify group memberships
110+
when: enable_tlse
110111
block:
111112
- name: Check ipauser1 in grp-openstack-admin
112113
ansible.builtin.shell: |
@@ -140,4 +141,3 @@
140141
openstack group contains user --group-domain REDHAT --user-domain REDHAT grp-openstack ipauser3"
141142
register: user3_group_result
142143
failed_when: "'ipauser3 in group grp-openstack' not in user3_group_result.stdout"
143-
when: enable_tlse

0 commit comments

Comments
 (0)