diff options
Diffstat (limited to 'manifests')
| -rw-r--r-- | manifests/haproxy.pp | 6 | ||||
| -rw-r--r-- | manifests/profile/base/horizon.pp | 2 | ||||
| -rw-r--r-- | manifests/profile/base/keystone.pp | 5 | ||||
| -rw-r--r-- | manifests/profile/base/rabbitmq.pp | 3 | ||||
| -rw-r--r-- | manifests/profile/releasenotes/notes/rabbitmq-user-check-95da891a2e197d89.yaml | 6 |
5 files changed, 20 insertions, 2 deletions
diff --git a/manifests/haproxy.pp b/manifests/haproxy.pp index 0f1bece..37a7aeb 100644 --- a/manifests/haproxy.pp +++ b/manifests/haproxy.pp @@ -1592,6 +1592,12 @@ class tripleo::haproxy ( server_names => $controller_hosts_names_real, mode => 'http', public_ssl_port => $ports[ui_ssl_port], + listen_options => { + # NOTE(dtrainor): in addition to the zaqar_ws endpoint, the HTTPS + # (443/tcp) endpoint that answers for the UI must also use a long-lived + # tunnel timeout for the same reasons mentioned above. + 'timeout' => ['tunnel 3600s'], + }, } } if $contrail_config { diff --git a/manifests/profile/base/horizon.pp b/manifests/profile/base/horizon.pp index bd28ab0..4db5e50 100644 --- a/manifests/profile/base/horizon.pp +++ b/manifests/profile/base/horizon.pp @@ -26,7 +26,7 @@ class tripleo::profile::base::horizon ( $step = hiera('step'), ) { - if $step >= 4 { + if $step >= 3 { # Horizon include ::apache::mod::remoteip include ::apache::mod::status diff --git a/manifests/profile/base/keystone.pp b/manifests/profile/base/keystone.pp index 999bcf6..8d8c235 100644 --- a/manifests/profile/base/keystone.pp +++ b/manifests/profile/base/keystone.pp @@ -196,7 +196,10 @@ class tripleo::profile::base::keystone ( if hiera('barbican_api_enabled', false) { include ::barbican::keystone::auth } - if hiera('ceilometer_api_enabled', false) { + # ceilometer user is needed even when ceilometer api + # not running, so it can authenticate with keystone + # and dispatch data. + if hiera('ceilometer_auth_enabled', false) { include ::ceilometer::keystone::auth } if hiera('ceph_rgw_enabled', false) { diff --git a/manifests/profile/base/rabbitmq.pp b/manifests/profile/base/rabbitmq.pp index 1eaabf0..71d08f0 100644 --- a/manifests/profile/base/rabbitmq.pp +++ b/manifests/profile/base/rabbitmq.pp @@ -118,6 +118,9 @@ class tripleo::profile::base::rabbitmq ( environment_variables => $rabbit_env, } } + } + + if $step >= 2 { # In case of HA, starting of rabbitmq-server is managed by pacemaker, because of which, a dependency # to Service['rabbitmq-server'] will not work. Sticking with UPDATE action. if $stack_action == 'UPDATE' { diff --git a/manifests/profile/releasenotes/notes/rabbitmq-user-check-95da891a2e197d89.yaml b/manifests/profile/releasenotes/notes/rabbitmq-user-check-95da891a2e197d89.yaml new file mode 100644 index 0000000..e1caf4c --- /dev/null +++ b/manifests/profile/releasenotes/notes/rabbitmq-user-check-95da891a2e197d89.yaml @@ -0,0 +1,6 @@ +--- +fixes: + - The rabbitmq user check is moved to step >= 2 from step >= 1. There + is no gaurantee that rabbitmq is running at step 1, especially if + updating a failed stack that never made it past step 1 to begin + with. |