Merge pull request #317 from cgwalters/drop-rpmostree-workaround

manifest: Drop duplicates from host-base now that rpm-ostree updated
openshift · Sep 26, 2018 · f404084 · f404084
2 parents 685ca4d + 3f5503e
commit f404084
Show file tree

Hide file tree

Showing 2 changed files with 0 additions and 10 deletions.
diff --git a/host-maipo.yaml b/host-maipo.yaml
@@ -1,10 +1,5 @@
 ref: "openshift/3.10/x86_64/os"
 include: host-base.yaml
-# https://github.com/projectatomic/rpm-ostree/issues/1524
-boot_location: new
-machineid-compat: false
-tmp-is-dir: true
-# end duplicates from host-base.yaml
 repos:
   # Base maipo repos
   - maipo-server

diff --git a/host-ootpa.yaml b/host-ootpa.yaml
@@ -1,10 +1,5 @@
 ref: "openshift/4/x86_64/os-ootpa"
 include: host-base.yaml
-# https://github.com/projectatomic/rpm-ostree/issues/1524
-boot_location: new
-machineid-compat: false
-tmp-is-dir: true
-# end duplicates from host-base.yaml
 repos:
   - rhcos-continuous
   - openshift