浏览代码

Merge pull request #771 from Bhagyashree-shetty/devel

Issue #770: Code changes done for multiprofile provisioning
Sujit Jadhav 3 年之前
父节点
当前提交
1a0112cb65

+ 17 - 0
control_plane/roles/provision_cobbler/files/cobbler_configurations_leap.yml

@@ -80,12 +80,29 @@
     command: cobbler import --arch=x86_64 --path=/mnt/{{ provision_os }} --name="{{ provision_os }}"
     changed_when: false
 
+  - name: Kickstart profile - centos
+    copy:
+      src: "/root/centos7.ks"
+      dest: "/var/lib/cobbler/templates/sample.ks"
+      mode: "{{ file_perm }}"
+    tags: install
+    when: provision_os == "centos"
+
+  - name: Kickstart profile - rocky
+    copy:
+      src: "/root/rocky8.ks"
+      dest: "/var/lib/cobbler/templates/sample.ks"
+      mode: "{{ file_perm }}"
+    tags: install
+    when: provision_os == "rocky"
+
   - name: Kickstart profile - leap
     copy:
       src: "/root/leap15.xml"
       dest: "/var/lib/cobbler/templates/sample_autoyast.xml"
       mode: "{{ file_perm }}"
     tags: install
+    when: provision_os == "leap"
 
   - name: Pxe menu
     copy:

+ 8 - 0
control_plane/roles/provision_cobbler/files/cobbler_configurations_rocky.yml

@@ -87,6 +87,14 @@
     tags: install
     when: provision_os == "rocky"
 
+  - name: Kickstart profile - leap
+    copy:
+      src: "/root/leap15.xml"
+      dest: "/var/lib/cobbler/templates/sample_autoyast.xml"
+      mode: "{{ file_perm }}"
+    tags: install
+    when: provision_os == "leap"
+
   - name: Pxe menu
     copy:
       src: "/root/omnia/control_plane/roles/provision_cobbler/files/menu.yml"

+ 3 - 3
control_plane/roles/provision_cobbler/files/temp_leap15.xml

@@ -59,7 +59,7 @@
     <import t="boolean">false</import>
   </ssh_import>
   <timezone t="map">
-    <timezone>yast_timezone</timezone>
+    <timezone>ks_timezone</timezone>
   </timezone>
   <users t="list">
     <user t="map">
@@ -79,8 +79,8 @@
       </password_settings>
       <shell>/bin/bash</shell>
       <uid>0</uid>
-      <user_password>yast_password</user_password>
+      <user_password>ks_password</user_password>
       <username>root</username>
     </user>
   </users>
-</profile>
+</profile>

+ 4 - 1
control_plane/roles/provision_cobbler/tasks/multi_profile_creation.yml

@@ -52,8 +52,11 @@
   when: not profile_exists
 
 - name: Copy the iso file inside /mnt
-  command: cp -rf /mnt/tmp/. /mnt/{{ provision_os }}
+  command: rsync -AHPSXav /mnt/tmp/ /mnt/{{ provision_os }}/
   changed_when: false
+  failed_when: false
+  args:
+    warn: false
   when: not profile_exists
 
 - name: Unmount /mnt/tmp for further mounts