From a1ca417997aef600a82f6c17dbb7277a2718d642 Mon Sep 17 00:00:00 2001 From: Micah Abbott Date: Thu, 27 Sep 2018 15:50:59 -0400 Subject: [PATCH] host*: use signed atomic-openshift packages This replaces the `origin-*` packages with signed `atomic-openshift-*` versions of the packages. Notably: - atomic-openshift-clients - atomic-openshift-hyperkube - atomic-openshift-node --- host-base.yaml | 2 +- host-maipo.yaml | 6 ++---- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/host-base.yaml b/host-base.yaml index ccd2de53..e4e7e76c 100644 --- a/host-base.yaml +++ b/host-base.yaml @@ -167,7 +167,7 @@ packages: # Editors - vim-minimal nano # OpenShift - - origin-node origin-hyperkube origin-clients + - atomic-openshift-node atomic-openshift-hyperkube atomic-openshift-clients # pivot/ota tools - pivot # Red Hat CA certs diff --git a/host-maipo.yaml b/host-maipo.yaml index 7adffc8c..55b0af20 100644 --- a/host-maipo.yaml +++ b/host-maipo.yaml @@ -12,8 +12,8 @@ repos: - rhcos-continuous # We currently track ostree/rpm-ostree git master upstream - atomic-centos-continuous - # Generated via Origin PR jobs - - openshift + # Generated by ART team + - atomic-openshift # Maintained by containers runtime team - cri-o-tested # COPRs @@ -38,8 +38,6 @@ packages: - container-storage-setup cloud-utils-growpart # Remote storage (maipo only) - ceph-common glusterfs-fuse - # OpenShift - - origin-node origin-hyperkube origin-clients remove-from-packages: # https://github.com/openshift/os/issues/275