@@ -18,15 +18,8 @@

         "visible" : true,

         "include" : ["minimal"]

     },

-    "ostree_host" : {

-        "title" : "3. Photon OSTree Host",

-        "file" : "packages_ostree_host.json",

-        "visible" : true,

-        "include" : [],

-        "additional-files" : ["ostree-repo.tar.gz"]

-    },

     "ostree_server" : {

-        "title" : "4. Photon OSTree Server",

+        "title" : "3. Photon OSTree Server",

         "file" : "packages_ostree_server.json",

         "visible" : true,

         "include" : ["minimal"],

@@ -5,5 +5,5 @@

                   "libffi","expat","linux","cpio","Linux-PAM","attr","libcap", "systemd","dbus",

                   "gzip", "sqlite-autoconf","nspr","nss","popt","lua","rpm","gptfdisk","tar", "librepo",

                   "hawkey", "python2","python2-libs","pcre","glib", "tdnf", "python-requests",

-                  "grub2", "grub2-efi", "efibootmgr", "efivar","dracut", "curl", "ostree", "dosfstools"]

+                  "grub2", "grub2-efi", "efibootmgr", "efivar","dracut", "curl", "dosfstools"]

 }

@@ -5,7 +5,6 @@

 #    Author: Touseef Liaqat <tliaqat@vmware.com>

 from installer import Installer

-from ostreeinstaller import OstreeInstaller

 from ostreeserverinstaller import OstreeServerInstaller

 class InstallerContainer(object):

@@ -20,9 +19,7 @@ class InstallerContainer(object):

     def install(self, params):

         installer = None

-        if self.install_config['type'] == "ostree_host":

-            installer = OstreeInstaller(self.install_config, self.maxy, self.maxx, self.iso_installer, self.rpm_path, self.log_path, self.ks_config)

-        elif self.install_config['type'] == "ostree_server":

+        if self.install_config['type'] == "ostree_server":

             installer = OstreeServerInstaller(self.install_config, self.maxy, self.maxx, self.iso_installer, self.rpm_path, self.log_path, self.ks_config)

         else:

             installer = Installer(self.install_config, self.maxy, self.maxx, self.iso_installer, self.rpm_path, self.log_path, self.ks_config)

@@ -27,13 +27,10 @@ from packageselector import PackageSelector

 from custompackageselector import CustomPackageSelector

 from installer import Installer

 from installercontainer import InstallerContainer

-from ostreeinstaller import OstreeInstaller

 from windowstringreader import WindowStringReader

-from ostreewindowstringreader import OSTreeWindowStringReader

 from jsonwrapper import JsonWrapper

 from selectdisk import SelectDisk

 from license import License

-from ostreeserverselector import OSTreeServerSelector

 from linuxselector import LinuxSelector

 class IsoInstaller(object):

@@ -106,53 +103,6 @@ class IsoInstaller(object):

         machinename = fields[0]

         return (len(machinename) <= 64) and (ord(machinename[0]) in self.alpha_chars), error_hostname

-    def validate_ostree_url_input(self, ostree_repo_url):

-        if not ostree_repo_url:

-            return False, "Error: Invalid input"

-

-        exception_text = "Error: Invalid or unreachable URL"

-        error_text = "Error: Repo URL not accessible"

-        ret = self.validate_http_response(ostree_repo_url, [], exception_text, error_text)

-        if ret != "":

-            return False, ret

-

-        exception_text = "Error: Invalid repo - missing config"

-        ret = self.validate_http_response(

-            ostree_repo_url + "/config",

-            [ [".*\[core\]\s*", 1, "Error: Invalid config - 'core' group expected" ],

-              ["\s*mode[ \t]*=[ \t]*archive-z2[^ \t]", 1, "Error: can't pull from repo in 'bare' mode, 'archive-z2' mode required" ] ],

-            exception_text, exception_text)

-        if ret != "":

-            return False, ret

-    

-        exception_text = "Error: Invalid repo - missing refs"

-        ret = self.validate_http_response(ostree_repo_url + "/refs/heads", [], exception_text, exception_text)

-        if ret != "":

-            return False, ret

-

-        exception_text = "Error: Invalid repo - missing objects"

-        ret = self.validate_http_response(ostree_repo_url + "/objects", [], exception_text, exception_text)

-        if ret != "":

-            return False, ret

-

-        self.ostree_repo_url = ostree_repo_url

-

-        return True, None

-

-    def validate_ostree_refs_input(self, ostree_repo_ref):

-        if not ostree_repo_ref:

-            return False, "Error: Invalid input"

-

-        ret = self.validate_http_response(

-                self.ostree_repo_url  + '/refs/heads/' + ostree_repo_ref,

-                [ ["^\s*[0-9A-Fa-f]{64}\s*$", 1, "Error: Incomplete Refspec path, or unexpected Refspec format"] ],

-                "Error: Invalid Refspec path",

-                "Error: Refspec not accessible")

-        if ret != "":

-            return False, ret

-

-        return True, None

-

     def validate_password(self, text):

         try:

             p = cracklib.VeryFascistCheck(text)

@@ -279,29 +229,8 @@ class IsoInstaller(object):

                     None, # validation function of the input

                     self.generate_password_hash, # post processing of the input field

                     'Confirm root password', 'Confirm Root password:', 2, install_config)

-            ostree_server_selector = OSTreeServerSelector(self.maxy, self.maxx, install_config)

-            ostree_url_reader = OSTreeWindowStringReader(

-                    self.maxy, self.maxx, 10, 80, 

-                    'ostree_repo_url', 

-                    None, # confirmation error msg if it's a confirmation text

-                    None, # echo char

-                    None, # set of accepted chars

-                    self.validate_ostree_url_input, # validation function of the input

-                    None, # post processing of the input field

-                    'Please provide the URL of OSTree repo', 'OSTree Repo URL:', 2, install_config,

-                    "http://")

-            ostree_ref_reader = OSTreeWindowStringReader(

-                    self.maxy, self.maxx, 10, 70, 

-                    'ostree_repo_ref', 

-                    None, # confirmation error msg if it's a confirmation text

-                    None, # echo char

-                    None, # set of accepted chars

-                    self.validate_ostree_refs_input, # validation function of the input

-                    None, # post processing of the input field

-                    'Please provide the Refspec in OSTree repo', 'OSTree Repo Refspec:', 2, install_config,

-                    "photon/1.0/x86_64/minimal")

-            items.append((license_agreement.display, False))                    ,

+            items.append((license_agreement.display, False))

             items.append((select_disk.display, True))

             items.append((select_partition.display, False))

             items.append((select_disk.guided_partitions, False))

@@ -314,9 +243,6 @@ class IsoInstaller(object):

             items.append((hostname_reader.get_user_string, True))

             items.append((root_password_reader.get_user_string, True))

             items.append((confirm_password_reader.get_user_string, False))

-            items.append((ostree_server_selector.display, True))

-            items.append((ostree_url_reader.get_user_string, True))

-            items.append((ostree_ref_reader.get_user_string, True))

         else:

             install_config = ks_config

@@ -339,8 +265,7 @@ class IsoInstaller(object):

                     break

                 #Skip linux select screen for ostree installation.

                 if index == select_linux_index:

-                    if (install_config['type'] == 'ostree_host' or

-                        install_config['type'] == 'ostree_server'):

+                    if (install_config['type'] == 'ostree_server'):

                         index += 1

             else:

                 index -= 1

@@ -350,8 +275,7 @@ class IsoInstaller(object):

                     index = 0

                 #Skip linux select screen for ostree installation.

                 if index == select_linux_index:

-                    if (install_config['type'] == 'ostree_host' or

-                        install_config['type'] == 'ostree_server'):

+                    if (install_config['type'] == 'ostree_server'):

                         index -= 1

 if __name__ == '__main__':

deleted file mode 100755

@@ -1,171 +0,0 @@

-#!/usr/bin/python2

-#

-#    Copyright (C) 2015 vmware inc.

-#

-#    Author: Touseef Liaqat <tliaqat@vmware.com>

-

-import os

-import glob

-import modules.commons

-from installer import Installer

-from actionresult import ActionResult

-

-class OstreeInstaller(Installer):

-

-    def __init__(self, install_config, maxy = 0, maxx = 0, iso_installer = False, rpm_path = "../stage/RPMS", log_path = "../stage/LOGS", ks_config = None):

-        Installer.__init__(self, install_config, maxy, maxx, iso_installer, rpm_path, log_path, ks_config)

-        self.repo_config = {}

-        self.repo_read_conf()

-

-    def get_ostree_repo_url(self):

-        self.default_repo = 'default_repo' in self.install_config and self.install_config['default_repo'];

-        if not self.default_repo:

-            self.ostree_repo_url = self.install_config['ostree_repo_url']

-            self.ostree_ref = self.install_config['ostree_repo_ref']

-

-    def repo_read_conf(self):

-        with open("ostree-release-repo.conf") as repo_conf:

-            for line in repo_conf:

-                name, value = line.partition("=")[::2]

-                self.repo_config[name] = value.strip(' \n\t\r')

-

-    def pull_repo(self, repo_url, repo_ref):

-        if self.default_repo:

-            self.run("ostree remote add --repo={}/ostree/repo --set=gpg-verify=false photon {}".format(self.photon_root, repo_url), "Adding OSTree remote")

-            self.run("ostree pull-local --repo={}/ostree/repo {}".format(self.photon_root, self.local_repo_path), "Pulling OSTree repo")

-            self.run("mv {}/ostree/repo/refs/heads {}/ostree/repo/refs/remotes/photon".format(self.photon_root, self.photon_root))

-            self.run("mkdir -p {}/ostree/repo/refs/heads".format(self.photon_root, self.photon_root))

-        else:

-            self.run("ostree remote add --repo={}/ostree/repo --set=gpg-verify=false photon {}".format(self.photon_root, repo_url), "Adding OSTree remote")

-            self.run("ostree pull --repo={}/ostree/repo photon {}".format(self.photon_root, repo_ref), "Pulling OSTree remote repo")

-

-    def deploy_ostree(self, repo_url, repo_ref):

-        self.run("ostree admin --sysroot={} init-fs {}".format(self.photon_root, self.photon_root), "Initializing OSTree filesystem")

-        self.pull_repo(repo_url, repo_ref)

-        self.run("ostree admin --sysroot={} os-init photon ".format(self.photon_root), "OSTree OS Initializing")

-        self.run("ostree admin --sysroot={} deploy --os=photon photon:{}".format(self.photon_root, repo_ref), "Deploying")

-

-    def do_systemd_tmpfiles_commands(self, commit_number):

-        prefixes = ["/var/home",

-            "/var/roothome",

-            "/var/lib/rpm",

-            "/var/opt",

-            "/var/srv",

-            "/var/userlocal",

-            "/var/mnt",

-            "/var/spool/mail"]

-

-        for prefix in prefixes:

-            command = "systemd-tmpfiles --create --boot --root={}/ostree/deploy/photon/deploy/{}.0 --prefix={}".format(self.photon_root, commit_number, prefix)

-            self.run(command)

-

-    def mount_devices_in_deployment(self, commit_number):

-        for command in ["mount -t bind -o bind,defaults /dev  {}/ostree/deploy/photon/deploy/{}.0/dev",

-            "mount -t devpts -o gid=5,mode=620 devpts  {}/ostree/deploy/photon/deploy/{}.0/dev/pts",

-            "mount -t tmpfs -o defaults tmpfs  {}/ostree/deploy/photon/deploy/{}.0/dev/shm",

-            "mount -t proc -o defaults proc  {}/ostree/deploy/photon/deploy/{}.0/proc",

-            "mount -t bind -o bind,defaults /run  {}/ostree/deploy/photon/deploy/{}.0/run",

-            "mount -t sysfs -o defaults sysfs  {}/ostree/deploy/photon/deploy/{}.0/sys" ]:

-            self.run(command.format(self.photon_root, commit_number))

-

-    def get_commit_number(self, ref):

-        fileName = os.path.join(self.photon_root, "ostree/repo/refs/remotes/photon/{}".format(ref))

-        commit_number = None

-        with open (fileName, "r") as file:

-            commit_number = file.read().replace('\n', '')

-        return commit_number

-

-    def unsafe_install(self, params):

-        self.org_photon_root = self.photon_root

-        sysroot_ostree = os.path.join(self.photon_root, "ostree")

-        sysroot_boot = os.path.join(self.photon_root, "boot")

-        loader0 = os.path.join(sysroot_boot, "loader.0")

-        loader1 = os.path.join(sysroot_boot, "loader.1")

-

-        boot0 = os.path.join(sysroot_ostree, "boot.0")

-        boot1 = os.path.join(sysroot_ostree, "boot.1")

-

-        boot01 = os.path.join(sysroot_ostree, "boot.0.1")

-        boot11 = os.path.join(sysroot_ostree, "boot.1.1")

-

-        self.get_ostree_repo_url()

-

-        self.window.show_window()

-        self.progress_bar.initialize("Initializing installation...")

-        self.progress_bar.show()

-        

-        self.execute_modules(modules.commons.PRE_INSTALL)

-

-        disk = self.install_config['disk']['disk']

-        self.run("sgdisk -d 1 -d 2 -n 1::+2M -n 2::+300M -n 3: -p {}".format(disk), "Updating partition table for OSTree")

-        self.run("sgdisk -t1:ef02 {}".format(disk))

-        self.run("mkfs -t ext4 {}2".format(disk))

-        self.run("mkfs -t ext4 {}3".format(disk))

-        self.run("mount {}3 {}".format(disk, self.photon_root))

-        self.run("mkdir -p {} ".format(sysroot_boot))

-        self.run("mount {}2 {}".format(disk, sysroot_boot))

-

-        #Setup the disk

-        self.run("dd if=/dev/zero of={}/swapfile bs=1M count=64".format(self.photon_root))

-        self.run("chmod 600 {}/swapfile".format(self.photon_root))

-        self.run("mkswap -v1 {}/swapfile".format(self.photon_root))

-        self.run("swapon {}/swapfile".format(self.photon_root))

-

-        if self.default_repo:

-            self.run("rm -rf /installer/boot")

-            self.run("mkdir -p {}/repo".format(self.photon_root))

-            self.progress_bar.show_loading("Unpacking local OSTree repo")

-            self.run("tar --warning=none -xf /mnt/cdrom/ostree-repo.tar.gz -C {}/repo".format(self.photon_root))

-            self.local_repo_path = "{}/repo".format(self.photon_root)

-            self.ostree_repo_url = self.repo_config['OSTREEREPOURL']

-            self.ostree_ref = self.repo_config['OSTREEREFS']

-            self.progress_bar.update_loading_message("Unpacking done")

-

-

-        self.deploy_ostree(self.ostree_repo_url, self.ostree_ref)

-

-        self.run("swapoff -a")

-        self.run("rm {}/swapfile".format(self.photon_root))

-

-        commit_number = self.get_commit_number(self.ostree_ref)

-        self.do_systemd_tmpfiles_commands(commit_number)

-

-        self.mount_devices_in_deployment(commit_number)

-        deployment = os.path.join(self.photon_root, "ostree/deploy/photon/deploy/" + commit_number + ".0/")

-

-        deployment_boot = os.path.join(deployment, "boot")

-        deployment_sysroot = os.path.join(deployment, "sysroot")

-

-        self.run("mv {} {}".format(loader1, loader0))

-        self.run("mv {} {}".format(boot1, boot0))

-        self.run("mv {} {}".format(boot11, boot01))

-        self.run("mount --bind {} {}".format(sysroot_boot, deployment_boot))

-        self.run("mount --bind {} {}".format(self.photon_root, deployment_sysroot))

-        self.run("chroot {} bash -c \"grub2-install /dev/sda\"".format(deployment))

-        self.run("chroot {} bash -c \"grub2-mkconfig -o /boot/grub2/grub.cfg\"".format(deployment))

-        self.run("mv {} {}".format(loader0, loader1))

-        self.run("mv {} {}".format(boot0, boot1))

-        self.run("mv {} {}".format(boot01, boot11))

-        self.run("chroot {} bash -c \"ostree admin instutil set-kargs root=/dev/sda3 \"".format(deployment))

-        sysroot_grub2_grub_cfg = os.path.join(self.photon_root, "boot/grub2/grub.cfg")

-        self.run("ln -sf ../loader/grub.cfg {}".format(sysroot_grub2_grub_cfg))

-        self.run("mv {} {}".format(loader1, loader0))

-        self.run("mv {} {}".format(boot1, boot0))

-        self.run("mv {} {}".format(boot11, boot01))

-

-

-        deployment_fstab = os.path.join(deployment, "etc/fstab")

-        self.run("echo \"/dev/sda3    /        ext4   defaults,barrier,noatime,noacl,data=ordered 1 1  \" >> {} ".format(deployment_fstab), "Adding / mount point in fstab")

-        self.run("echo \"/dev/sda2    /boot    ext4   defaults   1 2  \" >> {} ".format(deployment_fstab), "Adding /boot mount point in fstab")

-        self.run("mount --bind {} {}".format(deployment, self.photon_root))

-        self.progress_bar.update_loading_message("Starting post install modules")

-        self.execute_modules(modules.commons.POST_INSTALL)

-        self.progress_bar.update_loading_message("Unmounting disks")

-        self.run("{} {} {}".format(self.unmount_disk_command, '-w', self.photon_root))

-        self.progress_bar.update_loading_message("Ready to restart")

-        self.progress_bar.hide()

-        self.window.addstr(0, 0, 'Congratulations, Photon RPM-OSTree Host has been installed in {0} secs.\n\nPress any key to continue to boot...'.format(self.progress_bar.time_elapsed))

-        if self.ks_config == None:

-            self.window.content_window().getch()

-        return ActionResult(True, None)

-

deleted file mode 100755

@@ -1,49 +0,0 @@

-#!/usr/bin/python2

-#

-#    Copyright (C) 2015 vmware inc.

-#

-#    Author: Mahmoud Bassiouny <mbassiouny@vmware.com>

-

-import json

-import os

-import curses

-from sets import Set

-from jsonwrapper import JsonWrapper

-from menu import Menu

-from window import Window

-from actionresult import ActionResult

-

-class OSTreeServerSelector(object):

-    def __init__(self,  maxy, maxx, install_config):

-

-        self.install_config = install_config

-        self.maxx = maxx

-        self.maxy = maxy

-        self.win_width = 50

-        self.win_height = 13

-

-        self.win_starty = (self.maxy - self.win_height) / 2

-        self.win_startx = (self.maxx - self.win_width) / 2

-

-        self.menu_starty = self.win_starty + 3

-

-        self.menu_items = []

-        self.menu_items.append(("Default RPM-OSTree Server", self.set_default_repo_installation, True))

-        self.menu_items.append(("Custom RPM-OSTree Server", self.set_default_repo_installation, False))

-

-        self.host_menu = Menu(self.menu_starty, self.maxx, self.menu_items,

-                              default_selected = 0, tab_enable=False)

-

-        self.window = Window(self.win_height, self.win_width, self.maxy, self.maxx,

-                             'Select OSTree Server', True, items=[], tab_enabled = False,

-                             position = 1, can_go_next=True)

-        self.window.set_action_panel(self.host_menu)

-

-    def set_default_repo_installation(self,  is_default_repo ):

-        self.install_config['default_repo'] = is_default_repo

-        return ActionResult(True, None)

-

-    def display(self, params):

-        if self.install_config['type'] == 'ostree_host':

-            return self.window.do_action()

-        return ActionResult(True, None)

deleted file mode 100755

@@ -1,17 +0,0 @@

-#!/usr/bin/python2

-#

-#    Copyright (C) 2015 vmware inc.

-#

-#    Author: Mahmoud Bassiouny <mbassiouny@vmware.com>

-

-from windowstringreader import WindowStringReader

-from actionresult import ActionResult

-

-class OSTreeWindowStringReader(WindowStringReader):

-    def __init__(self, maxy, maxx, height, width, field, confirmation_err_msg, echo_char, accepted_chars, validation_fn, conversion_fn, title, display_string, inputy, install_config, default_string = None):

-        WindowStringReader.__init__(self, maxy, maxx, height, width, field, confirmation_err_msg, echo_char, accepted_chars, validation_fn, conversion_fn, title, display_string, inputy, install_config, default_string)

-

-    def get_user_string(self, params):

-        if self.install_config['type'] == 'ostree_host' and not self.install_config['default_repo']:

-            return self.window.do_action()

-        return ActionResult(True, None)