summaryrefslogtreecommitdiffstats
path: root/manifests
diff options
context:
space:
mode:
Diffstat (limited to 'manifests')
-rw-r--r--manifests/haproxy.pp11
-rw-r--r--manifests/profile/base/aodh/evaluator.pp4
-rw-r--r--manifests/profile/base/ceilometer/agent/central.pp4
-rw-r--r--manifests/profile/base/cinder/volume/iscsi.pp6
-rw-r--r--manifests/profile/base/gnocchi/api.pp5
-rw-r--r--manifests/profile/base/swift/proxy.pp1
6 files changed, 24 insertions, 7 deletions
diff --git a/manifests/haproxy.pp b/manifests/haproxy.pp
index 6a81731..2cac604 100644
--- a/manifests/haproxy.pp
+++ b/manifests/haproxy.pp
@@ -439,11 +439,14 @@ class tripleo::haproxy (
"${public_virtual_ip}:443" => union($haproxy_listen_bind_param, ['ssl', 'crt', $service_certificate]),
}
$horizon_options = {
- 'cookie' => 'SERVERID insert indirect nocache',
- 'rsprep' => '^Location:\ http://(.*) Location:\ https://\1',
+ 'cookie' => 'SERVERID insert indirect nocache',
+ 'rsprep' => '^Location:\ http://(.*) Location:\ https://\1',
# NOTE(jaosorior): We always redirect to https for the public_virtual_ip.
- 'redirect' => "scheme https code 301 if { hdr(host) -i ${public_virtual_ip} } !{ ssl_fc }",
- 'option' => 'forwardfor',
+ 'redirect' => "scheme https code 301 if { hdr(host) -i ${public_virtual_ip} } !{ ssl_fc }",
+ 'option' => 'forwardfor',
+ 'http-request' => [
+ 'set-header X-Forwarded-Proto https if { ssl_fc }',
+ 'set-header X-Forwarded-Proto http if !{ ssl_fc }'],
}
} else {
$horizon_bind_opts = {
diff --git a/manifests/profile/base/aodh/evaluator.pp b/manifests/profile/base/aodh/evaluator.pp
index 610d5a8..d9b48b3 100644
--- a/manifests/profile/base/aodh/evaluator.pp
+++ b/manifests/profile/base/aodh/evaluator.pp
@@ -30,7 +30,9 @@ class tripleo::profile::base::aodh::evaluator (
include ::tripleo::profile::base::aodh
if $step >= 4 {
- include ::aodh::evaluator
+ class { '::aodh::evaluator':
+ coordination_url => join(['redis://:', hiera('aodh_redis_password'), '@', normalize_ip_for_uri(hiera('redis_vip')), ':6379/']),
+ }
}
}
diff --git a/manifests/profile/base/ceilometer/agent/central.pp b/manifests/profile/base/ceilometer/agent/central.pp
index c91e610..033d34c 100644
--- a/manifests/profile/base/ceilometer/agent/central.pp
+++ b/manifests/profile/base/ceilometer/agent/central.pp
@@ -30,7 +30,9 @@ class tripleo::profile::base::ceilometer::agent::central (
if $step >= 4 {
include ::ceilometer::agent::auth
- include ::ceilometer::agent::central
+ class { '::ceilometer::agent::central':
+ coordination_url => join(['redis://:', hiera('ceilometer_redis_password'), '@', normalize_ip_for_uri(hiera('redis_vip')), ':6379/']),
+ }
}
}
diff --git a/manifests/profile/base/cinder/volume/iscsi.pp b/manifests/profile/base/cinder/volume/iscsi.pp
index 8baaf1c..4d333c8 100644
--- a/manifests/profile/base/cinder/volume/iscsi.pp
+++ b/manifests/profile/base/cinder/volume/iscsi.pp
@@ -29,6 +29,10 @@
# (Optional) The iscsi helper to use
# Defaults to 'tgtadm'
#
+# [*cinder_iscsi_protocol*]
+# (Optional) The iscsi protocol to use
+# Defaults to 'iscsi'
+#
# [*cinder_lvm_loop_device_size*]
# (Optional) The size (in MB) of the LVM loopback volume
# Defaults to '10280'
@@ -42,6 +46,7 @@ class tripleo::profile::base::cinder::volume::iscsi (
$cinder_iscsi_address,
$backend_name = hiera('cinder::backend::iscsi::volume_backend_name', 'tripleo_iscsi'),
$cinder_iscsi_helper = 'tgtadm',
+ $cinder_iscsi_protocol = 'iscsi',
$cinder_lvm_loop_device_size = '10280',
$step = hiera('step'),
) {
@@ -58,6 +63,7 @@ class tripleo::profile::base::cinder::volume::iscsi (
cinder::backend::iscsi { $backend_name :
iscsi_ip_address => normalize_ip_for_uri($cinder_iscsi_address),
iscsi_helper => $cinder_iscsi_helper,
+ iscsi_protocol => $cinder_iscsi_protocol,
}
}
diff --git a/manifests/profile/base/gnocchi/api.pp b/manifests/profile/base/gnocchi/api.pp
index 732ea26..9a08551 100644
--- a/manifests/profile/base/gnocchi/api.pp
+++ b/manifests/profile/base/gnocchi/api.pp
@@ -51,7 +51,10 @@ class tripleo::profile::base::gnocchi::api (
if $step >= 4 {
include ::gnocchi::api
include ::gnocchi::wsgi::apache
- include ::gnocchi::storage
+
+ class { '::gnocchi::storage':
+ coordination_url => join(['redis://:', hiera('gnocchi_redis_password'), '@', normalize_ip_for_uri(hiera('redis_vip')), ':6379/']),
+ }
case $gnocchi_backend {
'swift': { include ::gnocchi::storage::swift }
'file': { include ::gnocchi::storage::file }
diff --git a/manifests/profile/base/swift/proxy.pp b/manifests/profile/base/swift/proxy.pp
index 9d50462..fc9fe11 100644
--- a/manifests/profile/base/swift/proxy.pp
+++ b/manifests/profile/base/swift/proxy.pp
@@ -52,5 +52,6 @@ class tripleo::profile::base::swift::proxy (
include ::swift::proxy::tempurl
include ::swift::proxy::formpost
include ::swift::proxy::bulk
+ include ::swift::proxy::ceilometer
}
}