diff options
author | Jenkins <jenkins@review.openstack.org> | 2017-10-10 14:28:29 +0000 |
---|---|---|
committer | Gerrit Code Review <review@openstack.org> | 2017-10-10 14:28:29 +0000 |
commit | 94e8238d6b61811d705b653ffb36d1aea624d015 (patch) | |
tree | 78f403e55355f7a3a2084d3a4ddc5bba069b5276 /overcloud-resource-registry-puppet.j2.yaml | |
parent | af040d1e9418e6f266cfe8e2d1111ac80aaa7b94 (diff) | |
parent | 791fbe5ab30e56fed06a6ccd8969717b34d3ec01 (diff) |
Merge "Add IronicPxe to the default controller" into stable/pike
Diffstat (limited to 'overcloud-resource-registry-puppet.j2.yaml')
-rw-r--r-- | overcloud-resource-registry-puppet.j2.yaml | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/overcloud-resource-registry-puppet.j2.yaml b/overcloud-resource-registry-puppet.j2.yaml index c8bdf9e4..e402f125 100644 --- a/overcloud-resource-registry-puppet.j2.yaml +++ b/overcloud-resource-registry-puppet.j2.yaml @@ -258,6 +258,7 @@ resource_registry: OS::TripleO::Services::IronicApi: OS::Heat::None OS::TripleO::Services::IronicConductor: OS::Heat::None OS::TripleO::Services::IronicInspector: OS::Heat::None + OS::TripleO::Services::IronicPxe: OS::Heat::None OS::TripleO::Services::NovaIronic: OS::Heat::None OS::TripleO::Services::TripleoPackages: puppet/services/tripleo-packages.yaml OS::TripleO::Services::TripleoFirewall: puppet/services/tripleo-firewall.yaml |