openstack
/
puppet-tripleo
Code Issues Proposed changes

Revert "Set meta container-attribute-target=host attribute" 

This patch broke the containers scenario004 test because it relies on a
newer mariadb container than has actually passed CI at this time.

To revert this revert, we need to make sure we test
scenario004-containers against that patch.

This reverts commit 6bcb011723.

Closes-Bug: 1721497

Change-Id: I34c7c388eed94db1735c45e26661a0af8cdce8e9
This commit is contained in:
John Trowbridge 2017-10-06 12:44:16 +00:00
parent 6bcb011723
commit 1681d3bceb
4 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
manifests/profile/pacemaker/database/mysql_bundle.pp
View File

@ -100,10 +100,9 @@ class tripleo::profile::pacemaker::database::mysql_bundle (
$galera_nodes_count = count($galera_nodes_array)
# construct a galera-pacemaker name mapping for the resource agent
# [galera-0:galera-0.internalapi.local, ...]
$host_map_array_tmp = zip($galera_node_names_lookup, $galera_fqdns_names_lookup)
$host_map_array = $host_map_array_tmp.map |$i| {
"${i[0]}:${i[1]}"
# [galera-bundle-0:galera_node[0], galera-bundle-1:galera_node[1], ... ,galera-bundle-n:galera_node[n]]
$host_map_array = $galera_nodes_array.map |$i, $host| {
"galera-bundle-${i}:${host}"
}
$cluster_host_map_string = join($host_map_array, ';')
@ -315,7 +314,7 @@ MYSQL_HOST=localhost\n",
pacemaker::resource::ocf { 'galera':
ocf_agent_name => 'heartbeat:galera',
master_params => '',
meta_params => "master-max=${galera_nodes_count} ordered=true container-attribute-target=host",
meta_params => "master-max=${galera_nodes_count} ordered=true",
op_params => 'promote timeout=300s on-fail=block',
resource_params => "additional_parameters='--open-files-limit=16384' enable_creation=true wsrep_cluster_address='gcomm://${galera_nodes}' cluster_host_map='${cluster_host_map_string}'",
tries => $pcs_tries,

2
manifests/profile/pacemaker/database/redis_bundle.pp
View File

@ -150,7 +150,7 @@ class tripleo::profile::pacemaker::database::redis_bundle (
ocf_agent_name => 'heartbeat:redis',
resource_params => 'wait_last_known_master=true',
master_params => '',
meta_params => 'notify=true ordered=true interleave=true container-attribute-target=host',
meta_params => 'notify=true ordered=true interleave=true',
op_params => 'start timeout=200s stop timeout=200s',
tries => $pcs_tries,
location_rule => {

2
manifests/profile/pacemaker/ovn_dbs_bundle.pp
View File

@ -139,7 +139,7 @@ class tripleo::profile::pacemaker::ovn_dbs_bundle (
resource_params => "master_ip=${ovn_dbs_vip} nb_master_port=${nb_db_port} sb_master_port=${sb_db_port} manage_northd=yes",
tries => $pcs_tries,
location_rule => $ovn_dbs_location_rule,
meta_params => 'notify=true container-attribute-target=host',
meta_params => 'notify=true',
bundle => 'ovn-dbs-bundle',
}

2
manifests/profile/pacemaker/rabbitmq_bundle.pp
View File

@ -206,7 +206,7 @@ class tripleo::profile::pacemaker::rabbitmq_bundle (
pacemaker::resource::ocf { 'rabbitmq':
ocf_agent_name => 'heartbeat:rabbitmq-cluster',
resource_params => $params,
meta_params => 'notify=true container-attribute-target=host',
meta_params => 'notify=true',
op_params => 'start timeout=200s stop timeout=200s',
tries => $pcs_tries,
location_rule => {