From 82483cc77a3a897208fd2d3114bff4db22b7d66c Mon Sep 17 00:00:00 2001 From: Takashi Kajinami Date: Sun, 23 Feb 2020 23:05:56 +0900 Subject: [PATCH] Remove OpenShift resources completely. Change-Id: I6b379d471db7a681bcc487ec97b262329dce7b37 --- ci/environments/scenario000-standalone.yaml | 4 ---- environments/undercloud/undercloud-minion.yaml | 4 ---- overcloud-resource-registry-puppet.j2.yaml | 4 ---- sample-env-generator/undercloud-minion.yaml | 4 ---- 4 files changed, 16 deletions(-) diff --git a/ci/environments/scenario000-standalone.yaml b/ci/environments/scenario000-standalone.yaml index 40abd0d145..636f318c29 100644 --- a/ci/environments/scenario000-standalone.yaml +++ b/ci/environments/scenario000-standalone.yaml @@ -169,10 +169,6 @@ resource_registry: OS::TripleO::Services::OctaviaHealthManager: OS::Heat::None OS::TripleO::Services::OctaviaHousekeeping: OS::Heat::None OS::TripleO::Services::OctaviaWorker: OS::Heat::None - OS::TripleO::Services::OpenShift::GlusterFS: OS::Heat::None - OS::TripleO::Services::OpenShift::Infra: OS::Heat::None - OS::TripleO::Services::OpenShift::Master: OS::Heat::None - OS::TripleO::Services::OpenShift::Worker: OS::Heat::None # OS::TripleO::Services::OsloMessagingNotify: OS::Heat::None # OS::TripleO::Services::OsloMessagingRpc: OS::Heat::None OS::TripleO::Services::Pacemaker: OS::Heat::None diff --git a/environments/undercloud/undercloud-minion.yaml b/environments/undercloud/undercloud-minion.yaml index 3b38d4424b..6ca2c1aea1 100644 --- a/environments/undercloud/undercloud-minion.yaml +++ b/environments/undercloud/undercloud-minion.yaml @@ -194,10 +194,6 @@ resource_registry: OS::TripleO::Services::OctaviaHealthManager: OS::Heat::None OS::TripleO::Services::OctaviaHousekeeping: OS::Heat::None OS::TripleO::Services::OctaviaWorker: OS::Heat::None - OS::TripleO::Services::OpenShift::GlusterFS: OS::Heat::None - OS::TripleO::Services::OpenShift::Infra: OS::Heat::None - OS::TripleO::Services::OpenShift::Master: OS::Heat::None - OS::TripleO::Services::OpenShift::Worker: OS::Heat::None OS::TripleO::Services::OsloMessagingNotify: OS::Heat::None OS::TripleO::Services::OsloMessagingRpc: OS::Heat::None OS::TripleO::Services::Pacemaker: OS::Heat::None diff --git a/overcloud-resource-registry-puppet.j2.yaml b/overcloud-resource-registry-puppet.j2.yaml index 906f4a78d2..a64f853c08 100644 --- a/overcloud-resource-registry-puppet.j2.yaml +++ b/overcloud-resource-registry-puppet.j2.yaml @@ -202,10 +202,6 @@ resource_registry: OS::TripleO::Services::Novajoin: OS::Heat::None OS::TripleO::Services::NovaAZConfig: OS::Heat::None OS::TripleO::Services::ContainersLogrotateCrond: deployment/logrotate/logrotate-crond-container-puppet.yaml - OS::TripleO::Services::OpenShift::Master: OS::Heat::None - OS::TripleO::Services::OpenShift::Worker: OS::Heat::None - OS::TripleO::Services::OpenShift::Infra: OS::Heat::None - OS::TripleO::Services::OpenShift::GlusterFS: OS::Heat::None OS::TripleO::Services::SwiftProxy: deployment/swift/swift-proxy-container-puppet.yaml OS::TripleO::Services::SwiftDispersion: OS::Heat::None OS::TripleO::Services::ExternalSwiftProxy: OS::Heat::None diff --git a/sample-env-generator/undercloud-minion.yaml b/sample-env-generator/undercloud-minion.yaml index d7b39ef96a..6c5aca4364 100644 --- a/sample-env-generator/undercloud-minion.yaml +++ b/sample-env-generator/undercloud-minion.yaml @@ -214,10 +214,6 @@ environments: OS::TripleO::Services::OctaviaHealthManager: OS::Heat::None OS::TripleO::Services::OctaviaHousekeeping: OS::Heat::None OS::TripleO::Services::OctaviaWorker: OS::Heat::None - OS::TripleO::Services::OpenShift::GlusterFS: OS::Heat::None - OS::TripleO::Services::OpenShift::Infra: OS::Heat::None - OS::TripleO::Services::OpenShift::Master: OS::Heat::None - OS::TripleO::Services::OpenShift::Worker: OS::Heat::None OS::TripleO::Services::OsloMessagingNotify: OS::Heat::None OS::TripleO::Services::OsloMessagingRpc: OS::Heat::None OS::TripleO::Services::OVNController: OS::Heat::None