Merge branch 'devel' into devel

control_plane/roles/provision_cobbler/files/Dockerfile

@@ -11,7 +11,7 @@ RUN dnf update -y \
     && rm -rf /var/cache/dnf
 
 RUN dnf install -y git
-RUN git clone -b release32  https://github.com/cobbler/cobbler.git
+RUN git clone -b v3.2.1 https://github.com/cobbler/cobbler.git
 RUN cd cobbler/
 
 RUN mkdir /root/omnia

control_plane/roles/provision_cobbler/tasks/provision_password.yml

@@ -28,7 +28,7 @@
 
 - name: Cobbler UI password
   set_fact:
-        encrypt_password: "{{ cobbler_password| hash('sha3_256')}}"
+        encrypt_password: "{{ cobbler_password | hash('sha3_256') }}"
   no_log: true
   tags: install
 
@@ -101,4 +101,4 @@
     path: "{{ role_path }}/files/centos7.ks"
     regexp: '^timezone --utc ks_timezone'
     replace: 'timezone --utc {{ timezone }}'
-  tags: install
+  tags: install

roles/powervault_me4_nfs/tasks/nfs_node_configure.yml

@@ -15,7 +15,7 @@
 ---
 
 - name: Include
-  include_tasks: "{{ playbook_dir }}/control_plane/roles/powervault_me4/tasks/ports.yml"
+  include_tasks: "{{ playbook_dir }}/../../../control_plane/roles/powervault_me4/tasks/ports.yml"
 
 - name: Refresh ssh keys
   command: ssh-keygen -R {{ groups['powervault_me4'][0] }}
@@ -134,4 +134,4 @@
 - name: Login to the powervault
   command: iscsiadm -m node --login {{ pv_name }} -p {{ ip_port }}
   changed_when: true
-  tags: install
+  tags: install