@@ -1,2 +1,2 @@

-OSTREEREPOURL=https://dl.bintray.com/vmware/photon/rpm-ostree/1.0

-OSTREEREFS=photon/1.0/x86_64/minimal

+OSTREEREPOURL=https://dl.bintray.com/vmware/photon/rpm-ostree/2.0

+OSTREEREFS=photon/2.0/x86_64/minimal

@@ -2,12 +2,6 @@

 \r \s \v

-An RPM-OSTree repo is created at '/srv/rpm-ostree/repo' directory with

-the default Refspec 'photon/1.0/x86_64/minimal'.

-This repo is exposed via web server for RPM-OSTree Host installations.

-Point your RPM-OSTree Host to 'http://<this server's address>' for pulling the repo.

-

-

-Experimental - do not use in production.

-

+Follow Photon RPM-OSTree guide to compose an OSTree repo.

+RPM-OSTree hosts will point to 'http://<this server's IP address>' to install and upgrade.

@@ -39,7 +39,6 @@ class OstreeServerInstaller(Installer):

         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))

         self.run("ln -s /etc/yum.repos.d/photon-extras.repo {}/srv/rpm-ostree/photon-extras-ostree.repo".format(self.photon_root))

-        self.run("ln -s /etc/yum.repos.d/lightwave.repo {}/srv/rpm-ostree/lightwave-ostree.repo".format(self.photon_root))

         self.run("cp ./ostree-httpd.conf {}/srv/rpm-ostree/".format(self.photon_root))

         # Use a custom httpd service file for ostree server

         self.run("mkdir {}/etc/systemd/system/httpd.service.d".format(self.photon_root))

@@ -3,9 +3,9 @@

     "osname": "photon",

-    "ref": "photon/1.0/x86_64/minimal",

+    "ref": "photon/2.0/x86_64/minimal",

-    "automatic_version_prefix": "1.0_minimal",

+    "automatic_version_prefix": "2.0_minimal",

     "repos": ["photon", "photon-updates"],

@@ -17,17 +17,30 @@

     "documentation": false,

-    "packages": ["glibc", "zlib", "binutils", "gmp", "mpfr", "libgcc", "libstdc++","libgomp",

-                "pkg-config", "ncurses", "bash", "bzip2", "cracklib", "cracklib-dicts", "shadow",

-                "procps-ng", "iana-etc", "readline", "coreutils", "bc", "libtool", "net-tools",

-                "findutils", "xz", "grub2", "iproute2", "util-linux", "linux",

-                "attr", "libcap", "kmod", "expat", "dbus", "file",

-                "sed", "grep", "cpio", "gzip",

-                "openssl", "ca-certificates", "curl",

-                "systemd",

-                "openssh", "iptables",

-                "photon-release",

+    "packages": [

+                "attr",

+                "bash", "bc", "binutils", "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",

+                "ncurses", "net-tools", "nss-altfiles",

+                "openssh", "openssl",

+                "photon-release", "pkg-config", "procps-ng",

+                "readline", "rpm-ostree",

+                "sed", "shadow", "systemd",

+                "util-linux",

                 "vim",

-                "docker", "bridge-utils",

-                "dracut", "dracut-tools", "rpm-ostree", "nss-altfiles", "which"]

+                "which",

+                "xz",

+                "zlib"

+    ]

+

+

 }

+