Merge "flatten database service MySQL Client"

deployment/aodh/aodh-api-container-puppet.yaml

@@ -67,7 +67,7 @@ resources:
     type: ../../docker/services/containers-common.yaml
 
   MySQLClient:
-    type: ../../puppet/services/database/mysql-client.yaml
+    type: ../database/mysql-client.yaml
 
   AodhBase:
     type: ./aodh-base.yaml

deployment/aodh/aodh-evaluator-container-puppet.yaml

@@ -50,7 +50,7 @@ resources:
     type: ../../docker/services/containers-common.yaml
 
   MySQLClient:
-    type: ../../puppet/services/database/mysql-client.yaml
+    type: ../database/mysql-client.yaml
 
   AodhBase:
     type: ./aodh-base.yaml

deployment/aodh/aodh-listener-container-puppet.yaml

@@ -50,7 +50,7 @@ resources:
     type: ../../docker/services/containers-common.yaml
 
   MySQLClient:
-    type: ../../puppet/services/database/mysql-client.yaml
+    type: ../database/mysql-client.yaml
 
   AodhBase:
     type: ./aodh-base.yaml

deployment/aodh/aodh-notifier-container-puppet.yaml

@@ -50,7 +50,7 @@ resources:
     type: ../../docker/services/containers-common.yaml
 
   MySQLClient:
-    type: ../../puppet/services/database/mysql-client.yaml
+    type: ../database/mysql-client.yaml
 
   AodhBase:
     type: ./aodh-base.yaml

deployment/cinder/cinder-api-container-puppet.yaml

@@ -94,7 +94,7 @@ resources:
     type: ../../docker/services/containers-common.yaml
 
   MySQLClient:
-    type: ../../puppet/services/database/mysql-client.yaml
+    type: ../database/mysql-client.yaml
 
   CinderBase:
     type: ./cinder-base.yaml

deployment/cinder/cinder-backup-container-puppet.yaml

@@ -97,7 +97,7 @@ resources:
     type: ../../docker/services/containers-common.yaml
 
   MySQLClient:
-    type: ../../puppet/services/database/mysql-client.yaml
+    type: ../database/mysql-client.yaml
 
   CinderBase:
     type: ./cinder-base.yaml

deployment/cinder/cinder-backup-pacemaker-puppet.yaml

@@ -84,7 +84,7 @@ resources:
     type: ../../docker/services/containers-common.yaml
 
   MySQLClient:
-    type: ../../puppet/services/database/mysql-client.yaml
+    type: ../database/mysql-client.yaml
 
   CinderBackupBase:
     type: ./cinder-backup-container-puppet.yaml

deployment/cinder/cinder-scheduler-container-puppet.yaml

@@ -55,7 +55,7 @@ resources:
     type: ../../docker/services/containers-common.yaml
 
   MySQLClient:
-    type: ../../puppet/services/database/mysql-client.yaml
+    type: ../database/mysql-client.yaml
 
   CinderBase:
     type: ./cinder-base.yaml

deployment/cinder/cinder-volume-container-puppet.yaml

@@ -159,7 +159,7 @@ resources:
     type: ../../docker/services/containers-common.yaml
 
   MySQLClient:
-    type: ../../puppet/services/database/mysql-client.yaml
+    type: ../database/mysql-client.yaml
 
   CinderBase:
     type: ./cinder-base.yaml

deployment/cinder/cinder-volume-pacemaker-puppet.yaml

@@ -72,7 +72,7 @@ resources:
     type: ../../docker/services/containers-common.yaml
 
   MySQLClient:
-    type: ../../puppet/services/database/mysql-client.yaml
+    type: ../database/mysql-client.yaml
 
   CinderBase:
     type: ./cinder-volume-container-puppet.yaml

deployment/glance/glance-api-container-puppet.yaml

@@ -251,7 +251,7 @@ resources:
     type: ../../docker/services/containers-common.yaml
 
   MySQLClient:
-    type: ../../puppet/services/database/mysql-client.yaml
+    type: ../database/mysql-client.yaml
 
   GlanceLogging:
     type: OS::TripleO::Services::Logging::GlanceApi

deployment/heat/heat-engine-container-puppet.yaml

@@ -107,7 +107,7 @@ resources:
     type: ../../docker/services/containers-common.yaml
 
   MySQLClient:
-    type: ../../puppet/services/database/mysql-client.yaml
+    type: ../database/mysql-client.yaml
 
   HeatBase:
     type: ./heat-base-puppet.yaml

deployment/ironic/ironic-api-container-puppet.yaml

@@ -86,7 +86,7 @@ resources:
     type: ../../docker/services/containers-common.yaml
 
   MySQLClient:
-    type: ../../puppet/services/database/mysql-client.yaml
+    type: ../database/mysql-client.yaml
 
   IronicBase:
     type: ./ironic-base-puppet.yaml

deployment/ironic/ironic-conductor-container-puppet.yaml

@@ -249,7 +249,7 @@ resources:
     type: ../../docker/services/containers-common.yaml
 
   MySQLClient:
-    type: ../../puppet/services/database/mysql-client.yaml
+    type: ../database/mysql-client.yaml
 
   IronicBase:
     type: ./ironic-base-puppet.yaml

deployment/ironic/ironic-inspector-container-puppet.yaml

@@ -172,7 +172,7 @@ resources:
     type: ../../docker/services/containers-common.yaml
 
   MySQLClient:
-    type: ../../puppet/services/database/mysql-client.yaml
+    type: ../database/mysql-client.yaml
 
 outputs:
   role_data:

deployment/keystone/keystone-container-puppet.yaml

@@ -369,7 +369,7 @@ resources:
     type: ../../docker/services/containers-common.yaml
 
   MySQLClient:
-    type: ../../puppet/services/database/mysql-client.yaml
+    type: ../database/mysql-client.yaml
 
   ApacheServiceBase:
     type: ../../puppet/services/apache.yaml

deployment/mistral/mistral-api-container-puppet.yaml

@@ -75,7 +75,7 @@ resources:
     type: ../../docker/services/containers-common.yaml
 
   MySQLClient:
-    type: ../../puppet/services/database/mysql-client.yaml
+    type: ../database/mysql-client.yaml
 
   MistralBase:
     type: ./mistral-base.yaml

deployment/mistral/mistral-engine-container-puppet.yaml

@@ -72,7 +72,7 @@ resources:
     type: ../../docker/services/containers-common.yaml
 
   MySQLClient:
-    type: ../../puppet/services/database/mysql-client.yaml
+    type: ../database/mysql-client.yaml
 
   MistralBase:
     type: ./mistral-base.yaml

deployment/mistral/mistral-event-engine-container-puppet.yaml

@@ -51,7 +51,7 @@ resources:
     type: ../../docker/services/containers-common.yaml
 
   MySQLClient:
-    type: ../../puppet/services/database/mysql-client.yaml
+    type: ../database/mysql-client.yaml
 
   MistralBase:
     type: ./mistral-base.yaml

deployment/mistral/mistral-executor-container-puppet.yaml

@@ -81,7 +81,7 @@ resources:
     type: ../../docker/services/containers-common.yaml
 
   MySQLClient:
-    type: ../../puppet/services/database/mysql-client.yaml
+    type: ../database/mysql-client.yaml
 
   MistralBase:
     type: ./mistral-base.yaml

deployment/sahara/sahara-api-container-puppet.yaml

@@ -73,7 +73,7 @@ resources:
     type: ../../docker/services/containers-common.yaml
 
   MySQLClient:
-    type: ../../puppet/services/database/mysql-client.yaml
+    type: ../database/mysql-client.yaml
 
   SaharaPuppetBase:
     type: ./sahara-base.yaml

deployment/sahara/sahara-engine-container-puppet.yaml

@@ -55,7 +55,7 @@ resources:
       type: ../../docker/services/containers-common.yaml
 
   MySQLClient:
-    type: ../../puppet/services/database/mysql-client.yaml
+    type: ../database/mysql-client.yaml
 
   SaharaBase:
     type: ./sahara-base.yaml

deployment/zaqar/zaqar-container-puppet.yaml

@@ -107,7 +107,7 @@ resources:
     type: ../../docker/services/containers-common.yaml
 
   MySQLClient:
-    type: ../../puppet/services/database/mysql-client.yaml
+    type: ../database/mysql-client.yaml
 
 outputs:
   role_data:

docker/services/barbican-api.yaml

@@ -130,7 +130,7 @@ resources:
     type: ./containers-common.yaml
 
   MySQLClient:
-    type: ../../puppet/services/database/mysql-client.yaml
+    type: ../../deployment/database/mysql-client.yaml
 
   BarbicanApiBase:
     type: ../../puppet/services/barbican-api.yaml

docker/services/congress.yaml

@@ -47,7 +47,7 @@ resources:
     type: ./containers-common.yaml
 
   MySQLClient:
-    type: ../../puppet/services/database/mysql-client.yaml
+    type: ../../deployment/database/mysql-client.yaml
 
   CongressBase:
     type: ../../puppet/services/congress.yaml

docker/services/designate-central.yaml

@@ -44,7 +44,7 @@ resources:
     type: ./containers-common.yaml
 
   MySQLClient:
-    type: ../../puppet/services/database/mysql-client.yaml
+    type: ../../deployment/database/mysql-client.yaml
 
   DesignateBase:
     type: ../../puppet/services/designate-base.yaml

docker/services/designate-mdns.yaml

@@ -44,7 +44,7 @@ resources:
     type: ./containers-common.yaml
 
   MySQLClient:
-    type: ../../puppet/services/database/mysql-client.yaml
+    type: ../../deployment/database/mysql-client.yaml
 
   DesignateBase:
     type: ../../puppet/services/designate-base.yaml

docker/services/ec2-api.yaml

@@ -55,7 +55,7 @@ resources:
     type: ./containers-common.yaml
 
   MySQLClient:
-    type: ../../puppet/services/database/mysql-client.yaml
+    type: ../../deployment/database/mysql-client.yaml
 
   Ec2ApiPuppetBase:
       type: ../../puppet/services/ec2-api.yaml

docker/services/gnocchi-metricd.yaml

@@ -60,7 +60,7 @@ resources:
     type: ./containers-common.yaml
 
   MySQLClient:
-    type: ../../puppet/services/database/mysql-client.yaml
+    type: ../../deployment/database/mysql-client.yaml
 
   GnocchiMetricdBase:
     type: ../../puppet/services/gnocchi-metricd.yaml

docker/services/gnocchi-statsd.yaml

@@ -60,7 +60,7 @@ resources:
     type: ./containers-common.yaml
 
   MySQLClient:
-    type: ../../puppet/services/database/mysql-client.yaml
+    type: ../../deployment/database/mysql-client.yaml
 
   GnocchiStatsdBase:
     type: ../../puppet/services/gnocchi-statsd.yaml

docker/services/manila-api.yaml

@@ -43,7 +43,7 @@ resources:
     type: ./containers-common.yaml
 
   MySQLClient:
-    type: ../../puppet/services/database/mysql-client.yaml
+    type: ../../deployment/database/mysql-client.yaml
 
   ManilaApiPuppetBase:
     type: ../../puppet/services/manila-api.yaml

docker/services/manila-scheduler.yaml

@@ -43,7 +43,7 @@ resources:
     type: ./containers-common.yaml
 
   MySQLClient:
-    type: ../../puppet/services/database/mysql-client.yaml
+    type: ../../deployment/database/mysql-client.yaml
 
   ManilaSchedulerPuppetBase:
     type: ../../puppet/services/manila-scheduler.yaml

docker/services/manila-share.yaml

@@ -55,7 +55,7 @@ resources:
     type: ./containers-common.yaml
 
   MySQLClient:
-    type: ../../puppet/services/database/mysql-client.yaml
+    type: ../../deployment/database/mysql-client.yaml
 
   ManilaBase:
     type: ../../puppet/services/manila-share.yaml

docker/services/neutron-api.yaml

@@ -67,7 +67,7 @@ resources:
     type: ./containers-common.yaml
 
   MySQLClient:
-    type: ../../puppet/services/database/mysql-client.yaml
+    type: ../../deployment/database/mysql-client.yaml
 
   NeutronBase:
     type: ../../puppet/services/neutron-api.yaml

docker/services/nova-api.yaml

@@ -82,7 +82,7 @@ resources:
     type: ./containers-common.yaml
 
   MySQLClient:
-    type: ../../puppet/services/database/mysql-client.yaml
+    type: ../../deployment/database/mysql-client.yaml
 
   NovaApiBase:
     type: ../../puppet/services/nova-api.yaml

docker/services/nova-compute.yaml

@@ -83,7 +83,7 @@ resources:
     type: ./containers-common.yaml
 
   MySQLClient:
-    type: ../../puppet/services/database/mysql-client.yaml
+    type: ../../deployment/database/mysql-client.yaml
 
   NovaComputeCommon:
     type: ./nova-compute-common.yaml

docker/services/nova-conductor.yaml

@@ -53,7 +53,7 @@ resources:
     type: ./containers-common.yaml
 
   MySQLClient:
-    type: ../../puppet/services/database/mysql-client.yaml
+    type: ../../deployment/database/mysql-client.yaml
 
   NovaConductorBase:
     type: ../../puppet/services/nova-conductor.yaml

docker/services/nova-consoleauth.yaml

@@ -52,7 +52,7 @@ resources:
     type: ./containers-common.yaml
 
   MySQLClient:
-    type: ../../puppet/services/database/mysql-client.yaml
+    type: ../../deployment/database/mysql-client.yaml
 
   NovaConsoleauthPuppetBase:
     type: ../../puppet/services/nova-consoleauth.yaml

docker/services/nova-ironic.yaml

@@ -47,7 +47,7 @@ resources:
     type: ./containers-common.yaml
 
   MySQLClient:
-    type: ../../puppet/services/database/mysql-client.yaml
+    type: ../../deployment/database/mysql-client.yaml
 
   NovaComputeCommon:
     type: ./nova-compute-common.yaml

docker/services/nova-libvirt.yaml

@@ -211,7 +211,7 @@ resources:
     type: ./containers-common.yaml
 
   MySQLClient:
-    type: ../../puppet/services/database/mysql-client.yaml
+    type: ../../deployment/database/mysql-client.yaml
 
   NovaLibvirtBase:
     type: ../../puppet/services/nova-libvirt.yaml

docker/services/nova-metadata.yaml

@@ -59,7 +59,7 @@ resources:
     type: ./containers-common.yaml
 
   MySQLClient:
-    type: ../../puppet/services/database/mysql-client.yaml
+    type: ../../deployment/database/mysql-client.yaml
 
   NovaMetadataBase:
     type: ../../puppet/services/nova-metadata.yaml

docker/services/nova-placement.yaml

@@ -59,7 +59,7 @@ resources:
     type: ./containers-common.yaml
 
   MySQLClient:
-    type: ../../puppet/services/database/mysql-client.yaml
+    type: ../../deployment/database/mysql-client.yaml
 
   NovaPlacementBase:
     type: ../../puppet/services/nova-placement.yaml

docker/services/nova-scheduler.yaml

@@ -52,7 +52,7 @@ resources:
     type: ./containers-common.yaml
 
   MySQLClient:
-    type: ../../puppet/services/database/mysql-client.yaml
+    type: ../../deployment/database/mysql-client.yaml
 
   NovaSchedulerBase:
     type: ../../puppet/services/nova-scheduler.yaml

docker/services/nova-vnc-proxy.yaml

@@ -92,7 +92,7 @@ resources:
     type: ./containers-common.yaml
 
   MySQLClient:
-    type: ../../puppet/services/database/mysql-client.yaml
+    type: ../../deployment/database/mysql-client.yaml
 
   NovaVncProxyPuppetBase:
     type: ../../puppet/services/nova-vnc-proxy.yaml

docker/services/octavia-api.yaml

@@ -56,7 +56,7 @@ resources:
     type: ./containers-common.yaml
 
   MySQLClient:
-    type: ../../puppet/services/database/mysql-client.yaml
+    type: ../../deployment/database/mysql-client.yaml
 
   OctaviaApiPuppetBase:
     type: ../../puppet/services/octavia-api.yaml

docker/services/octavia-health-manager.yaml

@@ -52,7 +52,7 @@ resources:
     type: ./containers-common.yaml
 
   MySQLClient:
-    type: ../../puppet/services/database/mysql-client.yaml
+    type: ../../deployment/database/mysql-client.yaml
 
   OctaviaHealthManagerPuppetBase:
     type: ../../puppet/services/octavia-health-manager.yaml

docker/services/octavia-housekeeping.yaml

@@ -48,7 +48,7 @@ resources:
     type: ./containers-common.yaml
 
   MySQLClient:
-    type: ../../puppet/services/database/mysql-client.yaml
+    type: ../../deployment/database/mysql-client.yaml
 
   OctaviaHousekeepingPuppetBase:
     type: ../../puppet/services/octavia-housekeeping.yaml

docker/services/octavia-worker.yaml

@@ -52,7 +52,7 @@ resources:
     type: ./containers-common.yaml
 
   MySQLClient:
-    type: ../../puppet/services/database/mysql-client.yaml
+    type: ../../deployment/database/mysql-client.yaml
 
   OctaviaWorkerPuppetBase:
     type: ../../puppet/services/octavia-worker.yaml

docker/services/pacemaker/manila-share.yaml

@@ -67,7 +67,7 @@ resources:
     type: ../containers-common.yaml
 
   MySQLClient:
-    type: ../../../puppet/services/database/mysql-client.yaml
+    type: ../../../deployment/database/mysql-client.yaml
 
   ManilaBase:
     type: ../../../puppet/services/pacemaker/manila-share.yaml

docker/services/panko-api.yaml

@@ -52,7 +52,7 @@ resources:
     type: ./containers-common.yaml
 
   MySQLClient:
-    type: ../../puppet/services/database/mysql-client.yaml
+    type: ../../deployment/database/mysql-client.yaml
 
   PankoApiPuppetBase:
     type: ../../puppet/services/panko-api.yaml

docker/services/tacker.yaml

@@ -43,7 +43,7 @@ resources:
     type: ./containers-common.yaml
 
   MySQLClient:
-    type: ../../puppet/services/database/mysql-client.yaml
+    type: ../../deployment/database/mysql-client.yaml
 
   TackerBase:
     type: ../../puppet/services/tacker.yaml

overcloud-resource-registry-puppet.j2.yaml

@@ -306,7 +306,7 @@ resource_registry:
   OS::TripleO::Services::OctaviaWorker: OS::Heat::None
   OS::TripleO::Services::OctaviaDeploymentConfig: OS::Heat::None
   OS::TripleO::Services::LiquidioCompute:  OS::Heat::None
-  OS::TripleO::Services::MySQLClient: puppet/services/database/mysql-client.yaml
+  OS::TripleO::Services::MySQLClient: deployment/database/mysql-client.yaml
   OS::TripleO::Services::Vpp: OS::Heat::None
   OS::TripleO::Services::NeutronVppAgent: OS::Heat::None
   OS::TripleO::Services::Podman: OS::Heat::None