diff options
| -rw-r--r-- | bindep.txt | 1 | ||||
| -rw-r--r-- | manifests/profile/base/mistral/api.pp | 17 | ||||
| -rw-r--r-- | manifests/profile/base/tuned.pp | 4 | ||||
| -rw-r--r-- | manifests/profile/pacemaker/database/mysql_bundle.pp | 9 | ||||
| -rw-r--r-- | manifests/profile/pacemaker/database/redis_bundle.pp | 2 | ||||
| -rw-r--r-- | manifests/profile/pacemaker/ovn_dbs_bundle.pp | 2 | ||||
| -rw-r--r-- | manifests/profile/pacemaker/rabbitmq_bundle.pp | 2 | ||||
| -rw-r--r-- | metadata.json | 2 |
8 files changed, 26 insertions, 13 deletions
@@ -9,3 +9,4 @@ ruby-devel [test platform:rpm] ruby-dev [test platform:dpkg] zlib1g-dev [test platform:dpkg] zlib-devel [test platform:rpm] +puppet [build] diff --git a/manifests/profile/base/mistral/api.pp b/manifests/profile/base/mistral/api.pp index b5ca85e..2ab2d96 100644 --- a/manifests/profile/base/mistral/api.pp +++ b/manifests/profile/base/mistral/api.pp @@ -39,6 +39,10 @@ # This is set by t-h-t. # Defaults to hiera('mistral_api_network', undef) # +# [*mistral_api_wsgi_enabled*] +# (Optional) Whether or not deploy Mistral API in WSGI with Apache. +# Defaults to hiera('mistral_wsgi_enabled', true) +# # [*bootstrap_node*] # (Optional) The hostname of the node responsible for bootstrapping tasks # Defaults to hiera('bootstrap_nodeid') @@ -53,6 +57,7 @@ class tripleo::profile::base::mistral::api ( $certificates_specs = hiera('apache_certificates_specs', {}), $enable_internal_tls = hiera('enable_internal_tls', false), $mistral_api_network = hiera('mistral_api_network', undef), + $mistral_api_wsgi_enabled = hiera('mistral_wsgi_enabled', true), $step = Integer(hiera('step')), ) { if $::hostname == downcase($bootstrap_node) { @@ -76,10 +81,14 @@ class tripleo::profile::base::mistral::api ( if $step >= 4 or ( $step >= 3 and $is_bootstrap ) { include ::mistral::api - include ::apache::mod::ssl - class { '::mistral::wsgi::apache': - ssl_cert => $tls_certfile, - ssl_key => $tls_keyfile, + # Temporarily disable Mistral API deployed in WSGI + # https://bugs.launchpad.net/tripleo/+bug/1724607 + if $mistral_api_wsgi_enabled { + include ::apache::mod::ssl + class { '::mistral::wsgi::apache': + ssl_cert => $tls_certfile, + ssl_key => $tls_keyfile, + } } } } diff --git a/manifests/profile/base/tuned.pp b/manifests/profile/base/tuned.pp index 8dfcea0..48951bd 100644 --- a/manifests/profile/base/tuned.pp +++ b/manifests/profile/base/tuned.pp @@ -12,9 +12,11 @@ class tripleo::profile::base::tuned ( $profile = 'throughput-performance' ) { + ensure_resource('package', 'tuned', { ensure => 'present' }) exec { 'tuned-adm': path => ['/bin', '/usr/bin', '/sbin', '/usr/sbin'], command => "tuned-adm profile ${profile}", - unless => "tuned-adm active | grep -q '${profile}'" + unless => "tuned-adm active | grep -q '${profile}'", + require => Package['tuned'], } } diff --git a/manifests/profile/pacemaker/database/mysql_bundle.pp b/manifests/profile/pacemaker/database/mysql_bundle.pp index e07ac2e..1bcdbbe 100644 --- a/manifests/profile/pacemaker/database/mysql_bundle.pp +++ b/manifests/profile/pacemaker/database/mysql_bundle.pp @@ -100,9 +100,10 @@ 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-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}" + # [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]}" } $cluster_host_map_string = join($host_map_array, ';') @@ -314,7 +315,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", + meta_params => "master-max=${galera_nodes_count} ordered=true container-attribute-target=host", 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, diff --git a/manifests/profile/pacemaker/database/redis_bundle.pp b/manifests/profile/pacemaker/database/redis_bundle.pp index 8b18858..1e144f9 100644 --- a/manifests/profile/pacemaker/database/redis_bundle.pp +++ b/manifests/profile/pacemaker/database/redis_bundle.pp @@ -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', + meta_params => 'notify=true ordered=true interleave=true container-attribute-target=host', op_params => 'start timeout=200s stop timeout=200s', tries => $pcs_tries, location_rule => { diff --git a/manifests/profile/pacemaker/ovn_dbs_bundle.pp b/manifests/profile/pacemaker/ovn_dbs_bundle.pp index a0fe736..29ba85b 100644 --- a/manifests/profile/pacemaker/ovn_dbs_bundle.pp +++ b/manifests/profile/pacemaker/ovn_dbs_bundle.pp @@ -146,7 +146,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', + meta_params => 'notify=true container-attribute-target=host', bundle => 'ovn-dbs-bundle', } diff --git a/manifests/profile/pacemaker/rabbitmq_bundle.pp b/manifests/profile/pacemaker/rabbitmq_bundle.pp index 4d6b9af..db34d03 100644 --- a/manifests/profile/pacemaker/rabbitmq_bundle.pp +++ b/manifests/profile/pacemaker/rabbitmq_bundle.pp @@ -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', + meta_params => 'notify=true container-attribute-target=host', op_params => 'start timeout=200s stop timeout=200s', tries => $pcs_tries, location_rule => { diff --git a/metadata.json b/metadata.json index a8d97d0..61d0f57 100644 --- a/metadata.json +++ b/metadata.json @@ -1,6 +1,6 @@ { "name": "openstack-tripleo", - "version": "7.4.2", + "version": "7.4.3", "author": "OpenStack Contributors", "summary": "Puppet module for TripleO", "license": "Apache-2.0", |