Merge pull request #20 from priyama2/latest_change

Default Setup for Protocol and FS

installvm.py

@@ -330,7 +330,6 @@ def createKickstart(self):
             for disk in disks:
                 host_disk += '/dev/disk/by-id/' + disk+','
             vmParser.args.host_disk = host_disk.rstrip(',')
-        urlstring = ''
         if vmParser.args.install_protocol == 'http':
             if version.startswith('8') or  version.startswith('9') or version.startswith('10'):
                 lstr = "%end"
@@ -340,6 +339,7 @@ def createKickstart(self):
                 lstr = "telnet\njava\n%end"
                 urlstring = "--url=http://"+vmParser.confparser('repo', 'RepoIP') + ':' + vmParser.confparser('repo', 'RepoPort') + \
                     self.repoDir 
+
         if vmParser.args.install_protocol == 'nfs':
             if version.startswith('8') or  version.startswith('9') or version.startswith('10'):
                 lstr = "%end"
@@ -348,10 +348,12 @@ def createKickstart(self):
                 lstr = "telnet\njava\n%end"
                 urlstring = "--url=nfs://"+vmParser.confparser('repo', 'RepoIP') + ':/var/www/html' + self.repoDir  
 
-        if vmParser.args.ksargs == '':
+        if vmParser.args.fs_type == 'btrfs':
+            addksstring = "autopart --type=lvm --fstype=btrfs"
+        elif vmParser.args.fs_type == 'ext4':
             addksstring = "autopart --type=lvm --fstype=ext4"
         else:
-            addksstring = vmParser.args.ksargs
+            addksstring = "autopart --type=lvm --fstype=xfs"
 
         ksparm = sftp.open('/var/www/html'+self.ksinst, 'w')
         sshd_file = ''

lib/configparser.py

@@ -74,8 +74,8 @@ def parse_args(self, argv=None):
         parser.add_argument(
             '--distro', help='distro to be installed ex: rhel_7.4le_alpa, sles_11sp3_beta', required=True)
         parser.add_argument(
-            '--install-protocol' , help='Mode of Install Protocol ex: http, ftp, nfs',required=True)
-        parser.add_argument('--fs-type' ,help='RootFS type ex: xfs, ext4, btrfs', default='xfs')
+            '--install-protocol' , help='Mode of Install Protocol ex: http, ftp, nfs',default='http')
+        parser.add_argument('--fs-type' ,help='RootFS type ex: xfs, ext4, btrfs',default='xfs')
         parser.add_argument(
             '--set-boot-order', help='yes/True to set the boot disk order', required=False)
         parser.add_argument(