openstack/tripleo-heat-templates
Code Issues Proposed changes

Ensure the needed openshift resources are set

Browse Source 
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
(cherry picked from commit 633379f779)
This commit is contained in:
Martin André 2018-10-12 16:21:24 +02:00
parent 8c67f6039f
commit 1efec7e7cb
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
environments/openshift.yaml
View File

@ -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