Browse Source

Move containers-common.yaml into deployment

Change-Id: I8cc27cd8ed76a1e124cbb54c938bb86332956ac2
Related-Blueprint: services-yaml-flattening
changes/71/650371/5
Dan Prince 3 years ago
parent
commit
a52498ab4d
  1. 2
      deployment/aodh/aodh-api-container-puppet.yaml
  2. 2
      deployment/aodh/aodh-evaluator-container-puppet.yaml
  3. 2
      deployment/aodh/aodh-listener-container-puppet.yaml
  4. 2
      deployment/aodh/aodh-notifier-container-puppet.yaml
  5. 2
      deployment/barbican/barbican-api-container-puppet.yaml
  6. 2
      deployment/cavium/liquidio-compute-config-container-puppet.yaml
  7. 2
      deployment/ceilometer/ceilometer-agent-central-container-puppet.yaml
  8. 2
      deployment/ceilometer/ceilometer-agent-compute-container-puppet.yaml
  9. 2
      deployment/ceilometer/ceilometer-agent-ipmi-container-puppet.yaml
  10. 2
      deployment/ceilometer/ceilometer-agent-notification-container-puppet.yaml
  11. 2
      deployment/cinder/cinder-api-container-puppet.yaml
  12. 2
      deployment/cinder/cinder-backup-container-puppet.yaml
  13. 2
      deployment/cinder/cinder-backup-pacemaker-puppet.yaml
  14. 2
      deployment/cinder/cinder-common-container-puppet.yaml
  15. 2
      deployment/cinder/cinder-scheduler-container-puppet.yaml
  16. 2
      deployment/cinder/cinder-volume-container-puppet.yaml
  17. 2
      deployment/cinder/cinder-volume-pacemaker-puppet.yaml
  18. 2
      deployment/containers-common.yaml
  19. 2
      deployment/database/mysql-pacemaker-puppet.yaml
  20. 2
      deployment/database/redis-container-puppet.yaml
  21. 2
      deployment/database/redis-pacemaker-puppet.yaml
  22. 2
      deployment/deprecated/logging/fluentd-container-puppet.yaml
  23. 2
      deployment/deprecated/monitoring/sensu-client-container-puppet.yaml
  24. 2
      deployment/deprecated/nova/nova-consoleauth-container-puppet.yaml
  25. 2
      deployment/deprecated/nova/nova-placement-container-puppet.yaml
  26. 2
      deployment/deprecated/opendaylight/opendaylight-api-container-puppet.yaml
  27. 2
      deployment/deprecated/panko/panko-api-container-puppet.yaml
  28. 2
      deployment/ec2/ec2-api-container-puppet.yaml
  29. 2
      deployment/experimental/designate/designate-api-container-puppet.yaml
  30. 2
      deployment/experimental/designate/designate-central-container-puppet.yaml
  31. 2
      deployment/experimental/designate/designate-mdns-container-puppet.yaml
  32. 2
      deployment/experimental/designate/designate-producer-container-puppet.yaml
  33. 2
      deployment/experimental/designate/designate-sink-container-puppet.yaml
  34. 2
      deployment/experimental/designate/designate-worker-container-puppet.yaml
  35. 2
      deployment/glance/glance-api-container-puppet.yaml
  36. 2
      deployment/gnocchi/gnocchi-api-container-puppet.yaml
  37. 2
      deployment/gnocchi/gnocchi-metricd-container-puppet.yaml
  38. 2
      deployment/gnocchi/gnocchi-statsd-container-puppet.yaml
  39. 2
      deployment/haproxy/haproxy-container-puppet.yaml
  40. 2
      deployment/haproxy/haproxy-pacemaker-puppet.yaml
  41. 2
      deployment/heat/heat-api-cfn-container-puppet.yaml
  42. 2
      deployment/heat/heat-api-container-puppet.yaml
  43. 2
      deployment/heat/heat-engine-container-puppet.yaml
  44. 2
      deployment/horizon/horizon-container-puppet.yaml
  45. 2
      deployment/ironic/ironic-api-container-puppet.yaml
  46. 2
      deployment/ironic/ironic-conductor-container-puppet.yaml
  47. 2
      deployment/ironic/ironic-inspector-container-puppet.yaml
  48. 2
      deployment/ironic/ironic-neutron-agent-container-puppet.yaml
  49. 2
      deployment/ironic/ironic-pxe-container-puppet.yaml
  50. 2
      deployment/iscsid/iscsid-container-puppet.yaml
  51. 2
      deployment/keepalived/keepalived-container-puppet.yaml
  52. 2
      deployment/keystone/keystone-container-puppet.yaml
  53. 2
      deployment/logging/rsyslog-sidecar-container-puppet.yaml
  54. 2
      deployment/logrotate/logrotate-crond-container-puppet.yaml
  55. 2
      deployment/manila/manila-api-container-puppet.yaml
  56. 2
      deployment/manila/manila-scheduler-container-puppet.yaml
  57. 2
      deployment/manila/manila-share-common.yaml
  58. 2
      deployment/manila/manila-share-container-puppet.yaml
  59. 2
      deployment/manila/manila-share-pacemaker-puppet.yaml
  60. 2
      deployment/memcached/memcached-container-puppet.yaml
  61. 2
      deployment/messaging/rpc-qdrouterd-container-puppet.yaml
  62. 2
      deployment/metrics/collectd-container-puppet.yaml
  63. 2
      deployment/metrics/qdr-container-puppet.yaml
  64. 2
      deployment/mistral/mistral-api-container-puppet.yaml
  65. 2
      deployment/mistral/mistral-engine-container-puppet.yaml
  66. 2
      deployment/mistral/mistral-event-engine-container-puppet.yaml
  67. 2
      deployment/mistral/mistral-executor-container-puppet.yaml
  68. 2
      deployment/multipathd/multipathd-container.yaml
  69. 2
      deployment/neutron/neutron-api-container-puppet.yaml
  70. 2
      deployment/neutron/neutron-bgpvpn-api-container-puppet.yaml
  71. 2
      deployment/neutron/neutron-dhcp-container-puppet.yaml
  72. 2
      deployment/neutron/neutron-l2gw-api-container-puppet.yaml
  73. 2
      deployment/neutron/neutron-l3-container-puppet.yaml
  74. 2
      deployment/neutron/neutron-lbaas-api-container-puppet.yaml
  75. 2
      deployment/neutron/neutron-metadata-container-puppet.yaml
  76. 2
      deployment/neutron/neutron-ovs-agent-container-puppet.yaml
  77. 2
      deployment/neutron/neutron-sriov-agent-container-puppet.yaml
  78. 2
      deployment/nova/nova-api-container-puppet.yaml
  79. 2
      deployment/nova/nova-compute-container-puppet.yaml
  80. 2
      deployment/nova/nova-conductor-container-puppet.yaml
  81. 2
      deployment/nova/nova-ironic-container-puppet.yaml
  82. 2
      deployment/nova/nova-libvirt-container-puppet.yaml
  83. 2
      deployment/nova/nova-metadata-container-puppet.yaml
  84. 2
      deployment/nova/nova-migration-target-container-puppet.yaml
  85. 2
      deployment/nova/nova-scheduler-container-puppet.yaml
  86. 2
      deployment/nova/nova-vnc-proxy-container-puppet.yaml
  87. 2
      deployment/nova/novajoin-container-puppet.yaml
  88. 2
      deployment/octavia/octavia-api-container-puppet.yaml
  89. 2
      deployment/octavia/octavia-health-manager-container-puppet.yaml
  90. 2
      deployment/octavia/octavia-housekeeping-container-puppet.yaml
  91. 2
      deployment/octavia/octavia-worker-container-puppet.yaml
  92. 2
      deployment/ovn/ovn-controller-container-puppet.yaml
  93. 2
      deployment/ovn/ovn-dbs-container-puppet.yaml
  94. 2
      deployment/ovn/ovn-dbs-pacemaker-puppet.yaml
  95. 2
      deployment/ovn/ovn-metadata-container-puppet.yaml
  96. 2
      deployment/pacemaker/clustercheck-container-puppet.yaml
  97. 2
      deployment/qdr/qdrouterd-container-puppet.yaml
  98. 2
      deployment/rabbitmq/rabbitmq-container-puppet.yaml
  99. 2
      deployment/rabbitmq/rabbitmq-messaging-notify-container-puppet.yaml
  100. 2
      deployment/rabbitmq/rabbitmq-messaging-notify-pacemaker-puppet.yaml

2
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

2
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

2
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

2
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

2
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

2
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:

2
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

2
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

2
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

2
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

2
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

2
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

2
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

2
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:

2
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

2
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

2
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

2
docker/services/containers-common.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

2
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

2
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

2
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

2
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

2
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

2
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

2
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

2
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

2
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

2
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

2
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

2
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

2
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

2
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

2
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

2
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

2
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

2
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

2
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

2
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

2
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

2
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

2
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

2
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

2
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

2
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:

2
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

2
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

2
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

2
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:

2
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:

2
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:

2
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:

2
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

2
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:

2
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.

2
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

2
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

2
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:

2
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

2
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

2
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:

2
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:

2
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:

2
deployment/metrics/qdr-container-puppet.yaml

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

2
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

2
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

2
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

2
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

2
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:

2
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

2
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:

2
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

2
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:

2
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

2
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:

2
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

2
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.

2
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

2
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

2
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

2
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

2
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

2
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

2
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

2
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

2
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

2
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

2
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:

2
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

2
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

2
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

2
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

2
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.

2
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:

2
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

2
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

2
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

2
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:

2
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:

2
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

2
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

Some files were not shown because too many files changed in this diff

Loading…
Cancel
Save