From 1d3fe8cb277980240dcb85524ff330d36454a349 Mon Sep 17 00:00:00 2001 From: David J Peacock Date: Wed, 30 Jan 2019 09:38:32 -0500 Subject: [PATCH] flatten database service MySQL Client This change combines the previous puppet and docker files into a single file that performs the docker service installation and configuration. With this patch the baremetal version of database service MySQL Client has been removed. Change-Id: I855524f30cfe3c8cdab6c52a67fba0dee157103d Related-Blueprint: services-yaml-flattening --- deployment/aodh/aodh-api-container-puppet.yaml | 2 +- deployment/aodh/aodh-evaluator-container-puppet.yaml | 2 +- deployment/aodh/aodh-listener-container-puppet.yaml | 2 +- deployment/aodh/aodh-notifier-container-puppet.yaml | 2 +- deployment/cinder/cinder-api-container-puppet.yaml | 2 +- deployment/cinder/cinder-backup-container-puppet.yaml | 2 +- deployment/cinder/cinder-backup-pacemaker-puppet.yaml | 2 +- deployment/cinder/cinder-scheduler-container-puppet.yaml | 2 +- deployment/cinder/cinder-volume-container-puppet.yaml | 2 +- deployment/cinder/cinder-volume-pacemaker-puppet.yaml | 2 +- {puppet/services => deployment}/database/mysql-client.yaml | 0 deployment/glance/glance-api-container-puppet.yaml | 2 +- deployment/heat/heat-engine-container-puppet.yaml | 2 +- deployment/ironic/ironic-api-container-puppet.yaml | 2 +- deployment/ironic/ironic-conductor-container-puppet.yaml | 2 +- deployment/ironic/ironic-inspector-container-puppet.yaml | 2 +- deployment/keystone/keystone-container-puppet.yaml | 2 +- deployment/mistral/mistral-api-container-puppet.yaml | 2 +- deployment/mistral/mistral-engine-container-puppet.yaml | 2 +- deployment/mistral/mistral-event-engine-container-puppet.yaml | 2 +- deployment/mistral/mistral-executor-container-puppet.yaml | 2 +- deployment/sahara/sahara-api-container-puppet.yaml | 2 +- deployment/sahara/sahara-engine-container-puppet.yaml | 2 +- deployment/zaqar/zaqar-container-puppet.yaml | 2 +- docker/services/barbican-api.yaml | 2 +- docker/services/congress.yaml | 2 +- docker/services/designate-central.yaml | 2 +- docker/services/designate-mdns.yaml | 2 +- docker/services/ec2-api.yaml | 2 +- docker/services/gnocchi-metricd.yaml | 2 +- docker/services/gnocchi-statsd.yaml | 2 +- docker/services/manila-api.yaml | 2 +- docker/services/manila-scheduler.yaml | 2 +- docker/services/manila-share.yaml | 2 +- docker/services/neutron-api.yaml | 2 +- docker/services/nova-api.yaml | 2 +- docker/services/nova-compute.yaml | 2 +- docker/services/nova-conductor.yaml | 2 +- docker/services/nova-consoleauth.yaml | 2 +- docker/services/nova-ironic.yaml | 2 +- docker/services/nova-libvirt.yaml | 2 +- docker/services/nova-metadata.yaml | 2 +- docker/services/nova-placement.yaml | 2 +- docker/services/nova-scheduler.yaml | 2 +- docker/services/nova-vnc-proxy.yaml | 2 +- docker/services/octavia-api.yaml | 2 +- docker/services/octavia-health-manager.yaml | 2 +- docker/services/octavia-housekeeping.yaml | 2 +- docker/services/octavia-worker.yaml | 2 +- docker/services/pacemaker/manila-share.yaml | 2 +- docker/services/panko-api.yaml | 2 +- docker/services/tacker.yaml | 2 +- overcloud-resource-registry-puppet.j2.yaml | 2 +- 53 files changed, 52 insertions(+), 52 deletions(-) rename {puppet/services => deployment}/database/mysql-client.yaml (100%) diff --git a/deployment/aodh/aodh-api-container-puppet.yaml b/deployment/aodh/aodh-api-container-puppet.yaml index 941a933bb2..3755cc9112 100644 --- a/deployment/aodh/aodh-api-container-puppet.yaml +++ b/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 diff --git a/deployment/aodh/aodh-evaluator-container-puppet.yaml b/deployment/aodh/aodh-evaluator-container-puppet.yaml index 0e8a977c77..7f3b14ee33 100644 --- a/deployment/aodh/aodh-evaluator-container-puppet.yaml +++ b/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 diff --git a/deployment/aodh/aodh-listener-container-puppet.yaml b/deployment/aodh/aodh-listener-container-puppet.yaml index 8554b93493..88edb3c2dc 100644 --- a/deployment/aodh/aodh-listener-container-puppet.yaml +++ b/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 diff --git a/deployment/aodh/aodh-notifier-container-puppet.yaml b/deployment/aodh/aodh-notifier-container-puppet.yaml index 66145edaae..2e92b323fc 100644 --- a/deployment/aodh/aodh-notifier-container-puppet.yaml +++ b/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 diff --git a/deployment/cinder/cinder-api-container-puppet.yaml b/deployment/cinder/cinder-api-container-puppet.yaml index d58743307b..3344ff4fbd 100644 --- a/deployment/cinder/cinder-api-container-puppet.yaml +++ b/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 diff --git a/deployment/cinder/cinder-backup-container-puppet.yaml b/deployment/cinder/cinder-backup-container-puppet.yaml index f55502da0e..8876f0e39f 100644 --- a/deployment/cinder/cinder-backup-container-puppet.yaml +++ b/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 diff --git a/deployment/cinder/cinder-backup-pacemaker-puppet.yaml b/deployment/cinder/cinder-backup-pacemaker-puppet.yaml index 7fce473416..00c82f4d6a 100644 --- a/deployment/cinder/cinder-backup-pacemaker-puppet.yaml +++ b/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 diff --git a/deployment/cinder/cinder-scheduler-container-puppet.yaml b/deployment/cinder/cinder-scheduler-container-puppet.yaml index 467199f2e3..c9ee329b87 100644 --- a/deployment/cinder/cinder-scheduler-container-puppet.yaml +++ b/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 diff --git a/deployment/cinder/cinder-volume-container-puppet.yaml b/deployment/cinder/cinder-volume-container-puppet.yaml index 8248551282..85d346c09b 100644 --- a/deployment/cinder/cinder-volume-container-puppet.yaml +++ b/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 diff --git a/deployment/cinder/cinder-volume-pacemaker-puppet.yaml b/deployment/cinder/cinder-volume-pacemaker-puppet.yaml index b994908d62..3ba962ed5d 100644 --- a/deployment/cinder/cinder-volume-pacemaker-puppet.yaml +++ b/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 diff --git a/puppet/services/database/mysql-client.yaml b/deployment/database/mysql-client.yaml similarity index 100% rename from puppet/services/database/mysql-client.yaml rename to deployment/database/mysql-client.yaml diff --git a/deployment/glance/glance-api-container-puppet.yaml b/deployment/glance/glance-api-container-puppet.yaml index 2a08f93a23..32c768eb31 100644 --- a/deployment/glance/glance-api-container-puppet.yaml +++ b/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 diff --git a/deployment/heat/heat-engine-container-puppet.yaml b/deployment/heat/heat-engine-container-puppet.yaml index 3427bb8a32..deb4bf3416 100644 --- a/deployment/heat/heat-engine-container-puppet.yaml +++ b/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 diff --git a/deployment/ironic/ironic-api-container-puppet.yaml b/deployment/ironic/ironic-api-container-puppet.yaml index 82414ff8d1..b8823b1f51 100644 --- a/deployment/ironic/ironic-api-container-puppet.yaml +++ b/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 diff --git a/deployment/ironic/ironic-conductor-container-puppet.yaml b/deployment/ironic/ironic-conductor-container-puppet.yaml index 0269b79ab4..c59a99ad7d 100644 --- a/deployment/ironic/ironic-conductor-container-puppet.yaml +++ b/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 diff --git a/deployment/ironic/ironic-inspector-container-puppet.yaml b/deployment/ironic/ironic-inspector-container-puppet.yaml index f964b0faa2..aa3ecb1bd2 100644 --- a/deployment/ironic/ironic-inspector-container-puppet.yaml +++ b/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: diff --git a/deployment/keystone/keystone-container-puppet.yaml b/deployment/keystone/keystone-container-puppet.yaml index ecd0b59bfd..f8b53fc400 100644 --- a/deployment/keystone/keystone-container-puppet.yaml +++ b/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 diff --git a/deployment/mistral/mistral-api-container-puppet.yaml b/deployment/mistral/mistral-api-container-puppet.yaml index aceca53026..24464ea150 100644 --- a/deployment/mistral/mistral-api-container-puppet.yaml +++ b/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 diff --git a/deployment/mistral/mistral-engine-container-puppet.yaml b/deployment/mistral/mistral-engine-container-puppet.yaml index 2cbda401be..31106e1a03 100644 --- a/deployment/mistral/mistral-engine-container-puppet.yaml +++ b/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 diff --git a/deployment/mistral/mistral-event-engine-container-puppet.yaml b/deployment/mistral/mistral-event-engine-container-puppet.yaml index 6b3ea41d13..d5d5a3c970 100644 --- a/deployment/mistral/mistral-event-engine-container-puppet.yaml +++ b/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 diff --git a/deployment/mistral/mistral-executor-container-puppet.yaml b/deployment/mistral/mistral-executor-container-puppet.yaml index ae04ca0d98..fc6d1c450e 100644 --- a/deployment/mistral/mistral-executor-container-puppet.yaml +++ b/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 diff --git a/deployment/sahara/sahara-api-container-puppet.yaml b/deployment/sahara/sahara-api-container-puppet.yaml index c796ca877b..a79c033f05 100644 --- a/deployment/sahara/sahara-api-container-puppet.yaml +++ b/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 diff --git a/deployment/sahara/sahara-engine-container-puppet.yaml b/deployment/sahara/sahara-engine-container-puppet.yaml index f1966c920c..589de85aa2 100644 --- a/deployment/sahara/sahara-engine-container-puppet.yaml +++ b/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 diff --git a/deployment/zaqar/zaqar-container-puppet.yaml b/deployment/zaqar/zaqar-container-puppet.yaml index 99d20bbd83..be3a0ffa4f 100644 --- a/deployment/zaqar/zaqar-container-puppet.yaml +++ b/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: diff --git a/docker/services/barbican-api.yaml b/docker/services/barbican-api.yaml index 1b8960ee67..5624c5b0fd 100644 --- a/docker/services/barbican-api.yaml +++ b/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 diff --git a/docker/services/congress.yaml b/docker/services/congress.yaml index 286890bffd..819fc7c9b4 100644 --- a/docker/services/congress.yaml +++ b/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 diff --git a/docker/services/designate-central.yaml b/docker/services/designate-central.yaml index 646aa5535d..6efaed14af 100644 --- a/docker/services/designate-central.yaml +++ b/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 diff --git a/docker/services/designate-mdns.yaml b/docker/services/designate-mdns.yaml index c3df49e57f..1e72dd8a8b 100644 --- a/docker/services/designate-mdns.yaml +++ b/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 diff --git a/docker/services/ec2-api.yaml b/docker/services/ec2-api.yaml index 35d60de507..0a2d172ec9 100644 --- a/docker/services/ec2-api.yaml +++ b/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 diff --git a/docker/services/gnocchi-metricd.yaml b/docker/services/gnocchi-metricd.yaml index 7f71c8cb4d..f62499c8e6 100644 --- a/docker/services/gnocchi-metricd.yaml +++ b/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 diff --git a/docker/services/gnocchi-statsd.yaml b/docker/services/gnocchi-statsd.yaml index 77d70b3768..109bf4025f 100644 --- a/docker/services/gnocchi-statsd.yaml +++ b/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 diff --git a/docker/services/manila-api.yaml b/docker/services/manila-api.yaml index 350ad6ccc5..12ac02267d 100644 --- a/docker/services/manila-api.yaml +++ b/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 diff --git a/docker/services/manila-scheduler.yaml b/docker/services/manila-scheduler.yaml index c4fcd54ba7..68b4f713e0 100644 --- a/docker/services/manila-scheduler.yaml +++ b/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 diff --git a/docker/services/manila-share.yaml b/docker/services/manila-share.yaml index 34c2fa84e2..6ddd121cc7 100644 --- a/docker/services/manila-share.yaml +++ b/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 diff --git a/docker/services/neutron-api.yaml b/docker/services/neutron-api.yaml index f53f25c846..e230a00ed4 100644 --- a/docker/services/neutron-api.yaml +++ b/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 diff --git a/docker/services/nova-api.yaml b/docker/services/nova-api.yaml index 3f00280ea8..1c2239c23f 100644 --- a/docker/services/nova-api.yaml +++ b/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 diff --git a/docker/services/nova-compute.yaml b/docker/services/nova-compute.yaml index b0fd7ade2e..b637ac2d8e 100644 --- a/docker/services/nova-compute.yaml +++ b/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 diff --git a/docker/services/nova-conductor.yaml b/docker/services/nova-conductor.yaml index 3acc2822fa..76f00e5a27 100644 --- a/docker/services/nova-conductor.yaml +++ b/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 diff --git a/docker/services/nova-consoleauth.yaml b/docker/services/nova-consoleauth.yaml index 6126b4cbdc..24bacdc7b4 100644 --- a/docker/services/nova-consoleauth.yaml +++ b/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 diff --git a/docker/services/nova-ironic.yaml b/docker/services/nova-ironic.yaml index 09e5756275..3100e00d89 100644 --- a/docker/services/nova-ironic.yaml +++ b/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 diff --git a/docker/services/nova-libvirt.yaml b/docker/services/nova-libvirt.yaml index 719cde2b80..fd49a8ff2f 100644 --- a/docker/services/nova-libvirt.yaml +++ b/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 diff --git a/docker/services/nova-metadata.yaml b/docker/services/nova-metadata.yaml index 0d3526dcd6..9c5695c69e 100644 --- a/docker/services/nova-metadata.yaml +++ b/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 diff --git a/docker/services/nova-placement.yaml b/docker/services/nova-placement.yaml index 264de06e45..89e94e3ba3 100644 --- a/docker/services/nova-placement.yaml +++ b/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 diff --git a/docker/services/nova-scheduler.yaml b/docker/services/nova-scheduler.yaml index 5527369d54..7df39bb8d5 100644 --- a/docker/services/nova-scheduler.yaml +++ b/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 diff --git a/docker/services/nova-vnc-proxy.yaml b/docker/services/nova-vnc-proxy.yaml index e48eed349b..48b1b01407 100644 --- a/docker/services/nova-vnc-proxy.yaml +++ b/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 diff --git a/docker/services/octavia-api.yaml b/docker/services/octavia-api.yaml index 6b04221c1e..8c5a00d6d2 100644 --- a/docker/services/octavia-api.yaml +++ b/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 diff --git a/docker/services/octavia-health-manager.yaml b/docker/services/octavia-health-manager.yaml index 8bed55a7e2..72e9108cef 100644 --- a/docker/services/octavia-health-manager.yaml +++ b/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 diff --git a/docker/services/octavia-housekeeping.yaml b/docker/services/octavia-housekeeping.yaml index 4188d6d7d5..0d5ace15bc 100644 --- a/docker/services/octavia-housekeeping.yaml +++ b/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 diff --git a/docker/services/octavia-worker.yaml b/docker/services/octavia-worker.yaml index 332573de4f..8bc6ac25b1 100644 --- a/docker/services/octavia-worker.yaml +++ b/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 diff --git a/docker/services/pacemaker/manila-share.yaml b/docker/services/pacemaker/manila-share.yaml index 6b8841c91b..fd89fe6332 100644 --- a/docker/services/pacemaker/manila-share.yaml +++ b/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 diff --git a/docker/services/panko-api.yaml b/docker/services/panko-api.yaml index 665e4470ca..4acbc6ad48 100644 --- a/docker/services/panko-api.yaml +++ b/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 diff --git a/docker/services/tacker.yaml b/docker/services/tacker.yaml index f8b98dacd6..a02b030674 100644 --- a/docker/services/tacker.yaml +++ b/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 diff --git a/overcloud-resource-registry-puppet.j2.yaml b/overcloud-resource-registry-puppet.j2.yaml index 51085105f6..3fa03d272b 100644 --- a/overcloud-resource-registry-puppet.j2.yaml +++ b/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