Disable heat by default in favor of ephemeral-heat.
Now that the default way to deploy heat is using the ephemeral-heat service, we are not required to pass a specific environment file to ensure the service gets disabled for the Undercloud. This patch moves the content from disable-heat.yaml environment file into the services default's for the undercloud with the intention of stopping passing it by default when enable_heat is not passed. Change-Id: I1419c1bb901b3fb7ca038c941c230691aff2ebbd
This commit is contained in:
parent
95a7264b7c
commit
ec33ab4048
@ -36,7 +36,12 @@ resource_registry:
|
||||
OS::TripleO::Services::CinderApi: OS::Heat::None
|
||||
OS::TripleO::Services::CinderScheduler: OS::Heat::None
|
||||
OS::TripleO::Services::CinderVolume: OS::Heat::None
|
||||
# Disable traditional heat services now that ephemeral heat
|
||||
# is deployed by default
|
||||
OS::TripleO::Services::HeatApi: OS::Heat::None
|
||||
OS::TripleO::Services::HeatApiCfn: OS::Heat::None
|
||||
OS::TripleO::Services::HeatApiCloudwatch: OS::Heat::None
|
||||
OS::TripleO::Services::HeatEngine: OS::Heat::None
|
||||
OS::TripleO::Services::NovaApi: OS::Heat::None
|
||||
OS::TripleO::Services::NovaConductor: OS::Heat::None
|
||||
OS::TripleO::Services::NovaIronic: OS::Heat::None
|
||||
|
Loading…
x
Reference in New Issue
Block a user