Merge "Move containers-common.yaml into deployment"

This commit is contained in:
Zuul 2019-04-15 17:57:15 +00:00 committed by Gerrit Code Review
commit 0cc714d31a
110 changed files with 110 additions and 110 deletions

View File

@ -60,7 +60,7 @@ conditions:
resources:
ContainersCommon:
type: ../../docker/services/containers-common.yaml
type: ../containers-common.yaml
MySQLClient:
type: ../database/mysql-client.yaml

View File

@ -43,7 +43,7 @@ parameters:
resources:
ContainersCommon:
type: ../../docker/services/containers-common.yaml
type: ../containers-common.yaml
MySQLClient:
type: ../database/mysql-client.yaml

View File

@ -43,7 +43,7 @@ parameters:
resources:
ContainersCommon:
type: ../../docker/services/containers-common.yaml
type: ../containers-common.yaml
MySQLClient:
type: ../database/mysql-client.yaml

View File

@ -43,7 +43,7 @@ parameters:
resources:
ContainersCommon:
type: ../../docker/services/containers-common.yaml
type: ../containers-common.yaml
MySQLClient:
type: ../database/mysql-client.yaml

View File

@ -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

View File

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

View File

@ -52,7 +52,7 @@ parameters:
resources:
ContainersCommon:
type: ../../docker/services/containers-common.yaml
type: ../containers-common.yaml
CeilometerServiceBase:
type: ./ceilometer-base-container-puppet.yaml

View File

@ -57,7 +57,7 @@ parameters:
resources:
ContainersCommon:
type: ../../docker/services/containers-common.yaml
type: ../containers-common.yaml
CeilometerServiceBase:
type: ./ceilometer-base-container-puppet.yaml

View File

@ -52,7 +52,7 @@ parameters:
resources:
ContainersCommon:
type: ../../docker/services/containers-common.yaml
type: ../containers-common.yaml
CeilometerServiceBase:
type: ./ceilometer-base-container-puppet.yaml

View File

@ -56,7 +56,7 @@ parameters:
resources:
ContainersCommon:
type: ../../docker/services/containers-common.yaml
type: ../containers-common.yaml
CeilometerServiceBase:
type: ./ceilometer-base-container-puppet.yaml

View File

@ -87,7 +87,7 @@ conditions:
resources:
ContainersCommon:
type: ../../docker/services/containers-common.yaml
type: ../containers-common.yaml
MySQLClient:
type: ../database/mysql-client.yaml

View File

@ -90,7 +90,7 @@ parameters:
resources:
ContainersCommon:
type: ../../docker/services/containers-common.yaml
type: ../containers-common.yaml
MySQLClient:
type: ../database/mysql-client.yaml

View File

@ -81,7 +81,7 @@ conditions:
resources:
ContainersCommon:
type: ../../docker/services/containers-common.yaml
type: ../containers-common.yaml
MySQLClient:
type: ../database/mysql-client.yaml

View File

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

View File

@ -48,7 +48,7 @@ parameters:
resources:
ContainersCommon:
type: ../../docker/services/containers-common.yaml
type: ../containers-common.yaml
MySQLClient:
type: ../database/mysql-client.yaml

View File

@ -161,7 +161,7 @@ parameters:
resources:
ContainersCommon:
type: ../../docker/services/containers-common.yaml
type: ../containers-common.yaml
MySQLClient:
type: ../database/mysql-client.yaml

View File

@ -69,7 +69,7 @@ conditions:
resources:
ContainersCommon:
type: ../../docker/services/containers-common.yaml
type: ../containers-common.yaml
MySQLClient:
type: ../database/mysql-client.yaml

View File

@ -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

View File

@ -82,7 +82,7 @@ parameters:
resources:
ContainersCommon:
type: ../../docker/services/containers-common.yaml
type: ../containers-common.yaml
MysqlBase:
type: ./mysql-base.yaml

View File

@ -47,7 +47,7 @@ conditions:
resources:
ContainersCommon:
type: ../../docker/services/containers-common.yaml
type: ../containers-common.yaml
RedisBase:
type: ./redis-base-puppet.yaml

View File

@ -73,7 +73,7 @@ conditions:
resources:
ContainersCommon:
type: ../../docker/services/containers-common.yaml
type: ../containers-common.yaml
RedisBase:
type: ./redis-container-puppet.yaml

View File

@ -41,7 +41,7 @@ parameters:
resources:
ContainersCommon:
type: ../../../docker/services/containers-common.yaml
type: ../../containers-common.yaml
LoggingConfiguration:
type: OS::TripleO::LoggingConfiguration

View File

@ -93,7 +93,7 @@ conditions:
resources:
ContainersCommon:
type: ../containers-common.yaml
type: ../../containers-common.yaml
SensuBase:
type: ./sensu-base.yaml

View File

@ -52,7 +52,7 @@ parameters:
resources:
ContainersCommon:
type: ../../../docker/services/containers-common.yaml
type: ../../containers-common.yaml
MySQLClient:
type: ../../../deployment/database/mysql-client.yaml

View File

@ -70,7 +70,7 @@ conditions:
resources:
ContainersCommon:
type: ../../../docker/services/containers-common.yaml
type: ../../containers-common.yaml
MySQLClient:
type: ../../../deployment/database/mysql-client.yaml

View File

@ -116,7 +116,7 @@ conditions:
resources:
ContainersCommon:
type: ../../../docker/services/containers-common.yaml
type: ../../containers-common.yaml
OpenDaylightApiLogging:
type: OS::TripleO::Services::Logging::OpenDaylightApi

View File

@ -109,7 +109,7 @@ conditions:
resources:
ContainersCommon:
type: ../../../docker/services/containers-common.yaml
type: ../../containers-common.yaml
MySQLClient:
type: ../../database/mysql-client.yaml

View File

@ -89,7 +89,7 @@ conditions:
resources:
ContainersCommon:
type: ../../docker/services/containers-common.yaml
type: ../containers-common.yaml
MySQLClient:
type: ../../deployment/database/mysql-client.yaml

View File

@ -62,7 +62,7 @@ conditions:
resources:
ContainersCommon:
type: ../../../docker/services/containers-common.yaml
type: ../../containers-common.yaml
DesignateBase:
type: ./designate-base.yaml

View File

@ -57,7 +57,7 @@ conditions:
resources:
ContainersCommon:
type: ../../../docker/services/containers-common.yaml
type: ../../containers-common.yaml
MySQLClient:
type: ../../database/mysql-client.yaml

View File

@ -54,7 +54,7 @@ conditions:
resources:
ContainersCommon:
type: ../../../docker/services/containers-common.yaml
type: ../../containers-common.yaml
MySQLClient:
type: ../../database/mysql-client.yaml

View File

@ -55,7 +55,7 @@ conditions:
resources:
ContainersCommon:
type: ../../../docker/services/containers-common.yaml
type: ../../containers-common.yaml
DesignateBase:
type: ./designate-base.yaml

View File

@ -50,7 +50,7 @@ conditions:
resources:
ContainersCommon:
type: ../../../docker/services/containers-common.yaml
type: ../../containers-common.yaml
DesignateBase:
type: ./designate-base.yaml

View File

@ -62,7 +62,7 @@ conditions:
resources:
ContainersCommon:
type: ../../../docker/services/containers-common.yaml
type: ../../containers-common.yaml
DesignateBase:
type: ./designate-base.yaml

View File

@ -257,7 +257,7 @@ conditions:
resources:
ContainersCommon:
type: ../../docker/services/containers-common.yaml
type: ../containers-common.yaml
MySQLClient:
type: ../database/mysql-client.yaml

View File

@ -114,7 +114,7 @@ conditions:
resources:
ContainersCommon:
type: ../../docker/services/containers-common.yaml
type: ../containers-common.yaml
GnocchiServiceBase:
type: ./gnocchi-base.yaml

View File

@ -68,7 +68,7 @@ parameters:
resources:
ContainersCommon:
type: ../../docker/services/containers-common.yaml
type: ../containers-common.yaml
MySQLClient:
type: ../../deployment/database/mysql-client.yaml

View File

@ -60,7 +60,7 @@ parameters:
resources:
ContainersCommon:
type: ../../docker/services/containers-common.yaml
type: ../containers-common.yaml
MySQLClient:
type: ../../deployment/database/mysql-client.yaml

View File

@ -123,7 +123,7 @@ conditions:
resources:
ContainersCommon:
type: ../../docker/services/containers-common.yaml
type: ../containers-common.yaml
HAProxyLogging:
type: OS::TripleO::Services::Logging::HAProxy

View File

@ -118,7 +118,7 @@ conditions:
resources:
ContainersCommon:
type: ../../docker/services/containers-common.yaml
type: ../containers-common.yaml
HAProxyBase:
type: ./haproxy-container-puppet.yaml

View File

@ -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

View File

@ -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

View File

@ -104,7 +104,7 @@ conditions:
resources:
ContainersCommon:
type: ../../docker/services/containers-common.yaml
type: ../containers-common.yaml
MySQLClient:
type: ../database/mysql-client.yaml

View File

@ -129,7 +129,7 @@ conditions:
resources:
ContainersCommon:
type: ../../docker/services/containers-common.yaml
type: ../containers-common.yaml
outputs:
role_data:

View File

@ -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

View File

@ -242,7 +242,7 @@ conditions:
resources:
ContainersCommon:
type: ../../docker/services/containers-common.yaml
type: ../containers-common.yaml
MySQLClient:
type: ../database/mysql-client.yaml

View File

@ -165,7 +165,7 @@ conditions:
resources:
ContainersCommon:
type: ../../docker/services/containers-common.yaml
type: ../containers-common.yaml
MySQLClient:
type: ../database/mysql-client.yaml

View File

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

View File

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

View File

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

View File

@ -66,7 +66,7 @@ conditions:
resources:
ContainersCommon:
type: ../../docker/services/containers-common.yaml
type: ../containers-common.yaml
outputs:
role_data:

View File

@ -375,7 +375,7 @@ parameter_groups:
resources:
ContainersCommon:
type: ../../docker/services/containers-common.yaml
type: ../containers-common.yaml
MySQLClient:
type: ../database/mysql-client.yaml

View File

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

View File

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

View File

@ -63,7 +63,7 @@ conditions:
resources:
ContainersCommon:
type: ../../docker/services/containers-common.yaml
type: ../containers-common.yaml
MySQLClient:
type: ../../deployment/database/mysql-client.yaml

View File

@ -47,7 +47,7 @@ parameters:
resources:
ContainersCommon:
type: ../../docker/services/containers-common.yaml
type: ../containers-common.yaml
MySQLClient:
type: ../../deployment/database/mysql-client.yaml

View File

@ -46,7 +46,7 @@ conditions:
resources:
ContainersCommon:
type: ../../docker/services/containers-common.yaml
type: ../containers-common.yaml
outputs:
manila_share_volumes:

View File

@ -59,7 +59,7 @@ parameters:
resources:
ContainersCommon:
type: ../../docker/services/containers-common.yaml
type: ../containers-common.yaml
MySQLClient:
type: ../../deployment/database/mysql-client.yaml

View File

@ -64,7 +64,7 @@ conditions:
resources:
ContainersCommon:
type: ../../docker/services/containers-common.yaml
type: ../containers-common.yaml
MySQLClient:
type: ../database/mysql-client.yaml

View File

@ -74,7 +74,7 @@ conditions:
resources:
ContainersCommon:
type: ../../docker/services/containers-common.yaml
type: ../containers-common.yaml
outputs:
role_data:

View File

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

View File

@ -302,7 +302,7 @@ conditions:
resources:
ContainersCommon:
type: ../../docker/services/containers-common.yaml
type: ../containers-common.yaml
outputs:
role_data:

View File

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

View File

@ -68,7 +68,7 @@ conditions:
resources:
ContainersCommon:
type: ../../docker/services/containers-common.yaml
type: ../containers-common.yaml
MySQLClient:
type: ../database/mysql-client.yaml

View File

@ -65,7 +65,7 @@ parameters:
resources:
ContainersCommon:
type: ../../docker/services/containers-common.yaml
type: ../containers-common.yaml
MySQLClient:
type: ../database/mysql-client.yaml

View File

@ -44,7 +44,7 @@ parameters:
resources:
ContainersCommon:
type: ../../docker/services/containers-common.yaml
type: ../containers-common.yaml
MySQLClient:
type: ../database/mysql-client.yaml

View File

@ -78,7 +78,7 @@ conditions:
resources:
ContainersCommon:
type: ../../docker/services/containers-common.yaml
type: ../containers-common.yaml
MySQLClient:
type: ../database/mysql-client.yaml

View File

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

View File

@ -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

View File

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

View File

@ -139,7 +139,7 @@ conditions:
resources:
ContainersCommon:
type: ../../docker/services/containers-common.yaml
type: ../containers-common.yaml
NeutronBase:
type: ../../puppet/services/neutron-base.yaml

View File

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

View File

@ -127,7 +127,7 @@ conditions:
resources:
ContainersCommon:
type: ../../docker/services/containers-common.yaml
type: ../containers-common.yaml
NeutronBase:
type: ../../puppet/services/neutron-base.yaml

View File

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

View File

@ -86,7 +86,7 @@ conditions:
resources:
ContainersCommon:
type: ../../docker/services/containers-common.yaml
type: ../containers-common.yaml
NeutronBase:
type: ../../puppet/services/neutron-base.yaml

View File

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

View File

@ -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

View File

@ -137,7 +137,7 @@ conditions:
resources:
ContainersCommon:
type: ../../docker/services/containers-common.yaml
type: ../containers-common.yaml
MySQLClient:
type: ../../deployment/database/mysql-client.yaml

View File

@ -264,7 +264,7 @@ parameters:
resources:
ContainersCommon:
type: ../../docker/services/containers-common.yaml
type: ../containers-common.yaml
MySQLClient:
type: ../../deployment/database/mysql-client.yaml

View File

@ -65,7 +65,7 @@ conditions:
resources:
ContainersCommon:
type: ../../docker/services/containers-common.yaml
type: ../containers-common.yaml
MySQLClient:
type: ../../deployment/database/mysql-client.yaml

View File

@ -44,7 +44,7 @@ parameters:
resources:
ContainersCommon:
type: ../../docker/services/containers-common.yaml
type: ../containers-common.yaml
MySQLClient:
type: ../../deployment/database/mysql-client.yaml

View File

@ -291,7 +291,7 @@ resources:
ContainersCommon:
type: ../../docker/services/containers-common.yaml
type: ../containers-common.yaml
MySQLClient:
type: ../../deployment/database/mysql-client.yaml

View File

@ -77,7 +77,7 @@ conditions:
resources:
ContainersCommon:
type: ../../docker/services/containers-common.yaml
type: ../containers-common.yaml
MySQLClient:
type: ../../deployment/database/mysql-client.yaml

View File

@ -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

View File

@ -82,7 +82,7 @@ conditions:
resources:
ContainersCommon:
type: ../../docker/services/containers-common.yaml
type: ../containers-common.yaml
MySQLClient:
type: ../../deployment/database/mysql-client.yaml

View File

@ -97,7 +97,7 @@ conditions:
resources:
ContainersCommon:
type: ../../docker/services/containers-common.yaml
type: ../containers-common.yaml
MySQLClient:
type: ../../deployment/database/mysql-client.yaml

View File

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

View File

@ -78,7 +78,7 @@ conditions:
resources:
ContainersCommon:
type: ../../docker/services/containers-common.yaml
type: ../containers-common.yaml
MySQLClient:
type: ../database/mysql-client.yaml

View File

@ -65,7 +65,7 @@ parameters:
resources:
ContainersCommon:
type: ../../docker/services/containers-common.yaml
type: ../containers-common.yaml
MySQLClient:
type: ../database/mysql-client.yaml

View File

@ -58,7 +58,7 @@ conditions:
resources:
ContainersCommon:
type: ../../docker/services/containers-common.yaml
type: ../containers-common.yaml
MySQLClient:
type: ../database/mysql-client.yaml

View File

@ -56,7 +56,7 @@ parameters:
resources:
ContainersCommon:
type: ../../docker/services/containers-common.yaml
type: ../containers-common.yaml
MySQLClient:
type: ../database/mysql-client.yaml

View File

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

View File

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

View File

@ -72,7 +72,7 @@ conditions:
resources:
ContainersCommon:
type: ../../docker/services/containers-common.yaml
type: ../containers-common.yaml
OVNDbsBase:
type: ./ovn-dbs-container-puppet.yaml

View File

@ -113,7 +113,7 @@ conditions:
resources:
ContainersCommon:
type: ../../docker/services/containers-common.yaml
type: ../containers-common.yaml
NeutronBase:
type: ../../puppet/services/neutron-base.yaml

View File

@ -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

View File

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

View File

@ -100,7 +100,7 @@ conditions:
resources:
ContainersCommon:
type: ../../docker/services/containers-common.yaml
type: ../containers-common.yaml
outputs:
role_data:

View File

@ -72,7 +72,7 @@ conditions:
resources:
ContainersCommon:
type: ../../docker/services/containers-common.yaml
type: ../containers-common.yaml
RabbitMQServiceBase:
type: ./rabbitmq-container-puppet.yaml

View File

@ -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 have changed in this diff Show More