From 3f5503e24f0aab824373830d749464dec6cc7c8b Mon Sep 17 00:00:00 2001 From: Colin Walters Date: Wed, 26 Sep 2018 14:05:59 -0400 Subject: [PATCH] manifest: Drop duplicates from host-base now that rpm-ostree updated Since we've updated to `rpm-ostree-2018.8` in the `coreos-assembler:alpha` container, we can drop duplicates from host-base.yaml. --- host-maipo.yaml | 5 ----- host-ootpa.yaml | 5 ----- 2 files changed, 10 deletions(-) diff --git a/host-maipo.yaml b/host-maipo.yaml index 2ee651a9..bdd2c995 100644 --- 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 index e09e0750..7a9fa62b 100644 --- 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