Merge "Remove or fix outdated/incorrect tripleo hieradata definitions"
This commit is contained in:
commit
d5a9b5bb00
|
@ -137,12 +137,6 @@ outputs:
|
||||||
"%{hiera('fqdn_$NETWORK')}"
|
"%{hiera('fqdn_$NETWORK')}"
|
||||||
params:
|
params:
|
||||||
$NETWORK: {get_param: [ServiceNetMap, MysqlNetwork]}
|
$NETWORK: {get_param: [ServiceNetMap, MysqlNetwork]}
|
||||||
tripleo::profile::base::database::mysql::client_bind_address:
|
|
||||||
str_replace:
|
|
||||||
template:
|
|
||||||
"%{hiera('$NETWORK')}"
|
|
||||||
params:
|
|
||||||
$NETWORK: {get_param: [ServiceNetMap, MysqlNetwork]}
|
|
||||||
tripleo::profile::base::database::mysql::generate_dropin_file_limit:
|
tripleo::profile::base::database::mysql::generate_dropin_file_limit:
|
||||||
{get_param: MysqlIncreaseFileLimit}
|
{get_param: MysqlIncreaseFileLimit}
|
||||||
tripleo::profile::base::database::mysql::certificate_specs:
|
tripleo::profile::base::database::mysql::certificate_specs:
|
||||||
|
|
|
@ -130,7 +130,7 @@ outputs:
|
||||||
expression: concat("cluster.common.tag/", $.data.rightSplit(separator => "/", maxSplits => 1)[1])
|
expression: concat("cluster.common.tag/", $.data.rightSplit(separator => "/", maxSplits => 1)[1])
|
||||||
- {get_param: ContainerRedisImage}
|
- {get_param: ContainerRedisImage}
|
||||||
expression: concat($.data.rightSplit(separator => ":", maxSplits => 1)[0], ":pcmklatest")
|
expression: concat($.data.rightSplit(separator => ":", maxSplits => 1)[0], ":pcmklatest")
|
||||||
tripleo::profile::pacemaker::database::redis_bundle::control_port: 3124
|
tripleo::profile::pacemaker::database::redis_bundle::redis_docker_control_port: 3124
|
||||||
tripleo::profile::pacemaker::database::redis_bundle::container_backend: {get_param: ContainerCli}
|
tripleo::profile::pacemaker::database::redis_bundle::container_backend: {get_param: ContainerCli}
|
||||||
tripleo::stunnel::manage_service: false
|
tripleo::stunnel::manage_service: false
|
||||||
tripleo::stunnel::foreground: 'yes'
|
tripleo::stunnel::foreground: 'yes'
|
||||||
|
|
|
@ -112,7 +112,7 @@ outputs:
|
||||||
expression: concat("cluster.common.tag/", $.data.rightSplit(separator => "/", maxSplits => 1)[1])
|
expression: concat("cluster.common.tag/", $.data.rightSplit(separator => "/", maxSplits => 1)[1])
|
||||||
- {get_param: ContainerRabbitmqImage}
|
- {get_param: ContainerRabbitmqImage}
|
||||||
expression: concat($.data.rightSplit(separator => ":", maxSplits => 1)[0], ":pcmklatest")
|
expression: concat($.data.rightSplit(separator => ":", maxSplits => 1)[0], ":pcmklatest")
|
||||||
tripleo::profile::pacemaker::rabbitmq_bundle::control_port: 3122
|
tripleo::profile::pacemaker::rabbitmq_bundle::rabbitmq_docker_control_port: 3122
|
||||||
tripleo::profile::pacemaker::rabbitmq_bundle::container_backend: {get_param: ContainerCli}
|
tripleo::profile::pacemaker::rabbitmq_bundle::container_backend: {get_param: ContainerCli}
|
||||||
service_config_settings: {get_attr: [RabbitmqBase, role_data, service_config_settings]}
|
service_config_settings: {get_attr: [RabbitmqBase, role_data, service_config_settings]}
|
||||||
# BEGIN DOCKER SETTINGS
|
# BEGIN DOCKER SETTINGS
|
||||||
|
|
|
@ -112,7 +112,7 @@ outputs:
|
||||||
expression: concat("cluster.common.tag/", $.data.rightSplit(separator => "/", maxSplits => 1)[1])
|
expression: concat("cluster.common.tag/", $.data.rightSplit(separator => "/", maxSplits => 1)[1])
|
||||||
- {get_param: ContainerRabbitmqImage}
|
- {get_param: ContainerRabbitmqImage}
|
||||||
expression: concat($.data.rightSplit(separator => ":", maxSplits => 1)[0], ":pcmklatest")
|
expression: concat($.data.rightSplit(separator => ":", maxSplits => 1)[0], ":pcmklatest")
|
||||||
tripleo::profile::pacemaker::rabbitmq_bundle::control_port: 3122
|
tripleo::profile::pacemaker::rabbitmq_bundle::rabbitmq_docker_control_port: 3122
|
||||||
tripleo::profile::pacemaker::rabbitmq_bundle::container_backend: {get_param: ContainerCli}
|
tripleo::profile::pacemaker::rabbitmq_bundle::container_backend: {get_param: ContainerCli}
|
||||||
service_config_settings: {get_attr: [RabbitmqBase, role_data, service_config_settings]}
|
service_config_settings: {get_attr: [RabbitmqBase, role_data, service_config_settings]}
|
||||||
# BEGIN DOCKER SETTINGS
|
# BEGIN DOCKER SETTINGS
|
||||||
|
|
|
@ -112,7 +112,7 @@ outputs:
|
||||||
expression: concat("cluster.common.tag/", $.data.rightSplit(separator => "/", maxSplits => 1)[1])
|
expression: concat("cluster.common.tag/", $.data.rightSplit(separator => "/", maxSplits => 1)[1])
|
||||||
- {get_param: ContainerRabbitmqImage}
|
- {get_param: ContainerRabbitmqImage}
|
||||||
expression: concat($.data.rightSplit(separator => ":", maxSplits => 1)[0], ":pcmklatest")
|
expression: concat($.data.rightSplit(separator => ":", maxSplits => 1)[0], ":pcmklatest")
|
||||||
tripleo::profile::pacemaker::rabbitmq_bundle::control_port: 3122
|
tripleo::profile::pacemaker::rabbitmq_bundle::rabbitmq_docker_control_port: 3122
|
||||||
tripleo::profile::pacemaker::rabbitmq_bundle::container_backend: {get_param: ContainerCli}
|
tripleo::profile::pacemaker::rabbitmq_bundle::container_backend: {get_param: ContainerCli}
|
||||||
service_config_settings: {get_attr: [RabbitmqBase, role_data, service_config_settings]}
|
service_config_settings: {get_attr: [RabbitmqBase, role_data, service_config_settings]}
|
||||||
# BEGIN DOCKER SETTINGS
|
# BEGIN DOCKER SETTINGS
|
||||||
|
|
Loading…
Reference in New Issue