From 633379f77900995a71bdd7e85d73f975cd74c222 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Martin=20Andr=C3=A9?= Date: Fri, 12 Oct 2018 16:21:24 +0200 Subject: [PATCH] Ensure the needed openshift resources are set We expect the the Keepalived and HAproxy services to be deployed on the OpenShift master nodes, let's require them in the openshift heat environment file. This prevents an issue when the docker-ha environment is loaded because it would redefine these resources. Change-Id: I57a7ea854bd8db4e20af1a608a6937604c0e3bd2 --- environments/openshift.yaml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/environments/openshift.yaml b/environments/openshift.yaml index d92dc9747e..7942ea8df7 100644 --- a/environments/openshift.yaml +++ b/environments/openshift.yaml @@ -1,5 +1,7 @@ resource_registry: OS::TripleO::Services::Docker: ../puppet/services/docker.yaml - OS::TripleO::Services::OpenShift::Worker: ../extraconfig/services/openshift-worker.yaml - OS::TripleO::Services::OpenShift::Master: ../extraconfig/services/openshift-master.yaml + OS::TripleO::Services::HAproxy: ../docker/services/haproxy.yaml + OS::TripleO::Services::Keepalived: ../docker/services/keepalived.yaml OS::TripleO::Services::OpenShift::Infra: ../extraconfig/services/openshift-infra.yaml + OS::TripleO::Services::OpenShift::Master: ../extraconfig/services/openshift-master.yaml + OS::TripleO::Services::OpenShift::Worker: ../extraconfig/services/openshift-worker.yaml