flatten tripleo-packages service configuration

This change combines the previous puppet and docker files into a single
file that performs the docker service installation and configuration.

Depends-On: https://review.rdoproject.org/r/#/c/16994/
Change-Id: If051277041d23641c92a1f370f08a521a4bb7a12
Related-Blueprint: services-yaml-flattening
This commit is contained in:
David J Peacock 2018-12-14 13:19:11 -05:00
parent 7e1a0a9014
commit 89faf9c029
3 changed files with 2 additions and 2 deletions

View File

@ -277,8 +277,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

View File

@ -31,7 +31,7 @@ environments:
puppet/services/time/ntp.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