Merge "flatten tripleo-packages service configuration"

overcloud-resource-registry-puppet.j2.yaml

@@ -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

sample-env-generator/standalone.yaml

@@ -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