Merge "loop htpasswd generation instead of having two tasks"

playbooks/roles/bifrost-ironic-install/tasks/bootstrap.yml

@@ -154,29 +154,26 @@
     group: root
   when: not skip_install | bool
 
-- name: "Generate admin htpasswd for ironic"
+- name: "Generate htpasswd(s) for ironic"
   htpasswd:
     path: /etc/ironic/htpasswd
     crypt_scheme: bcrypt
-    name: "{{ admin_username }}"
+    name: "{{ item.name }}"
-    password: "{{ admin_password }}"
+    password: "{{ item.password }}"
     owner: ironic
     group: ironic
     mode: 0600
+  loop:
+    - name: "{{ admin_username }}"
+      password: "{{ admin_password }}"
+      noauth_mode: false # Authenticate JSON RPC even in no-auth mode
+    - name: "{{ default_username }}"
+      password: "{{ default_password }}"
+      noauth_mode: "{{ noauth_mode }}"
+  loop_control:
+    label: "{{ item.name }}"
   when:
-    - not enable_keystone | bool
+    - not item.noauth_mode | bool
-
-- name: "Generate user htpasswd for ironic"
-  htpasswd:
-    path: /etc/ironic/htpasswd
-    crypt_scheme: bcrypt
-    name: "{{ default_username }}"
-    password: "{{ default_password }}"
-    owner: ironic
-    group: ironic
-    mode: 0600
-  when:
-    - not noauth_mode | bool
     - not enable_keystone | bool
 
 - name: "Generate TLS parameters"

playbooks/roles/bifrost-ironic-install/tasks/inspector_bootstrap.yml

@@ -72,28 +72,22 @@
 - name: "Copy rootwrap.d contents from ironic-inspector source folder"
   command: cp -r "{{ ironicinspector_git_folder }}/rootwrap.d/" "/etc/ironic-inspector/rootwrap.d"
 
-- name: "Generate admin htpasswd for ironic-inspector"
+- name: "Generate htpasswd(s) for ironic-inspector"
   htpasswd:
     path: /etc/ironic-inspector/htpasswd
     crypt_scheme: bcrypt
-    name: "{{ admin_username }}"
+    name: "{{ item.name }}"
-    password: "{{ admin_password }}"
+    password: "{{ item.password }}"
-    owner: ironic
-    group: ironic
-    mode: 0600
-  when:
-    - not noauth_mode | bool
-    - not enable_keystone | bool
-
-- name: "Generate user htpasswd for ironic-inspector"
-  htpasswd:
-    path: /etc/ironic-inspector/htpasswd
-    crypt_scheme: bcrypt
-    name: "{{ default_username }}"
-    password: "{{ default_password }}"
     owner: ironic
     group: ironic
     mode: 0600
+  loop:
+    - name: "{{ admin_username }}"
+      password: "{{ admin_password }}"
+    - name: "{{ default_username }}"
+      password: "{{ default_password }}"
+  loop_control:
+    label: "{{ item.name }}"
   when:
     - not noauth_mode | bool
     - not enable_keystone | bool