Merge "Move containers-common.yaml into deployment"

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

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

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

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

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

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:

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

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

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

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

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

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

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

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:

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

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

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

deployment/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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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:

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

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

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

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:

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:

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:

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:

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

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:

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.

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

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

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:

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

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

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:

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:

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:

deployment/metrics/qdr-container-puppet.yaml

@@ -128,7 +128,7 @@ parameters:
 
 resources:
   ContainersCommon:
-    type: ../../docker/services/containers-common.yaml
+    type: ../containers-common.yaml
 
 
 outputs:

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

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

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

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

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:

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

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:

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

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:

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

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:

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

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.

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

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

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

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

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

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

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

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

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

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

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:

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

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

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

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

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.

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:

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

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

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

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:

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:

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

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