Base, minimal and full (with manuals) configurations for ostree

Change-Id: I61e509ab9ff42693ce6c062b8a71ecdf0f51735e Reviewed-on: http://photon-jenkins.eng.vmware.com:8082/3711 Tested-by: gerrit-photon <[email protected]> Reviewed-by: Alexey Makhalov <[email protected]>
stuclem · Sep 8, 2017 · 610f4ec · 610f4ec
1 parent 5e5f358
commit 610f4ec
Show file tree

Hide file tree

Showing 5 changed files with 414 additions and 12 deletions.
diff --git a/installer/ostree-server-greeting.txt b/installer/ostree-server-greeting.txt
@@ -1,4 +1,4 @@
-[1;32mWelcome to Photon 1.0 RPM-OSTree Server[0m
+[1;32mWelcome to Photon 2.0 RPM-OSTree Server[0m
 
 \r \s \v
 

diff --git a/installer/ostreeserverinstaller.py b/installer/ostreeserverinstaller.py
@@ -35,6 +35,8 @@ def finalize_system(self):
 
         self.run("mkdir -p {}/srv/rpm-ostree/repo".format(self.photon_root))
         self.run("cp ./photon-base.json {}/srv/rpm-ostree/".format(self.photon_root))
+        self.run("cp ./photon-minimal.json {}/srv/rpm-ostree/".format(self.photon_root))
+        self.run("cp ./photon-full.json {}/srv/rpm-ostree/".format(self.photon_root))
         self.run("ln -s /etc/yum.repos.d/photon.repo {}/srv/rpm-ostree/photon-ostree.repo".format(self.photon_root))
         self.run("ln -s /etc/yum.repos.d/photon-iso.repo {}/srv/rpm-ostree/photon-iso-ostree.repo".format(self.photon_root))
         self.run("ln -s /etc/yum.repos.d/photon-updates.repo {}/srv/rpm-ostree/photon-updates-ostree.repo".format(self.photon_root))

diff --git a/installer/photon-base.json b/installer/photon-base.json
@@ -1,11 +1,11 @@
 {
-    "comment": "Photon Minimal OSTree",
+    "comment": "Photon Base OSTree",
 
     "osname": "photon",
 
-    "ref": "photon/2.0/x86_64/minimal",
+    "ref": "photon/2.0/x86_64/base",
 
-    "automatic_version_prefix": "2.0_minimal",
+    "automatic_version_prefix": "2.0_base",
 
     "repos": ["photon", "photon-updates"],
 
@@ -18,17 +18,15 @@
     "documentation": false,
 
     "packages": [
-                "attr",
-                "bash", "bc", "binutils", "bridge-utils", "bzip2",
+                "bash", "bc", "bridge-utils", "bzip2",
                 "ca-certificates", "coreutils", "cpio", "cracklib", "cracklib-dicts", "curl",
                 "dbus", "docker", "dracut", "dracut-tools",
                 "expat",
                 "file", "findutils",
                 "glibc", "gmp", "grep", "grub2", "gzip",
                 "iana-etc", "iproute2", "iptables",
                 "kmod",
-                "libcap", "libgcc", "libgomp", "libstdc++", "libtool", "linux",
-                "mpfr",
+                "libcap", "libgcc", "libstdc++", "libtool", "linux",
                 "ncurses", "net-tools", "nss-altfiles",
                 "openssh", "openssl",
                 "photon-release", "pkg-config", "procps-ng",
@@ -39,8 +37,5 @@
                 "which",
                 "xz",
                 "zlib"
-    ]
-
-
+		]
 }
-