openstack/tripleo-heat-templates
Code Issues Proposed changes

Merge "flatten tripleo-packages service configuration"

Browse Source
This commit is contained in:
Zuul 2019-01-12 19:03:19 +00:00 committed by Gerrit Code Review
commit 512f59a8cf
3 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

0
puppet/services/tripleo-packages.yaml → deployment/tripleo-packages/tripleo-packages-baremetal-puppet.yaml
View File

2
overcloud-resource-registry-puppet.j2.yaml
View File

@ -276,8 +276,8 @@ resource_registry:
OS::TripleO::Services::IronicPxe: OS::Heat::None
OS::TripleO::Services::IronicNeutronAgent: OS::Heat::None
OS::TripleO::Services::NovaIronic: OS::Heat::None
OS::TripleO::Services::TripleoPackages: puppet/services/tripleo-packages.yaml
OS::TripleO::Services::TripleoFirewall: deployment/tripleo-firewall/tripleo-firewall-baremetal-puppet.yaml
OS::TripleO::Services::TripleoPackages: deployment/tripleo-packages/tripleo-packages-baremetal-puppet.yaml
OS::TripleO::Services::OpenStackClients: OS::Heat::None
OS::TripleO::Services::OpenDaylightApi: OS::Heat::None
OS::TripleO::Services::OpenDaylightOvs: OS::Heat::None

2
sample-env-generator/standalone.yaml
View File

@ -31,7 +31,7 @@ environments:
deployment/time/ntp-baremetal-puppet.yaml:
parameters:
- NtpServer
puppet/services/tripleo-packages.yaml:
deployment/tripleo-packages/tripleo-packages-baremetal-puppet.yaml:
parameters:
- EnablePackageInstall
# TODO(aschultz): hack to pull in this config transport, not sure it is