diff options
author | Jenkins <jenkins@review.openstack.org> | 2016-08-17 11:08:15 +0000 |
---|---|---|
committer | Gerrit Code Review <review@openstack.org> | 2016-08-17 11:08:15 +0000 |
commit | 0b2829480a299dcba6d5471a99ed76fb92ca31a6 (patch) | |
tree | 79b5c86adf57aca8025bcc325f7c4d070b5a1718 /overcloud-resource-registry-puppet.yaml | |
parent | 5c609f7c78bee71985120cd15ffbe2d6f2d548a4 (diff) | |
parent | 71dc47ef66c433cb90912cf96a4e8df7e3b04117 (diff) |
Merge "Update Ironic composable services"
Diffstat (limited to 'overcloud-resource-registry-puppet.yaml')
-rw-r--r-- | overcloud-resource-registry-puppet.yaml | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/overcloud-resource-registry-puppet.yaml b/overcloud-resource-registry-puppet.yaml index b8332ac1..14db6494 100644 --- a/overcloud-resource-registry-puppet.yaml +++ b/overcloud-resource-registry-puppet.yaml @@ -145,8 +145,6 @@ resource_registry: OS::TripleO::Services::HeatApiCfn: puppet/services/heat-api-cfn.yaml OS::TripleO::Services::HeatApiCloudwatch: puppet/services/heat-api-cloudwatch.yaml OS::TripleO::Services::HeatEngine: puppet/services/heat-engine.yaml - OS::TripleO::Services::IronicApi: puppet/services/ironic-api.yaml - OS::TripleO::Services::IronicConductor: puppet/services/ironic-conductor.yaml OS::TripleO::Services::Kernel: puppet/services/kernel.yaml OS::TripleO::Services::MySQL: puppet/services/database/mysql.yaml OS::TripleO::Services::NeutronDhcpAgent: puppet/services/neutron-dhcp.yaml @@ -210,6 +208,9 @@ resource_registry: OS::TripleO::Services::MistralEngine: OS::Heat::None OS::TripleO::Services::MistralApi: OS::Heat::None OS::TripleO::Services::MistralExecutor: OS::Heat::None + OS::TripleO::Services::IronicApi: OS::Heat::None + OS::TripleO::Services::IronicConductor: OS::Heat::None + OS::TripleO::Services::NovaIronic: OS::Heat::None parameter_defaults: EnablePackageInstall: false |