Merge pull request #44 from vcf/topic/okurth/remove-ostree

remove ostree support

Author: oliverkurth

docker/Dockerfile

@@ -60,7 +60,7 @@ RUN tdnf ${TDNF_OPTIONS} makecache && \
     python3-PyYAML \
     python3-rpm \
     qemu-img \
-    open-vmdk ostree rpm-ostree \
+    open-vmdk \
     stig-hardening \
     $([ "${TARGETARCH}" == "amd64" ] && echo grub2-pc) && \
     rm -rf /var/cache/tdnf
@@ -76,7 +76,6 @@ COPY \
      create-ova \
      create-repo \
      create-azure \
-     create-ostree \
      create-cherrypicks-repo \
      create-pkg \
      poi-pkglist yjson \

docker/create-ostree

@@ -204,39 +204,6 @@ Multiple disks:
       "log_level": "debug"
     }
     ```
-### _"ostree":_ (optional)
-- Atomic flavour of Photon OS.
-- Define the type of repo data used for installing the OS
-- There are two type:
-  1. Default Repo(comes with ISO)
-  2. Custom Repo (Remote server)
-  - _"default_repo":_ (required)
-    - **Boolean:** _true_ or _false_
-      - _true_ : Default Repo is selected
-      - _false_: Custom Repo is selected
-    - **Default value:** _true_
-   Example:
-   ```json
-   {
-     "ostree": {
-                  "default_repo": true
-               }
-   }
-   ```
-  - _"repo_url":_ (Required, Only If Custom Repo is selected)
-    - **Supported Values:** Valid "repo" URL of remote server where repo data exists
-  - _"repo_ref":_ (Required, Only If Custom Repo is selected)
-    - **Supported Value:** Valid "ref" path which was mentioned for
-                           creation of Base Tree on remote server
-
-   Example:
-   ```json
-   {
-       "ostree": {
-           "default_repo": false,
-           "repo_url": "http://<ip>:<port>/repo",
-           "repo_ref": "photon/4.0/x86_64/minimal"
-       }
    }
    ```
 

docs/ks_config.md

@@ -43,9 +43,6 @@
     "nspr",
     "nss",
     "open-vm-tools",
-    "ostree",
-    "ostree-grub2",
-    "ostree-libs",
     "pcre",
     "popt",
     "python3",

examples/iso/ostree_ks.yaml

@@ -36,7 +36,6 @@ def __init__(self, **kwargs):
             "photon_release_version",
             "pkg_list_file",
             "install_options_file",
-            "ostree_iso",
             "initrd_files",
         ]
         for key in kwargs:
@@ -188,14 +187,6 @@ def clean_up(self):
     def install_initrd_packages(self):
         # nogpgcheck to work around installing locally built packages, like photon-os-installer
         tdnf_args = ["--nogpgcheck", "install"] + self.initrd_pkgs
-        # mount_dirs = []
-        if self.ostree_iso:
-            self.tdnf.config_file = None
-            self.tdnf.reposdir = None
-        else:
-            # mount_dirs = [self.rpms_path, self.working_dir]
-            pass
-
         self.tdnf.run(tdnf_args, do_json=False)
 
     def prepare_installer_dir(self):
@@ -218,20 +209,19 @@ def build_initrd(self):
         # Explicitly set permission to 755 as it is ignored when passed through mode= in os.makedirs
         os.chmod(self.initrd_path, 0o755)
 
-        if not self.ostree_iso:
-            # Create Local Repo
-            create_repo_conf(
-                {
-                    "photon-local": {
-                        "name": "VMWare Photon Linux (x86_64)",
-                        "baseurl": f"file://{self.rpms_path}",
-                        "gpgcheck": 0,
-                        "enabled": 1,
-                        "skip_if_unavailable": True,
-                    }
-                },
-                reposdir=self.working_dir,
-            )
+        # Create Local Repo
+        create_repo_conf(
+            {
+                "photon-local": {
+                    "name": "VMWare Photon Linux (x86_64)",
+                    "baseurl": f"file://{self.rpms_path}",
+                    "gpgcheck": 0,
+                    "enabled": 1,
+                    "skip_if_unavailable": True,
+                }
+            },
+            reposdir=self.working_dir,
+        )
         self.install_initrd_packages()
 
         with open(