Merge "Move containers-common.yaml into deployment"

2019-04-15 17:57:15 +00:00 · 2019-04-15 17:57:15 +00:00 · 0cc714d31a
commit 0cc714d31a
parent 84be783dd2 a52498ab4d
110 changed files with 110 additions and 110 deletions
--- a/deployment/aodh/aodh-api-container-puppet.yaml
+++ b/deployment/aodh/aodh-api-container-puppet.yaml
@ -60,7 +60,7 @@ conditions:
 resources:

  ContainersCommon:
-    type: ../../docker/services/containers-common.yaml
+    type: ../containers-common.yaml

  MySQLClient:
    type: ../database/mysql-client.yaml
--- a/deployment/aodh/aodh-evaluator-container-puppet.yaml
+++ b/deployment/aodh/aodh-evaluator-container-puppet.yaml
@ -43,7 +43,7 @@ parameters:
 resources:

  ContainersCommon:
-    type: ../../docker/services/containers-common.yaml
+    type: ../containers-common.yaml

  MySQLClient:
    type: ../database/mysql-client.yaml
--- a/deployment/aodh/aodh-listener-container-puppet.yaml
+++ b/deployment/aodh/aodh-listener-container-puppet.yaml
@ -43,7 +43,7 @@ parameters:
 resources:

  ContainersCommon:
-    type: ../../docker/services/containers-common.yaml
+    type: ../containers-common.yaml

  MySQLClient:
    type: ../database/mysql-client.yaml
--- a/deployment/aodh/aodh-notifier-container-puppet.yaml
+++ b/deployment/aodh/aodh-notifier-container-puppet.yaml
@ -43,7 +43,7 @@ parameters:
 resources:

  ContainersCommon:
-    type: ../../docker/services/containers-common.yaml
+    type: ../containers-common.yaml

  MySQLClient:
    type: ../database/mysql-client.yaml
--- a/deployment/barbican/barbican-api-container-puppet.yaml
+++ b/deployment/barbican/barbican-api-container-puppet.yaml
@ -199,7 +199,7 @@ resources:
      RoleParameters: {get_param: RoleParameters}

  ContainersCommon:
-    type: ../../docker/services/containers-common.yaml
+    type: ../containers-common.yaml

  MySQLClient:
    type: ../database/mysql-client.yaml
--- a/deployment/cavium/liquidio-compute-config-container-puppet.yaml
+++ b/deployment/cavium/liquidio-compute-config-container-puppet.yaml
@ -70,7 +70,7 @@ parameters:
 resources:

  ContainersCommon:
-    type: ../../docker/services/containers-common.yaml
+    type: ../containers-common.yaml

 outputs:
  role_data:
--- a/deployment/ceilometer/ceilometer-agent-central-container-puppet.yaml
+++ b/deployment/ceilometer/ceilometer-agent-central-container-puppet.yaml
@ -52,7 +52,7 @@ parameters:
 resources:

  ContainersCommon:
-    type: ../../docker/services/containers-common.yaml
+    type: ../containers-common.yaml

  CeilometerServiceBase:
    type: ./ceilometer-base-container-puppet.yaml
--- a/deployment/ceilometer/ceilometer-agent-compute-container-puppet.yaml
+++ b/deployment/ceilometer/ceilometer-agent-compute-container-puppet.yaml
@ -57,7 +57,7 @@ parameters:
 resources:

  ContainersCommon:
-    type: ../../docker/services/containers-common.yaml
+    type: ../containers-common.yaml

  CeilometerServiceBase:
    type: ./ceilometer-base-container-puppet.yaml
--- a/deployment/ceilometer/ceilometer-agent-ipmi-container-puppet.yaml
+++ b/deployment/ceilometer/ceilometer-agent-ipmi-container-puppet.yaml
@ -52,7 +52,7 @@ parameters:
 resources:

  ContainersCommon:
-    type: ../../docker/services/containers-common.yaml
+    type: ../containers-common.yaml

  CeilometerServiceBase:
    type: ./ceilometer-base-container-puppet.yaml
--- a/deployment/ceilometer/ceilometer-agent-notification-container-puppet.yaml
+++ b/deployment/ceilometer/ceilometer-agent-notification-container-puppet.yaml
@ -56,7 +56,7 @@ parameters:
 resources:

  ContainersCommon:
-    type: ../../docker/services/containers-common.yaml
+    type: ../containers-common.yaml

  CeilometerServiceBase:
    type: ./ceilometer-base-container-puppet.yaml
--- a/deployment/cinder/cinder-api-container-puppet.yaml
+++ b/deployment/cinder/cinder-api-container-puppet.yaml
@ -87,7 +87,7 @@ conditions:
 resources:

  ContainersCommon:
-    type: ../../docker/services/containers-common.yaml
+    type: ../containers-common.yaml

  MySQLClient:
    type: ../database/mysql-client.yaml
--- a/deployment/cinder/cinder-backup-container-puppet.yaml
+++ b/deployment/cinder/cinder-backup-container-puppet.yaml
@ -90,7 +90,7 @@ parameters:
 resources:

  ContainersCommon:
-    type: ../../docker/services/containers-common.yaml
+    type: ../containers-common.yaml

  MySQLClient:
    type: ../database/mysql-client.yaml
--- a/deployment/cinder/cinder-backup-pacemaker-puppet.yaml
+++ b/deployment/cinder/cinder-backup-pacemaker-puppet.yaml
@ -81,7 +81,7 @@ conditions:
 resources:

  ContainersCommon:
-    type: ../../docker/services/containers-common.yaml
+    type: ../containers-common.yaml

  MySQLClient:
    type: ../database/mysql-client.yaml
--- a/deployment/cinder/cinder-common-container-puppet.yaml
+++ b/deployment/cinder/cinder-common-container-puppet.yaml
@ -52,7 +52,7 @@ parameters:
 resources:

  ContainersCommon:
-    type: ../../docker/services/containers-common.yaml
+    type: ../containers-common.yaml

 outputs:
  cinder_common_host_prep_tasks:
--- a/deployment/cinder/cinder-scheduler-container-puppet.yaml
+++ b/deployment/cinder/cinder-scheduler-container-puppet.yaml
@ -48,7 +48,7 @@ parameters:
 resources:

  ContainersCommon:
-    type: ../../docker/services/containers-common.yaml
+    type: ../containers-common.yaml

  MySQLClient:
    type: ../database/mysql-client.yaml
--- a/deployment/cinder/cinder-volume-container-puppet.yaml
+++ b/deployment/cinder/cinder-volume-container-puppet.yaml
@ -161,7 +161,7 @@ parameters:
 resources:

  ContainersCommon:
-    type: ../../docker/services/containers-common.yaml
+    type: ../containers-common.yaml

  MySQLClient:
    type: ../database/mysql-client.yaml
--- a/deployment/cinder/cinder-volume-pacemaker-puppet.yaml
+++ b/deployment/cinder/cinder-volume-pacemaker-puppet.yaml
@ -69,7 +69,7 @@ conditions:
 resources:

  ContainersCommon:
-    type: ../../docker/services/containers-common.yaml
+    type: ../containers-common.yaml

  MySQLClient:
    type: ../database/mysql-client.yaml
--- a/docker/services/containers-common.yaml
+++ b/docker/services/containers-common.yaml
@ -85,7 +85,7 @@ outputs:
          exit $rc
      pyshim.sh:
        mode: "0700"
-        content: { get_file: ../../container_config_scripts/pyshim.sh }
+        content: { get_file: ../container_config_scripts/pyshim.sh }

  volumes_base:
    description: Base volume list
--- a/deployment/database/mysql-pacemaker-puppet.yaml
+++ b/deployment/database/mysql-pacemaker-puppet.yaml
@ -82,7 +82,7 @@ parameters:
 resources:

  ContainersCommon:
-    type: ../../docker/services/containers-common.yaml
+    type: ../containers-common.yaml

  MysqlBase:
    type: ./mysql-base.yaml
--- a/deployment/database/redis-container-puppet.yaml
+++ b/deployment/database/redis-container-puppet.yaml
@ -47,7 +47,7 @@ conditions:
 resources:

  ContainersCommon:
-    type: ../../docker/services/containers-common.yaml
+    type: ../containers-common.yaml

  RedisBase:
    type: ./redis-base-puppet.yaml
--- a/deployment/database/redis-pacemaker-puppet.yaml
+++ b/deployment/database/redis-pacemaker-puppet.yaml
@ -73,7 +73,7 @@ conditions:
 resources:

  ContainersCommon:
-    type: ../../docker/services/containers-common.yaml
+    type: ../containers-common.yaml

  RedisBase:
    type: ./redis-container-puppet.yaml
--- a/deployment/deprecated/logging/fluentd-container-puppet.yaml
+++ b/deployment/deprecated/logging/fluentd-container-puppet.yaml
@ -41,7 +41,7 @@ parameters:
 resources:

  ContainersCommon:
-    type: ../../../docker/services/containers-common.yaml
+    type: ../../containers-common.yaml

  LoggingConfiguration:
    type: OS::TripleO::LoggingConfiguration
--- a/deployment/deprecated/monitoring/sensu-client-container-puppet.yaml
+++ b/deployment/deprecated/monitoring/sensu-client-container-puppet.yaml
@ -93,7 +93,7 @@ conditions:

 resources:
  ContainersCommon:
-    type: ../containers-common.yaml
+    type: ../../containers-common.yaml

  SensuBase:
    type: ./sensu-base.yaml
--- a/deployment/deprecated/nova/nova-consoleauth-container-puppet.yaml
+++ b/deployment/deprecated/nova/nova-consoleauth-container-puppet.yaml
@ -52,7 +52,7 @@ parameters:
 resources:

  ContainersCommon:
-    type: ../../../docker/services/containers-common.yaml
+    type: ../../containers-common.yaml

  MySQLClient:
    type: ../../../deployment/database/mysql-client.yaml
--- a/deployment/deprecated/nova/nova-placement-container-puppet.yaml
+++ b/deployment/deprecated/nova/nova-placement-container-puppet.yaml
@ -70,7 +70,7 @@ conditions:
 resources:

  ContainersCommon:
-    type: ../../../docker/services/containers-common.yaml
+    type: ../../containers-common.yaml

  MySQLClient:
    type: ../../../deployment/database/mysql-client.yaml
--- a/deployment/deprecated/opendaylight/opendaylight-api-container-puppet.yaml
+++ b/deployment/deprecated/opendaylight/opendaylight-api-container-puppet.yaml
@ -116,7 +116,7 @@ conditions:
 resources:

  ContainersCommon:
-    type: ../../../docker/services/containers-common.yaml
+    type: ../../containers-common.yaml

  OpenDaylightApiLogging:
    type: OS::TripleO::Services::Logging::OpenDaylightApi
--- a/deployment/deprecated/panko/panko-api-container-puppet.yaml
+++ b/deployment/deprecated/panko/panko-api-container-puppet.yaml
@ -109,7 +109,7 @@ conditions:
 resources:

  ContainersCommon:
-    type: ../../../docker/services/containers-common.yaml
+    type: ../../containers-common.yaml

  MySQLClient:
    type: ../../database/mysql-client.yaml
--- a/deployment/ec2/ec2-api-container-puppet.yaml
+++ b/deployment/ec2/ec2-api-container-puppet.yaml
@ -89,7 +89,7 @@ conditions:
 resources:

  ContainersCommon:
-    type: ../../docker/services/containers-common.yaml
+    type: ../containers-common.yaml

  MySQLClient:
    type: ../../deployment/database/mysql-client.yaml
--- a/deployment/experimental/designate/designate-api-container-puppet.yaml
+++ b/deployment/experimental/designate/designate-api-container-puppet.yaml
@ -62,7 +62,7 @@ conditions:
 resources:

  ContainersCommon:
-    type: ../../../docker/services/containers-common.yaml
+    type: ../../containers-common.yaml

  DesignateBase:
    type: ./designate-base.yaml
--- a/deployment/experimental/designate/designate-central-container-puppet.yaml
+++ b/deployment/experimental/designate/designate-central-container-puppet.yaml
@ -57,7 +57,7 @@ conditions:
 resources:

  ContainersCommon:
-    type: ../../../docker/services/containers-common.yaml
+    type: ../../containers-common.yaml

  MySQLClient:
    type: ../../database/mysql-client.yaml
--- a/deployment/experimental/designate/designate-mdns-container-puppet.yaml
+++ b/deployment/experimental/designate/designate-mdns-container-puppet.yaml
@ -54,7 +54,7 @@ conditions:
 resources:

  ContainersCommon:
-    type: ../../../docker/services/containers-common.yaml
+    type: ../../containers-common.yaml

  MySQLClient:
    type: ../../database/mysql-client.yaml
--- a/deployment/experimental/designate/designate-producer-container-puppet.yaml
+++ b/deployment/experimental/designate/designate-producer-container-puppet.yaml
@ -55,7 +55,7 @@ conditions:
 resources:

  ContainersCommon:
-    type: ../../../docker/services/containers-common.yaml
+    type: ../../containers-common.yaml

  DesignateBase:
    type: ./designate-base.yaml
--- a/deployment/experimental/designate/designate-sink-container-puppet.yaml
+++ b/deployment/experimental/designate/designate-sink-container-puppet.yaml
@ -50,7 +50,7 @@ conditions:
 resources:

  ContainersCommon:
-    type: ../../../docker/services/containers-common.yaml
+    type: ../../containers-common.yaml

  DesignateBase:
    type: ./designate-base.yaml
--- a/deployment/experimental/designate/designate-worker-container-puppet.yaml
+++ b/deployment/experimental/designate/designate-worker-container-puppet.yaml
@ -62,7 +62,7 @@ conditions:
 resources:

  ContainersCommon:
-    type: ../../../docker/services/containers-common.yaml
+    type: ../../containers-common.yaml

  DesignateBase:
    type: ./designate-base.yaml
--- a/deployment/glance/glance-api-container-puppet.yaml
+++ b/deployment/glance/glance-api-container-puppet.yaml
@ -257,7 +257,7 @@ conditions:
 resources:

  ContainersCommon:
-    type: ../../docker/services/containers-common.yaml
+    type: ../containers-common.yaml

  MySQLClient:
    type: ../database/mysql-client.yaml
--- a/deployment/gnocchi/gnocchi-api-container-puppet.yaml
+++ b/deployment/gnocchi/gnocchi-api-container-puppet.yaml
@ -114,7 +114,7 @@ conditions:
 resources:

  ContainersCommon:
-    type: ../../docker/services/containers-common.yaml
+    type: ../containers-common.yaml

  GnocchiServiceBase:
    type: ./gnocchi-base.yaml
--- a/deployment/gnocchi/gnocchi-metricd-container-puppet.yaml
+++ b/deployment/gnocchi/gnocchi-metricd-container-puppet.yaml
@ -68,7 +68,7 @@ parameters:
 resources:

  ContainersCommon:
-    type: ../../docker/services/containers-common.yaml
+    type: ../containers-common.yaml

  MySQLClient:
    type: ../../deployment/database/mysql-client.yaml
--- a/deployment/gnocchi/gnocchi-statsd-container-puppet.yaml
+++ b/deployment/gnocchi/gnocchi-statsd-container-puppet.yaml
@ -60,7 +60,7 @@ parameters:
 resources:

  ContainersCommon:
-    type: ../../docker/services/containers-common.yaml
+    type: ../containers-common.yaml

  MySQLClient:
    type: ../../deployment/database/mysql-client.yaml
--- a/deployment/haproxy/haproxy-container-puppet.yaml
+++ b/deployment/haproxy/haproxy-container-puppet.yaml
@ -123,7 +123,7 @@ conditions:
 resources:

  ContainersCommon:
-    type: ../../docker/services/containers-common.yaml
+    type: ../containers-common.yaml

  HAProxyLogging:
    type: OS::TripleO::Services::Logging::HAProxy
--- a/deployment/haproxy/haproxy-pacemaker-puppet.yaml
+++ b/deployment/haproxy/haproxy-pacemaker-puppet.yaml
@ -118,7 +118,7 @@ conditions:
 resources:

  ContainersCommon:
-    type: ../../docker/services/containers-common.yaml
+    type: ../containers-common.yaml

  HAProxyBase:
    type: ./haproxy-container-puppet.yaml
--- a/deployment/heat/heat-api-cfn-container-puppet.yaml
+++ b/deployment/heat/heat-api-cfn-container-puppet.yaml
@ -69,7 +69,7 @@ conditions:
 resources:

  ContainersCommon:
-    type: ../../docker/services/containers-common.yaml
+    type: ../containers-common.yaml

  ApacheServiceBase:
    type: ../../deployment/apache/apache-baremetal-puppet.yaml
--- a/deployment/heat/heat-api-container-puppet.yaml
+++ b/deployment/heat/heat-api-container-puppet.yaml
@ -83,7 +83,7 @@ conditions:
 resources:

  ContainersCommon:
-    type: ../../docker/services/containers-common.yaml
+    type: ../containers-common.yaml

  ApacheServiceBase:
    type: ../../deployment/apache/apache-baremetal-puppet.yaml
--- a/deployment/heat/heat-engine-container-puppet.yaml
+++ b/deployment/heat/heat-engine-container-puppet.yaml
@ -104,7 +104,7 @@ conditions:
 resources:

  ContainersCommon:
-    type: ../../docker/services/containers-common.yaml
+    type: ../containers-common.yaml

  MySQLClient:
    type: ../database/mysql-client.yaml
--- a/deployment/horizon/horizon-container-puppet.yaml
+++ b/deployment/horizon/horizon-container-puppet.yaml
@ -129,7 +129,7 @@ conditions:
 resources:

  ContainersCommon:
-    type: ../../docker/services/containers-common.yaml
+    type: ../containers-common.yaml

 outputs:
  role_data:
--- a/deployment/ironic/ironic-api-container-puppet.yaml
+++ b/deployment/ironic/ironic-api-container-puppet.yaml
@ -80,7 +80,7 @@ resources:
      EnableInternalTLS: {get_param: EnableInternalTLS}

  ContainersCommon:
-    type: ../../docker/services/containers-common.yaml
+    type: ../containers-common.yaml

  MySQLClient:
    type: ../database/mysql-client.yaml
--- a/deployment/ironic/ironic-conductor-container-puppet.yaml
+++ b/deployment/ironic/ironic-conductor-container-puppet.yaml
@ -242,7 +242,7 @@ conditions:
 resources:

  ContainersCommon:
-    type: ../../docker/services/containers-common.yaml
+    type: ../containers-common.yaml

  MySQLClient:
    type: ../database/mysql-client.yaml
--- a/deployment/ironic/ironic-inspector-container-puppet.yaml
+++ b/deployment/ironic/ironic-inspector-container-puppet.yaml
@ -165,7 +165,7 @@ conditions:
 resources:

  ContainersCommon:
-    type: ../../docker/services/containers-common.yaml
+    type: ../containers-common.yaml

  MySQLClient:
    type: ../database/mysql-client.yaml
--- a/deployment/ironic/ironic-neutron-agent-container-puppet.yaml
+++ b/deployment/ironic/ironic-neutron-agent-container-puppet.yaml
@ -48,7 +48,7 @@ parameters:
 resources:

  ContainersCommon:
-    type: ../../docker/services/containers-common.yaml
+    type: ../containers-common.yaml

  # TODO() Point to the right neutron-base once neutron is flat
  NeutronBase:
--- a/deployment/ironic/ironic-pxe-container-puppet.yaml
+++ b/deployment/ironic/ironic-pxe-container-puppet.yaml
@ -40,7 +40,7 @@ parameters:
 resources:

  ContainersCommon:
-    type: ../../docker/services/containers-common.yaml
+    type: ../containers-common.yaml

 outputs:
  role_data:
--- a/deployment/iscsid/iscsid-container-puppet.yaml
+++ b/deployment/iscsid/iscsid-container-puppet.yaml
@ -40,7 +40,7 @@ parameters:
 resources:

  ContainersCommon:
-    type: ../../docker/services/containers-common.yaml
+    type: ../containers-common.yaml

 outputs:
  role_data:
--- a/deployment/keepalived/keepalived-container-puppet.yaml
+++ b/deployment/keepalived/keepalived-container-puppet.yaml
@ -66,7 +66,7 @@ conditions:

 resources:
  ContainersCommon:
-    type: ../../docker/services/containers-common.yaml
+    type: ../containers-common.yaml

 outputs:
  role_data:
--- a/deployment/keystone/keystone-container-puppet.yaml
+++ b/deployment/keystone/keystone-container-puppet.yaml
@ -375,7 +375,7 @@ parameter_groups:
 resources:

  ContainersCommon:
-    type: ../../docker/services/containers-common.yaml
+    type: ../containers-common.yaml

  MySQLClient:
    type: ../database/mysql-client.yaml
--- a/deployment/logging/rsyslog-sidecar-container-puppet.yaml
+++ b/deployment/logging/rsyslog-sidecar-container-puppet.yaml
@ -37,7 +37,7 @@ parameters:
 resources:

  ContainersCommon:
-    type: ../../docker/services/containers-common.yaml
+    type: ../../containers-common.yaml

 outputs:
  role_data:
--- a/deployment/logrotate/logrotate-crond-container-puppet.yaml
+++ b/deployment/logrotate/logrotate-crond-container-puppet.yaml
@ -58,7 +58,7 @@ parameters:
 resources:

  ContainersCommon:
-    type: ../../docker/services/containers-common.yaml
+    type: ../containers-common.yaml
 outputs:
  role_data:
    description: Role data for the crond role.
--- a/deployment/manila/manila-api-container-puppet.yaml
+++ b/deployment/manila/manila-api-container-puppet.yaml
@ -63,7 +63,7 @@ conditions:
 resources:

  ContainersCommon:
-    type: ../../docker/services/containers-common.yaml
+    type: ../containers-common.yaml

  MySQLClient:
    type: ../../deployment/database/mysql-client.yaml
--- a/deployment/manila/manila-scheduler-container-puppet.yaml
+++ b/deployment/manila/manila-scheduler-container-puppet.yaml
@ -47,7 +47,7 @@ parameters:
 resources:

  ContainersCommon:
-    type: ../../docker/services/containers-common.yaml
+    type: ../containers-common.yaml

  MySQLClient:
    type: ../../deployment/database/mysql-client.yaml
--- a/deployment/manila/manila-share-common.yaml
+++ b/deployment/manila/manila-share-common.yaml
@ -46,7 +46,7 @@ conditions:
 resources:

  ContainersCommon:
-    type: ../../docker/services/containers-common.yaml
+    type: ../containers-common.yaml

 outputs:
  manila_share_volumes:
--- a/deployment/manila/manila-share-container-puppet.yaml
+++ b/deployment/manila/manila-share-container-puppet.yaml
@ -59,7 +59,7 @@ parameters:
 resources:

  ContainersCommon:
-    type: ../../docker/services/containers-common.yaml
+    type: ../containers-common.yaml

  MySQLClient:
    type: ../../deployment/database/mysql-client.yaml
--- a/deployment/manila/manila-share-pacemaker-puppet.yaml
+++ b/deployment/manila/manila-share-pacemaker-puppet.yaml
@ -64,7 +64,7 @@ conditions:
 resources:

  ContainersCommon:
-    type: ../../docker/services/containers-common.yaml
+    type: ../containers-common.yaml

  MySQLClient:
    type: ../database/mysql-client.yaml
--- a/deployment/memcached/memcached-container-puppet.yaml
+++ b/deployment/memcached/memcached-container-puppet.yaml
@ -74,7 +74,7 @@ conditions:
 resources:

  ContainersCommon:
-    type: ../../docker/services/containers-common.yaml
+    type: ../containers-common.yaml

 outputs:
  role_data:
--- a/deployment/messaging/rpc-qdrouterd-container-puppet.yaml
+++ b/deployment/messaging/rpc-qdrouterd-container-puppet.yaml
@ -58,7 +58,7 @@ parameters:
 resources:

  ContainersCommon:
-    type: ../../docker/services/containers-common.yaml
+    type: ../containers-common.yaml

 outputs:
  role_data:
--- a/deployment/metrics/collectd-container-puppet.yaml
+++ b/deployment/metrics/collectd-container-puppet.yaml
@ -302,7 +302,7 @@ conditions:
 resources:

  ContainersCommon:
-    type: ../../docker/services/containers-common.yaml
+    type: ../containers-common.yaml

 outputs:
  role_data:
--- a/deployment/metrics/qdr-container-puppet.yaml
+++ b/deployment/metrics/qdr-container-puppet.yaml
@ -128,7 +128,7 @@ parameters:

 resources:
  ContainersCommon:
-    type: ../../docker/services/containers-common.yaml
+    type: ../containers-common.yaml


 outputs:
--- a/deployment/mistral/mistral-api-container-puppet.yaml
+++ b/deployment/mistral/mistral-api-container-puppet.yaml
@ -68,7 +68,7 @@ conditions:
 resources:

  ContainersCommon:
-    type: ../../docker/services/containers-common.yaml
+    type: ../containers-common.yaml

  MySQLClient:
    type: ../database/mysql-client.yaml
--- a/deployment/mistral/mistral-engine-container-puppet.yaml
+++ b/deployment/mistral/mistral-engine-container-puppet.yaml
@ -65,7 +65,7 @@ parameters:
 resources:

  ContainersCommon:
-    type: ../../docker/services/containers-common.yaml
+    type: ../containers-common.yaml

  MySQLClient:
    type: ../database/mysql-client.yaml
--- a/deployment/mistral/mistral-event-engine-container-puppet.yaml
+++ b/deployment/mistral/mistral-event-engine-container-puppet.yaml
@ -44,7 +44,7 @@ parameters:
 resources:

  ContainersCommon:
-    type: ../../docker/services/containers-common.yaml
+    type: ../containers-common.yaml

  MySQLClient:
    type: ../database/mysql-client.yaml
--- a/deployment/mistral/mistral-executor-container-puppet.yaml
+++ b/deployment/mistral/mistral-executor-container-puppet.yaml
@ -78,7 +78,7 @@ conditions:
 resources:

  ContainersCommon:
-    type: ../../docker/services/containers-common.yaml
+    type: ../containers-common.yaml

  MySQLClient:
    type: ../database/mysql-client.yaml
--- a/deployment/multipathd/multipathd-container.yaml
+++ b/deployment/multipathd/multipathd-container.yaml
@ -40,7 +40,7 @@ parameters:
 resources:

  ContainersCommon:
-    type: ../../docker/services/containers-common.yaml
+    type: ../containers-common.yaml

 outputs:
  role_data:
--- a/deployment/neutron/neutron-api-container-puppet.yaml
+++ b/deployment/neutron/neutron-api-container-puppet.yaml
@ -157,7 +157,7 @@ resources:
      EnableInternalTLS: {get_param: EnableInternalTLS}

  ContainersCommon:
-    type: ../../docker/services/containers-common.yaml
+    type: ../containers-common.yaml

  MySQLClient:
    type: ../database/mysql-client.yaml
--- a/deployment/neutron/neutron-bgpvpn-api-container-puppet.yaml
+++ b/deployment/neutron/neutron-bgpvpn-api-container-puppet.yaml
@ -41,7 +41,7 @@ parameters:
 resources:

  ContainersCommon:
-    type: ../../docker/services/containers-common.yaml
+    type: ../containers-common.yaml

 outputs:
  role_data:
--- a/deployment/neutron/neutron-dhcp-container-puppet.yaml
+++ b/deployment/neutron/neutron-dhcp-container-puppet.yaml
@ -139,7 +139,7 @@ conditions:
 resources:

  ContainersCommon:
-    type: ../../docker/services/containers-common.yaml
+    type: ../containers-common.yaml

  NeutronBase:
    type: ../../puppet/services/neutron-base.yaml
--- a/deployment/neutron/neutron-l2gw-api-container-puppet.yaml
+++ b/deployment/neutron/neutron-l2gw-api-container-puppet.yaml
@ -57,7 +57,7 @@ parameters:
 resources:

  ContainersCommon:
-    type: ../../docker/services/containers-common.yaml
+    type: ../containers-common.yaml

 outputs:
  role_data:
--- a/deployment/neutron/neutron-l3-container-puppet.yaml
+++ b/deployment/neutron/neutron-l3-container-puppet.yaml
@ -127,7 +127,7 @@ conditions:
 resources:

  ContainersCommon:
-    type: ../../docker/services/containers-common.yaml
+    type: ../containers-common.yaml

  NeutronBase:
    type: ../../puppet/services/neutron-base.yaml
--- a/deployment/neutron/neutron-lbaas-api-container-puppet.yaml
+++ b/deployment/neutron/neutron-lbaas-api-container-puppet.yaml
@ -46,7 +46,7 @@ parameters:
 resources:

  ContainersCommon:
-    type: ../../docker/services/containers-common.yaml
+    type: ../containers-common.yaml

 outputs:
  role_data:
--- a/deployment/neutron/neutron-metadata-container-puppet.yaml
+++ b/deployment/neutron/neutron-metadata-container-puppet.yaml
@ -86,7 +86,7 @@ conditions:
 resources:

  ContainersCommon:
-    type: ../../docker/services/containers-common.yaml
+    type: ../containers-common.yaml

  NeutronBase:
    type: ../../puppet/services/neutron-base.yaml
--- a/deployment/neutron/neutron-ovs-agent-container-puppet.yaml
+++ b/deployment/neutron/neutron-ovs-agent-container-puppet.yaml
@ -131,7 +131,7 @@ conditions:
 resources:

  ContainersCommon:
-    type: ../../docker/services/containers-common.yaml
+    type: ../containers-common.yaml

  # Merging role-specific parameters (RoleParameters) with the default parameters.
  # RoleParameters will have the precedence over the default parameters.
--- a/deployment/neutron/neutron-sriov-agent-container-puppet.yaml
+++ b/deployment/neutron/neutron-sriov-agent-container-puppet.yaml
@ -107,7 +107,7 @@ resources:
              NeutronSriovAgentExtensions: {get_param: NeutronSriovAgentExtensions}

  ContainersCommon:
-    type: ./containers-common.yaml
+    type: ../containers-common.yaml

  NeutronBase:
    type: ../../puppet/services/neutron-base.yaml
--- a/deployment/nova/nova-api-container-puppet.yaml
+++ b/deployment/nova/nova-api-container-puppet.yaml
@ -137,7 +137,7 @@ conditions:
 resources:

  ContainersCommon:
-    type: ../../docker/services/containers-common.yaml
+    type: ../containers-common.yaml

  MySQLClient:
    type: ../../deployment/database/mysql-client.yaml
--- a/deployment/nova/nova-compute-container-puppet.yaml
+++ b/deployment/nova/nova-compute-container-puppet.yaml
@ -264,7 +264,7 @@ parameters:
 resources:

  ContainersCommon:
-    type: ../../docker/services/containers-common.yaml
+    type: ../containers-common.yaml

  MySQLClient:
    type: ../../deployment/database/mysql-client.yaml
--- a/deployment/nova/nova-conductor-container-puppet.yaml
+++ b/deployment/nova/nova-conductor-container-puppet.yaml
@ -65,7 +65,7 @@ conditions:
 resources:

  ContainersCommon:
-    type: ../../docker/services/containers-common.yaml
+    type: ../containers-common.yaml

  MySQLClient:
    type: ../../deployment/database/mysql-client.yaml
--- a/deployment/nova/nova-ironic-container-puppet.yaml
+++ b/deployment/nova/nova-ironic-container-puppet.yaml
@ -44,7 +44,7 @@ parameters:
 resources:

  ContainersCommon:
-    type: ../../docker/services/containers-common.yaml
+    type: ../containers-common.yaml

  MySQLClient:
    type: ../../deployment/database/mysql-client.yaml
--- a/deployment/nova/nova-libvirt-container-puppet.yaml
+++ b/deployment/nova/nova-libvirt-container-puppet.yaml
@ -291,7 +291,7 @@ resources:


  ContainersCommon:
-    type: ../../docker/services/containers-common.yaml
+    type: ../containers-common.yaml

  MySQLClient:
    type: ../../deployment/database/mysql-client.yaml
--- a/deployment/nova/nova-metadata-container-puppet.yaml
+++ b/deployment/nova/nova-metadata-container-puppet.yaml
@ -77,7 +77,7 @@ conditions:
 resources:

  ContainersCommon:
-    type: ../../docker/services/containers-common.yaml
+    type: ../containers-common.yaml

  MySQLClient:
    type: ../../deployment/database/mysql-client.yaml
--- a/deployment/nova/nova-migration-target-container-puppet.yaml
+++ b/deployment/nova/nova-migration-target-container-puppet.yaml
@ -58,7 +58,7 @@ parameters:
 resources:

  ContainersCommon:
-    type: ../../docker/services/containers-common.yaml
+    type: ../containers-common.yaml

  SshdBase:
    type: ../../deployment/sshd/sshd-baremetal-puppet.yaml
--- a/deployment/nova/nova-scheduler-container-puppet.yaml
+++ b/deployment/nova/nova-scheduler-container-puppet.yaml
@ -82,7 +82,7 @@ conditions:
 resources:

  ContainersCommon:
-    type: ../../docker/services/containers-common.yaml
+    type: ../containers-common.yaml

  MySQLClient:
    type: ../../deployment/database/mysql-client.yaml
--- a/deployment/nova/nova-vnc-proxy-container-puppet.yaml
+++ b/deployment/nova/nova-vnc-proxy-container-puppet.yaml
@ -97,7 +97,7 @@ conditions:
 resources:

  ContainersCommon:
-    type: ../../docker/services/containers-common.yaml
+    type: ../containers-common.yaml

  MySQLClient:
    type: ../../deployment/database/mysql-client.yaml
--- a/deployment/nova/novajoin-container-puppet.yaml
+++ b/deployment/nova/novajoin-container-puppet.yaml
@ -82,7 +82,7 @@ parameters:
 resources:

  ContainersCommon:
-    type: ../../docker/services/containers-common.yaml
+    type: ../containers-common.yaml

 outputs:
  role_data:
--- a/deployment/octavia/octavia-api-container-puppet.yaml
+++ b/deployment/octavia/octavia-api-container-puppet.yaml
@ -78,7 +78,7 @@ conditions:
 resources:

  ContainersCommon:
-    type: ../../docker/services/containers-common.yaml
+    type: ../containers-common.yaml

  MySQLClient:
    type: ../database/mysql-client.yaml
--- a/deployment/octavia/octavia-health-manager-container-puppet.yaml
+++ b/deployment/octavia/octavia-health-manager-container-puppet.yaml
@ -65,7 +65,7 @@ parameters:
 resources:

  ContainersCommon:
-    type: ../../docker/services/containers-common.yaml
+    type: ../containers-common.yaml

  MySQLClient:
    type: ../database/mysql-client.yaml
--- a/deployment/octavia/octavia-housekeeping-container-puppet.yaml
+++ b/deployment/octavia/octavia-housekeeping-container-puppet.yaml
@ -58,7 +58,7 @@ conditions:
 resources:

  ContainersCommon:
-    type: ../../docker/services/containers-common.yaml
+    type: ../containers-common.yaml

  MySQLClient:
    type: ../database/mysql-client.yaml
--- a/deployment/octavia/octavia-worker-container-puppet.yaml
+++ b/deployment/octavia/octavia-worker-container-puppet.yaml
@ -56,7 +56,7 @@ parameters:
 resources:

  ContainersCommon:
-    type: ../../docker/services/containers-common.yaml
+    type: ../containers-common.yaml

  MySQLClient:
    type: ../database/mysql-client.yaml
--- a/deployment/ovn/ovn-controller-container-puppet.yaml
+++ b/deployment/ovn/ovn-controller-container-puppet.yaml
@ -85,7 +85,7 @@ conditions:
 resources:

  ContainersCommon:
-    type: ../../docker/services/containers-common.yaml
+    type: ../containers-common.yaml

  # Merging role-specific parameters (RoleParameters) with the default parameters.
  # RoleParameters will have the precedence over the default parameters.
--- a/deployment/ovn/ovn-dbs-container-puppet.yaml
+++ b/deployment/ovn/ovn-dbs-container-puppet.yaml
@ -51,7 +51,7 @@ parameters:
 resources:

  ContainersCommon:
-    type: ../../docker/services/containers-common.yaml
+    type: ../containers-common.yaml

 outputs:
  role_data:
--- a/deployment/ovn/ovn-dbs-pacemaker-puppet.yaml
+++ b/deployment/ovn/ovn-dbs-pacemaker-puppet.yaml
@ -72,7 +72,7 @@ conditions:
 resources:

  ContainersCommon:
-    type: ../../docker/services/containers-common.yaml
+    type: ../containers-common.yaml

  OVNDbsBase:
    type: ./ovn-dbs-container-puppet.yaml
--- a/deployment/ovn/ovn-metadata-container-puppet.yaml
+++ b/deployment/ovn/ovn-metadata-container-puppet.yaml
@ -113,7 +113,7 @@ conditions:
 resources:

  ContainersCommon:
-    type: ../../docker/services/containers-common.yaml
+    type: ../containers-common.yaml

  NeutronBase:
    type: ../../puppet/services/neutron-base.yaml
--- a/deployment/pacemaker/clustercheck-container-puppet.yaml
+++ b/deployment/pacemaker/clustercheck-container-puppet.yaml
@ -42,7 +42,7 @@ parameters:
 resources:

  ContainersCommon:
-    type: ../../docker/services/containers-common.yaml
+    type: ../containers-common.yaml

 # We import from the corresponding docker service because otherwise we risk
 # rewriting the tripleo::mysql::firewall_rules key with the baremetal firewall
--- a/deployment/qdr/qdrouterd-container-puppet.yaml
+++ b/deployment/qdr/qdrouterd-container-puppet.yaml
@ -55,7 +55,7 @@ parameters:
 resources:

  ContainersCommon:
-    type: ../../docker/services/containers-common.yaml
+    type: ../containers-common.yaml

 outputs:
  role_data:
--- a/deployment/rabbitmq/rabbitmq-container-puppet.yaml
+++ b/deployment/rabbitmq/rabbitmq-container-puppet.yaml
@ -100,7 +100,7 @@ conditions:
 resources:

  ContainersCommon:
-    type: ../../docker/services/containers-common.yaml
+    type: ../containers-common.yaml

 outputs:
  role_data:
--- a/deployment/rabbitmq/rabbitmq-messaging-notify-container-puppet.yaml
+++ b/deployment/rabbitmq/rabbitmq-messaging-notify-container-puppet.yaml
@ -72,7 +72,7 @@ conditions:
 resources:

  ContainersCommon:
-    type: ../../docker/services/containers-common.yaml
+    type: ../containers-common.yaml

  RabbitMQServiceBase:
    type: ./rabbitmq-container-puppet.yaml
--- a/deployment/rabbitmq/rabbitmq-messaging-notify-pacemaker-puppet.yaml
+++ b/deployment/rabbitmq/rabbitmq-messaging-notify-pacemaker-puppet.yaml
@ -68,7 +68,7 @@ conditions:
 resources:

  ContainersCommon:
-    type: ../../docker/services/containers-common.yaml
+    type: ../containers-common.yaml

  RabbitmqBase:
    type: ./rabbitmq-messaging-notify-container-puppet.yaml
--- a/Show More
+++ b/Show More