diff --git a/deployment/aodh/aodh-api-container-puppet.yaml b/deployment/aodh/aodh-api-container-puppet.yaml index 9442b475ea..d412ebb024 100644 --- 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 diff --git a/deployment/aodh/aodh-evaluator-container-puppet.yaml b/deployment/aodh/aodh-evaluator-container-puppet.yaml index 7da57941b7..1d2931d58d 100644 --- 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 diff --git a/deployment/aodh/aodh-listener-container-puppet.yaml b/deployment/aodh/aodh-listener-container-puppet.yaml index c2a02b063a..5fe5a88272 100644 --- 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 diff --git a/deployment/aodh/aodh-notifier-container-puppet.yaml b/deployment/aodh/aodh-notifier-container-puppet.yaml index e730cb0ee7..a46d980c91 100644 --- 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 diff --git a/deployment/barbican/barbican-api-container-puppet.yaml b/deployment/barbican/barbican-api-container-puppet.yaml index effc806226..01189eebbb 100644 --- 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 diff --git a/deployment/cavium/liquidio-compute-config-container-puppet.yaml b/deployment/cavium/liquidio-compute-config-container-puppet.yaml index ae8f044891..52141bc6fe 100644 --- 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: diff --git a/deployment/ceilometer/ceilometer-agent-central-container-puppet.yaml b/deployment/ceilometer/ceilometer-agent-central-container-puppet.yaml index 9b4b0195b4..9aa38aeaf7 100644 --- 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 diff --git a/deployment/ceilometer/ceilometer-agent-compute-container-puppet.yaml b/deployment/ceilometer/ceilometer-agent-compute-container-puppet.yaml index 0f2e6dc820..9e1a952a23 100644 --- 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 diff --git a/deployment/ceilometer/ceilometer-agent-ipmi-container-puppet.yaml b/deployment/ceilometer/ceilometer-agent-ipmi-container-puppet.yaml index 0131e742a3..411e677491 100644 --- 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 diff --git a/deployment/ceilometer/ceilometer-agent-notification-container-puppet.yaml b/deployment/ceilometer/ceilometer-agent-notification-container-puppet.yaml index c1d0c911c6..e0a4273b31 100644 --- 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 diff --git a/deployment/cinder/cinder-api-container-puppet.yaml b/deployment/cinder/cinder-api-container-puppet.yaml index 0b4315d95e..95ee04e996 100644 --- 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 diff --git a/deployment/cinder/cinder-backup-container-puppet.yaml b/deployment/cinder/cinder-backup-container-puppet.yaml index 818dd031b6..b8dc211c70 100644 --- 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 diff --git a/deployment/cinder/cinder-backup-pacemaker-puppet.yaml b/deployment/cinder/cinder-backup-pacemaker-puppet.yaml index 16c93469d5..7856c8d6ac 100644 --- 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 diff --git a/deployment/cinder/cinder-common-container-puppet.yaml b/deployment/cinder/cinder-common-container-puppet.yaml index 68c7da7d9f..7e6c49ae2f 100644 --- 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: diff --git a/deployment/cinder/cinder-scheduler-container-puppet.yaml b/deployment/cinder/cinder-scheduler-container-puppet.yaml index dc27b91004..fd85804c8d 100644 --- 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 diff --git a/deployment/cinder/cinder-volume-container-puppet.yaml b/deployment/cinder/cinder-volume-container-puppet.yaml index fa1b1e42c0..a9dbec7ed4 100644 --- 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 diff --git a/deployment/cinder/cinder-volume-pacemaker-puppet.yaml b/deployment/cinder/cinder-volume-pacemaker-puppet.yaml index deaa7486a1..52016a23b8 100644 --- 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 diff --git a/docker/services/containers-common.yaml b/deployment/containers-common.yaml similarity index 98% rename from docker/services/containers-common.yaml rename to deployment/containers-common.yaml index 2410e1b4d6..191c65ca99 100644 --- a/docker/services/containers-common.yaml +++ b/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 diff --git a/deployment/database/mysql-pacemaker-puppet.yaml b/deployment/database/mysql-pacemaker-puppet.yaml index d7f8009c97..3ddec1a6e4 100644 --- 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 diff --git a/deployment/database/redis-container-puppet.yaml b/deployment/database/redis-container-puppet.yaml index e0eb6f935b..6b6fba79e6 100644 --- 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 diff --git a/deployment/database/redis-pacemaker-puppet.yaml b/deployment/database/redis-pacemaker-puppet.yaml index 8b66a7543e..f92d908499 100644 --- 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 diff --git a/deployment/deprecated/logging/fluentd-container-puppet.yaml b/deployment/deprecated/logging/fluentd-container-puppet.yaml index 2b686c3781..cbdfb3d974 100644 --- 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 diff --git a/deployment/deprecated/monitoring/sensu-client-container-puppet.yaml b/deployment/deprecated/monitoring/sensu-client-container-puppet.yaml index 88ac1d7ffb..4191700f58 100644 --- 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 diff --git a/deployment/deprecated/nova/nova-consoleauth-container-puppet.yaml b/deployment/deprecated/nova/nova-consoleauth-container-puppet.yaml index 6667ad104a..4aad7a3fd7 100644 --- 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 diff --git a/deployment/deprecated/nova/nova-placement-container-puppet.yaml b/deployment/deprecated/nova/nova-placement-container-puppet.yaml index bc20bf00d8..ca1abc48f5 100644 --- 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 diff --git a/deployment/deprecated/opendaylight/opendaylight-api-container-puppet.yaml b/deployment/deprecated/opendaylight/opendaylight-api-container-puppet.yaml index 539570b271..bdd50e7f35 100644 --- 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 diff --git a/deployment/deprecated/panko/panko-api-container-puppet.yaml b/deployment/deprecated/panko/panko-api-container-puppet.yaml index 2f44c26d1c..efa4dbfe5f 100644 --- 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 diff --git a/deployment/ec2/ec2-api-container-puppet.yaml b/deployment/ec2/ec2-api-container-puppet.yaml index eba8469621..bdec42f1f8 100644 --- 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 diff --git a/deployment/experimental/designate/designate-api-container-puppet.yaml b/deployment/experimental/designate/designate-api-container-puppet.yaml index 3ec8bca6e5..86ec82ff9c 100644 --- 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 diff --git a/deployment/experimental/designate/designate-central-container-puppet.yaml b/deployment/experimental/designate/designate-central-container-puppet.yaml index 76d0a3ccb8..af8d42f892 100644 --- 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 diff --git a/deployment/experimental/designate/designate-mdns-container-puppet.yaml b/deployment/experimental/designate/designate-mdns-container-puppet.yaml index 85e5ba6b6c..4a30e2c809 100644 --- 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 diff --git a/deployment/experimental/designate/designate-producer-container-puppet.yaml b/deployment/experimental/designate/designate-producer-container-puppet.yaml index 492539233b..9f7fd08a7b 100644 --- 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 diff --git a/deployment/experimental/designate/designate-sink-container-puppet.yaml b/deployment/experimental/designate/designate-sink-container-puppet.yaml index edde71fd7b..8175d1c9fc 100644 --- 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 diff --git a/deployment/experimental/designate/designate-worker-container-puppet.yaml b/deployment/experimental/designate/designate-worker-container-puppet.yaml index e6f0f6b8f0..77f5bb6e34 100644 --- 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 diff --git a/deployment/glance/glance-api-container-puppet.yaml b/deployment/glance/glance-api-container-puppet.yaml index 40926d557a..773a3e1730 100644 --- 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 diff --git a/deployment/gnocchi/gnocchi-api-container-puppet.yaml b/deployment/gnocchi/gnocchi-api-container-puppet.yaml index c658d36e0b..809d6cbe1d 100644 --- 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 diff --git a/deployment/gnocchi/gnocchi-metricd-container-puppet.yaml b/deployment/gnocchi/gnocchi-metricd-container-puppet.yaml index a1b21adb58..78a9feafff 100644 --- 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 diff --git a/deployment/gnocchi/gnocchi-statsd-container-puppet.yaml b/deployment/gnocchi/gnocchi-statsd-container-puppet.yaml index 15841d9d4e..4a23dd0155 100644 --- 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 diff --git a/deployment/haproxy/haproxy-container-puppet.yaml b/deployment/haproxy/haproxy-container-puppet.yaml index 6d8df792ee..773558a681 100644 --- 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 diff --git a/deployment/haproxy/haproxy-pacemaker-puppet.yaml b/deployment/haproxy/haproxy-pacemaker-puppet.yaml index bf8415ff4e..c1c82695fb 100644 --- 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 diff --git a/deployment/heat/heat-api-cfn-container-puppet.yaml b/deployment/heat/heat-api-cfn-container-puppet.yaml index 9efd190275..1d9abcd182 100644 --- 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 diff --git a/deployment/heat/heat-api-container-puppet.yaml b/deployment/heat/heat-api-container-puppet.yaml index eae7051f6c..8cb52cf9e0 100644 --- 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 diff --git a/deployment/heat/heat-engine-container-puppet.yaml b/deployment/heat/heat-engine-container-puppet.yaml index c97907622f..7409f1101a 100644 --- 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 diff --git a/deployment/horizon/horizon-container-puppet.yaml b/deployment/horizon/horizon-container-puppet.yaml index ca6381bb26..bc6ce994dc 100644 --- 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: diff --git a/deployment/ironic/ironic-api-container-puppet.yaml b/deployment/ironic/ironic-api-container-puppet.yaml index 61964bae2e..b608e4fcff 100644 --- 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 diff --git a/deployment/ironic/ironic-conductor-container-puppet.yaml b/deployment/ironic/ironic-conductor-container-puppet.yaml index 9badf6a864..38dbfc9fb2 100644 --- 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 diff --git a/deployment/ironic/ironic-inspector-container-puppet.yaml b/deployment/ironic/ironic-inspector-container-puppet.yaml index 96864aa8ef..a75ecb0705 100644 --- 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 diff --git a/deployment/ironic/ironic-neutron-agent-container-puppet.yaml b/deployment/ironic/ironic-neutron-agent-container-puppet.yaml index a0d69003ac..27692694aa 100644 --- 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: diff --git a/deployment/ironic/ironic-pxe-container-puppet.yaml b/deployment/ironic/ironic-pxe-container-puppet.yaml index 22904e563b..a39a335e2e 100644 --- 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: diff --git a/deployment/iscsid/iscsid-container-puppet.yaml b/deployment/iscsid/iscsid-container-puppet.yaml index 944c0a6fa7..becba23f9b 100644 --- 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: diff --git a/deployment/keepalived/keepalived-container-puppet.yaml b/deployment/keepalived/keepalived-container-puppet.yaml index 4985c7e944..77aeb62737 100644 --- 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: diff --git a/deployment/keystone/keystone-container-puppet.yaml b/deployment/keystone/keystone-container-puppet.yaml index b5d3efd866..c13cff8125 100644 --- 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 diff --git a/deployment/logging/rsyslog-sidecar-container-puppet.yaml b/deployment/logging/rsyslog-sidecar-container-puppet.yaml index c778cc687b..fcbee6ddaf 100644 --- 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: diff --git a/deployment/logrotate/logrotate-crond-container-puppet.yaml b/deployment/logrotate/logrotate-crond-container-puppet.yaml index 2db870ff7d..977119d078 100644 --- 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. diff --git a/deployment/manila/manila-api-container-puppet.yaml b/deployment/manila/manila-api-container-puppet.yaml index 8631910f35..ada5dc814b 100644 --- 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 diff --git a/deployment/manila/manila-scheduler-container-puppet.yaml b/deployment/manila/manila-scheduler-container-puppet.yaml index 054c414267..0ebeeca6b8 100644 --- 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 diff --git a/deployment/manila/manila-share-common.yaml b/deployment/manila/manila-share-common.yaml index 3955b93655..2713a5cbaa 100644 --- 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: diff --git a/deployment/manila/manila-share-container-puppet.yaml b/deployment/manila/manila-share-container-puppet.yaml index efd62ff73a..c1bd7dc947 100644 --- 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 diff --git a/deployment/manila/manila-share-pacemaker-puppet.yaml b/deployment/manila/manila-share-pacemaker-puppet.yaml index f89430ab8a..ecead2408e 100644 --- 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 diff --git a/deployment/memcached/memcached-container-puppet.yaml b/deployment/memcached/memcached-container-puppet.yaml index d06f58aad8..9eaa2c37e7 100644 --- 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: diff --git a/deployment/messaging/rpc-qdrouterd-container-puppet.yaml b/deployment/messaging/rpc-qdrouterd-container-puppet.yaml index d7d6b44dcb..a5f4cd0e89 100644 --- 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: diff --git a/deployment/metrics/collectd-container-puppet.yaml b/deployment/metrics/collectd-container-puppet.yaml index 12e6243f9f..e556c3f9dc 100644 --- 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: diff --git a/deployment/metrics/qdr-container-puppet.yaml b/deployment/metrics/qdr-container-puppet.yaml index 41dc50e3b1..c8ab0d3575 100644 --- 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: diff --git a/deployment/mistral/mistral-api-container-puppet.yaml b/deployment/mistral/mistral-api-container-puppet.yaml index 805787b19e..59d041e851 100644 --- 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 diff --git a/deployment/mistral/mistral-engine-container-puppet.yaml b/deployment/mistral/mistral-engine-container-puppet.yaml index 22251a0747..0d34759919 100644 --- 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 diff --git a/deployment/mistral/mistral-event-engine-container-puppet.yaml b/deployment/mistral/mistral-event-engine-container-puppet.yaml index 497a32b69d..41392ce18b 100644 --- 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 diff --git a/deployment/mistral/mistral-executor-container-puppet.yaml b/deployment/mistral/mistral-executor-container-puppet.yaml index 6c396c8535..dee0b66569 100644 --- 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 diff --git a/deployment/multipathd/multipathd-container.yaml b/deployment/multipathd/multipathd-container.yaml index fa5d2d4244..1f8a56e802 100644 --- 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: diff --git a/deployment/neutron/neutron-api-container-puppet.yaml b/deployment/neutron/neutron-api-container-puppet.yaml index 1bac40baaf..d88b514f46 100644 --- 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 diff --git a/deployment/neutron/neutron-bgpvpn-api-container-puppet.yaml b/deployment/neutron/neutron-bgpvpn-api-container-puppet.yaml index d5d18d6442..d96e589eb5 100644 --- 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: diff --git a/deployment/neutron/neutron-dhcp-container-puppet.yaml b/deployment/neutron/neutron-dhcp-container-puppet.yaml index 3ef7036f1f..8d617a5807 100644 --- 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 diff --git a/deployment/neutron/neutron-l2gw-api-container-puppet.yaml b/deployment/neutron/neutron-l2gw-api-container-puppet.yaml index dec2939cd8..836c847f6c 100644 --- 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: diff --git a/deployment/neutron/neutron-l3-container-puppet.yaml b/deployment/neutron/neutron-l3-container-puppet.yaml index 58e7c7b4a1..1ee233f431 100644 --- 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 diff --git a/deployment/neutron/neutron-lbaas-api-container-puppet.yaml b/deployment/neutron/neutron-lbaas-api-container-puppet.yaml index 678994aa48..9d081fb4ed 100644 --- 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: diff --git a/deployment/neutron/neutron-metadata-container-puppet.yaml b/deployment/neutron/neutron-metadata-container-puppet.yaml index b211436442..75ea4c10c0 100644 --- 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 diff --git a/deployment/neutron/neutron-ovs-agent-container-puppet.yaml b/deployment/neutron/neutron-ovs-agent-container-puppet.yaml index f17cf3ba21..69bf2d97af 100644 --- 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. diff --git a/deployment/neutron/neutron-sriov-agent-container-puppet.yaml b/deployment/neutron/neutron-sriov-agent-container-puppet.yaml index e3b869efdb..32d46ad9fd 100644 --- 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 diff --git a/deployment/nova/nova-api-container-puppet.yaml b/deployment/nova/nova-api-container-puppet.yaml index e8dbf672e7..e7059944b2 100644 --- 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 diff --git a/deployment/nova/nova-compute-container-puppet.yaml b/deployment/nova/nova-compute-container-puppet.yaml index 2e0f520a43..960d3fce91 100644 --- 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 diff --git a/deployment/nova/nova-conductor-container-puppet.yaml b/deployment/nova/nova-conductor-container-puppet.yaml index ce86d76c05..24844259ec 100644 --- 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 diff --git a/deployment/nova/nova-ironic-container-puppet.yaml b/deployment/nova/nova-ironic-container-puppet.yaml index abadcfdac6..48076933fe 100644 --- 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 diff --git a/deployment/nova/nova-libvirt-container-puppet.yaml b/deployment/nova/nova-libvirt-container-puppet.yaml index a5230bbe6a..1eb5b2d57a 100644 --- 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 diff --git a/deployment/nova/nova-metadata-container-puppet.yaml b/deployment/nova/nova-metadata-container-puppet.yaml index b97744351d..29a78b8b60 100644 --- 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 diff --git a/deployment/nova/nova-migration-target-container-puppet.yaml b/deployment/nova/nova-migration-target-container-puppet.yaml index 63bceaae5f..f109872937 100644 --- 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 diff --git a/deployment/nova/nova-scheduler-container-puppet.yaml b/deployment/nova/nova-scheduler-container-puppet.yaml index 3876dc4a96..445a49b373 100644 --- 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 diff --git a/deployment/nova/nova-vnc-proxy-container-puppet.yaml b/deployment/nova/nova-vnc-proxy-container-puppet.yaml index ad8850a69b..3b73aa1864 100644 --- 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 diff --git a/deployment/nova/novajoin-container-puppet.yaml b/deployment/nova/novajoin-container-puppet.yaml index f52e62dd1c..1fda781f36 100644 --- 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: diff --git a/deployment/octavia/octavia-api-container-puppet.yaml b/deployment/octavia/octavia-api-container-puppet.yaml index f98be698ca..da435dbd00 100644 --- 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 diff --git a/deployment/octavia/octavia-health-manager-container-puppet.yaml b/deployment/octavia/octavia-health-manager-container-puppet.yaml index 151e1828a5..abb3e71fcf 100644 --- 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 diff --git a/deployment/octavia/octavia-housekeeping-container-puppet.yaml b/deployment/octavia/octavia-housekeeping-container-puppet.yaml index f0b2984925..17aebe7a5b 100644 --- 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 diff --git a/deployment/octavia/octavia-worker-container-puppet.yaml b/deployment/octavia/octavia-worker-container-puppet.yaml index 10856feb7f..e6a0e19994 100644 --- 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 diff --git a/deployment/ovn/ovn-controller-container-puppet.yaml b/deployment/ovn/ovn-controller-container-puppet.yaml index 8c62ad8368..87b456930e 100644 --- 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. diff --git a/deployment/ovn/ovn-dbs-container-puppet.yaml b/deployment/ovn/ovn-dbs-container-puppet.yaml index fdcaea8a6a..ab3ed7db1e 100644 --- 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: diff --git a/deployment/ovn/ovn-dbs-pacemaker-puppet.yaml b/deployment/ovn/ovn-dbs-pacemaker-puppet.yaml index 0ede5cf426..7e271ce5c1 100644 --- 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 diff --git a/deployment/ovn/ovn-metadata-container-puppet.yaml b/deployment/ovn/ovn-metadata-container-puppet.yaml index 125c02b359..c8112b0fd3 100644 --- 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 diff --git a/deployment/pacemaker/clustercheck-container-puppet.yaml b/deployment/pacemaker/clustercheck-container-puppet.yaml index 04e0055fc8..ccf6270fb5 100644 --- 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 diff --git a/deployment/qdr/qdrouterd-container-puppet.yaml b/deployment/qdr/qdrouterd-container-puppet.yaml index 3de0581437..58e2b6b130 100644 --- 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: diff --git a/deployment/rabbitmq/rabbitmq-container-puppet.yaml b/deployment/rabbitmq/rabbitmq-container-puppet.yaml index 0c59dcce04..1f1edbb4d2 100644 --- 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: diff --git a/deployment/rabbitmq/rabbitmq-messaging-notify-container-puppet.yaml b/deployment/rabbitmq/rabbitmq-messaging-notify-container-puppet.yaml index 9ef0699bbd..42e1ba97bb 100644 --- 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 diff --git a/deployment/rabbitmq/rabbitmq-messaging-notify-pacemaker-puppet.yaml b/deployment/rabbitmq/rabbitmq-messaging-notify-pacemaker-puppet.yaml index 656098895d..f64e3415cc 100644 --- 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 diff --git a/deployment/rabbitmq/rabbitmq-messaging-notify-shared-puppet.yaml b/deployment/rabbitmq/rabbitmq-messaging-notify-shared-puppet.yaml index 532a2cf963..4262459ead 100644 --- a/deployment/rabbitmq/rabbitmq-messaging-notify-shared-puppet.yaml +++ b/deployment/rabbitmq/rabbitmq-messaging-notify-shared-puppet.yaml @@ -52,7 +52,7 @@ parameters: resources: ContainersCommon: - type: ../../docker/services/containers-common.yaml + type: ../containers-common.yaml outputs: role_data: diff --git a/deployment/rabbitmq/rabbitmq-messaging-pacemaker-puppet.yaml b/deployment/rabbitmq/rabbitmq-messaging-pacemaker-puppet.yaml index 8eb6c17267..a9c0e0e163 100644 --- a/deployment/rabbitmq/rabbitmq-messaging-pacemaker-puppet.yaml +++ b/deployment/rabbitmq/rabbitmq-messaging-pacemaker-puppet.yaml @@ -68,7 +68,7 @@ conditions: resources: ContainersCommon: - type: ../../docker/services/containers-common.yaml + type: ../containers-common.yaml RabbitMQServiceBase: type: ./rabbitmq-container-puppet.yaml diff --git a/deployment/rabbitmq/rabbitmq-messaging-rpc-container-puppet.yaml b/deployment/rabbitmq/rabbitmq-messaging-rpc-container-puppet.yaml index 22120e6f49..52de8cb9ce 100644 --- a/deployment/rabbitmq/rabbitmq-messaging-rpc-container-puppet.yaml +++ b/deployment/rabbitmq/rabbitmq-messaging-rpc-container-puppet.yaml @@ -73,7 +73,7 @@ conditions: resources: ContainersCommon: - type: ../../docker/services/containers-common.yaml + type: ../containers-common.yaml RabbitMQServiceBase: type: ./rabbitmq-container-puppet.yaml diff --git a/deployment/rabbitmq/rabbitmq-messaging-rpc-pacemaker-puppet.yaml b/deployment/rabbitmq/rabbitmq-messaging-rpc-pacemaker-puppet.yaml index 9d101178ab..66268b7ac7 100644 --- a/deployment/rabbitmq/rabbitmq-messaging-rpc-pacemaker-puppet.yaml +++ b/deployment/rabbitmq/rabbitmq-messaging-rpc-pacemaker-puppet.yaml @@ -68,7 +68,7 @@ conditions: resources: ContainersCommon: - type: ../../docker/services/containers-common.yaml + type: ../containers-common.yaml RabbitmqBase: type: ./rabbitmq-messaging-rpc-container-puppet.yaml diff --git a/deployment/sahara/sahara-api-container-puppet.yaml b/deployment/sahara/sahara-api-container-puppet.yaml index f997971bea..771f8ca737 100644 --- a/deployment/sahara/sahara-api-container-puppet.yaml +++ b/deployment/sahara/sahara-api-container-puppet.yaml @@ -66,7 +66,7 @@ parameters: resources: ContainersCommon: - type: ../../docker/services/containers-common.yaml + type: ../containers-common.yaml MySQLClient: type: ../database/mysql-client.yaml diff --git a/deployment/sahara/sahara-engine-container-puppet.yaml b/deployment/sahara/sahara-engine-container-puppet.yaml index fb82e55a32..bfc83e3708 100644 --- a/deployment/sahara/sahara-engine-container-puppet.yaml +++ b/deployment/sahara/sahara-engine-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 diff --git a/deployment/swift/swift-proxy-container-puppet.yaml b/deployment/swift/swift-proxy-container-puppet.yaml index acba8d12db..3800f619e1 100644 --- a/deployment/swift/swift-proxy-container-puppet.yaml +++ b/deployment/swift/swift-proxy-container-puppet.yaml @@ -124,7 +124,7 @@ conditions: resources: ContainersCommon: - type: ../../docker/services/containers-common.yaml + type: ../containers-common.yaml SwiftBase: type: ./swift-base.yaml diff --git a/deployment/swift/swift-storage-container-puppet.yaml b/deployment/swift/swift-storage-container-puppet.yaml index 31e6ae8e85..143e197502 100644 --- a/deployment/swift/swift-storage-container-puppet.yaml +++ b/deployment/swift/swift-storage-container-puppet.yaml @@ -111,7 +111,7 @@ conditions: resources: ContainersCommon: - type: ../../docker/services/containers-common.yaml + type: ../containers-common.yaml SwiftBase: type: ./swift-base.yaml diff --git a/deployment/tacker/tacker-container-puppet.yaml b/deployment/tacker/tacker-container-puppet.yaml index cc12b798d8..3cc764f780 100644 --- a/deployment/tacker/tacker-container-puppet.yaml +++ b/deployment/tacker/tacker-container-puppet.yaml @@ -102,7 +102,7 @@ conditions: resources: ContainersCommon: - type: ../../docker/services/containers-common.yaml + type: ../containers-common.yaml MySQLClient: type: ../database/mysql-client.yaml diff --git a/deployment/zaqar/zaqar-container-puppet.yaml b/deployment/zaqar/zaqar-container-puppet.yaml index 1dfc75d6c2..f295b90006 100644 --- a/deployment/zaqar/zaqar-container-puppet.yaml +++ b/deployment/zaqar/zaqar-container-puppet.yaml @@ -100,7 +100,7 @@ resources: EnableInternalTLS: {get_param: EnableInternalTLS} ContainersCommon: - type: ../../docker/services/containers-common.yaml + type: ../containers-common.yaml MySQLClient: type: ../database/mysql-client.yaml