aboutsummaryrefslogtreecommitdiffstats
path: root/manifests/profile/pacemaker
diff options
context:
space:
mode:
Diffstat (limited to 'manifests/profile/pacemaker')
-rw-r--r--manifests/profile/pacemaker/cinder/backup_bundle.pp9
-rw-r--r--manifests/profile/pacemaker/cinder/volume_bundle.pp4
-rw-r--r--manifests/profile/pacemaker/database/mysql_bundle.pp2
-rw-r--r--manifests/profile/pacemaker/database/redis_bundle.pp43
-rw-r--r--manifests/profile/pacemaker/haproxy_bundle.pp25
-rw-r--r--manifests/profile/pacemaker/rabbitmq_bundle.pp4
6 files changed, 39 insertions, 48 deletions
diff --git a/manifests/profile/pacemaker/cinder/backup_bundle.pp b/manifests/profile/pacemaker/cinder/backup_bundle.pp
index a5e1a9b..2a82c3e 100644
--- a/manifests/profile/pacemaker/cinder/backup_bundle.pp
+++ b/manifests/profile/pacemaker/cinder/backup_bundle.pp
@@ -85,13 +85,8 @@ class tripleo::profile::pacemaker::cinder::backup_bundle (
'options' => 'ro',
},
'cinder-backup-cfg-data' => {
- 'source-dir' => '/var/lib/config-data/cinder/etc/cinder',
- 'target-dir' => '/etc/cinder',
- 'options' => 'ro',
- },
- 'cinder-backup-cfg-ceph' => {
- 'source-dir' => '/var/lib/config-data/cinder/etc/ceph',
- 'target-dir' => '/etc/ceph',
+ 'source-dir' => '/var/lib/config-data/puppet-generated/cinder/',
+ 'target-dir' => '/var/lib/kolla/config_files/src',
'options' => 'ro',
},
'cinder-backup-hosts' => {
diff --git a/manifests/profile/pacemaker/cinder/volume_bundle.pp b/manifests/profile/pacemaker/cinder/volume_bundle.pp
index 39199a5..8d58036 100644
--- a/manifests/profile/pacemaker/cinder/volume_bundle.pp
+++ b/manifests/profile/pacemaker/cinder/volume_bundle.pp
@@ -85,8 +85,8 @@ class tripleo::profile::pacemaker::cinder::volume_bundle (
'options' => 'ro',
},
'cinder-volume-cfg-data' => {
- 'source-dir' => '/var/lib/config-data/cinder/etc/cinder',
- 'target-dir' => '/etc/cinder',
+ 'source-dir' => '/var/lib/config-data/puppet-generated/cinder/',
+ 'target-dir' => '/var/lib/kolla/config_files/src',
'options' => 'ro',
},
'cinder-volume-hosts' => {
diff --git a/manifests/profile/pacemaker/database/mysql_bundle.pp b/manifests/profile/pacemaker/database/mysql_bundle.pp
index 56e9e28..a80b2de 100644
--- a/manifests/profile/pacemaker/database/mysql_bundle.pp
+++ b/manifests/profile/pacemaker/database/mysql_bundle.pp
@@ -215,7 +215,7 @@ MYSQL_HOST=localhost\n",
'options' => 'ro',
},
'mysql-cfg-data' => {
- 'source-dir' => '/var/lib/config-data/mysql',
+ 'source-dir' => '/var/lib/config-data/puppet-generated/mysql/',
'target-dir' => '/var/lib/kolla/config_files/src',
'options' => 'ro',
},
diff --git a/manifests/profile/pacemaker/database/redis_bundle.pp b/manifests/profile/pacemaker/database/redis_bundle.pp
index dd090d7..ea153a8 100644
--- a/manifests/profile/pacemaker/database/redis_bundle.pp
+++ b/manifests/profile/pacemaker/database/redis_bundle.pp
@@ -83,77 +83,62 @@ class tripleo::profile::pacemaker::database::redis_bundle (
run_command => '/bin/bash /usr/local/bin/kolla_start',
network => "control-port=${redis_docker_control_port}",
storage_maps => {
- 'redis-cfg-files' => {
+ 'redis-cfg-files' => {
'source-dir' => '/var/lib/kolla/config_files/redis.json',
'target-dir' => '/var/lib/kolla/config_files/config.json',
'options' => 'ro',
},
- 'redis-cfg-data-redis' => {
- 'source-dir' => '/var/lib/config-data/redis/etc/redis',
- 'target-dir' => '/etc/redis',
+ 'redis-cfg-data-redis' => {
+ 'source-dir' => '/var/lib/config-data/puppet-generated/redis/',
+ 'target-dir' => '/var/lib/kolla/config_files/src',
'options' => 'ro',
},
- 'redis-cfg-data-redis-conf' => {
- 'source-dir' => '/var/lib/config-data/redis/etc/redis.conf',
- 'target-dir' => '/etc/redis.conf',
- 'options' => 'ro',
- },
- 'redis-cfg-data-redis-conf-puppet' => {
- 'source-dir' => '/var/lib/config-data/redis/etc/redis.conf.puppet',
- 'target-dir' => '/etc/redis.conf.puppet',
- 'options' => 'ro',
- },
- 'redis-cfg-data-redis-sentinel' => {
- 'source-dir' => '/var/lib/config-data/redis/etc/redis-sentinel.conf',
- 'target-dir' => '/etc/redis-sentinel.conf',
- 'options' => 'ro',
- },
- 'redis-hosts' => {
+ 'redis-hosts' => {
'source-dir' => '/etc/hosts',
'target-dir' => '/etc/hosts',
'options' => 'ro',
},
- 'redis-localtime' => {
+ 'redis-localtime' => {
'source-dir' => '/etc/localtime',
'target-dir' => '/etc/localtime',
'options' => 'ro',
},
- 'redis-lib' => {
+ 'redis-lib' => {
'source-dir' => '/var/lib/redis',
'target-dir' => '/var/lib/redis',
'options' => 'rw',
},
- 'redis-log' => {
+ 'redis-log' => {
'source-dir' => '/var/log/redis',
'target-dir' => '/var/log/redis',
'options' => 'rw',
},
- 'redis-run' => {
+ 'redis-run' => {
'source-dir' => '/var/run/redis',
'target-dir' => '/var/run/redis',
'options' => 'rw',
},
- 'redis-pki-extracted' => {
+ 'redis-pki-extracted' => {
'source-dir' => '/etc/pki/ca-trust/extracted',
'target-dir' => '/etc/pki/ca-trust/extracted',
'options' => 'ro',
},
- 'redis-pki-ca-bundle-crt' => {
+ 'redis-pki-ca-bundle-crt' => {
'source-dir' => '/etc/pki/tls/certs/ca-bundle.crt',
'target-dir' => '/etc/pki/tls/certs/ca-bundle.crt',
'options' => 'ro',
},
- 'redis-pki-ca-bundle-trust-crt' => {
+ 'redis-pki-ca-bundle-trust-crt' => {
'source-dir' => '/etc/pki/tls/certs/ca-bundle.trust.crt',
'target-dir' => '/etc/pki/tls/certs/ca-bundle.trust.crt',
'options' => 'ro',
},
- 'redis-pki-cert' => {
+ 'redis-pki-cert' => {
'source-dir' => '/etc/pki/tls/cert.pem',
'target-dir' => '/etc/pki/tls/cert.pem',
'options' => 'ro',
},
- 'redis-dev-log' => {
+ 'redis-dev-log' => {
'source-dir' => '/dev/log',
'target-dir' => '/dev/log',
'options' => 'rw',
diff --git a/manifests/profile/pacemaker/haproxy_bundle.pp b/manifests/profile/pacemaker/haproxy_bundle.pp
index 9c1bdf3..afe6f77 100644
--- a/manifests/profile/pacemaker/haproxy_bundle.pp
+++ b/manifests/profile/pacemaker/haproxy_bundle.pp
@@ -30,6 +30,11 @@
# (Optional) Whether load balancing is enabled for this cluster
# Defaults to hiera('enable_load_balancer', true)
#
+# [*deployed_ssl_cert_path*]
+# (Optional) The filepath of the certificate as it will be stored in
+# the controller.
+# Defaults to '/etc/pki/tls/private/overcloud_endpoint.pem'
+#
# [*step*]
# (Optional) The current step in deployment. See tripleo-heat-templates
# for more details.
@@ -40,11 +45,12 @@
# Defaults to hiera('pcs_tries', 20)
#
class tripleo::profile::pacemaker::haproxy_bundle (
- $haproxy_docker_image = hiera('tripleo::profile::pacemaker::haproxy::haproxy_docker_image', undef),
- $bootstrap_node = hiera('haproxy_short_bootstrap_node_name'),
- $enable_load_balancer = hiera('enable_load_balancer', true),
- $step = Integer(hiera('step')),
- $pcs_tries = hiera('pcs_tries', 20),
+ $haproxy_docker_image = hiera('tripleo::profile::pacemaker::haproxy::haproxy_docker_image', undef),
+ $bootstrap_node = hiera('haproxy_short_bootstrap_node_name'),
+ $enable_load_balancer = hiera('enable_load_balancer', true),
+ $deployed_ssl_cert_path = '/etc/pki/tls/private/overcloud_endpoint.pem',
+ $step = Integer(hiera('step')),
+ $pcs_tries = hiera('pcs_tries', 20),
) {
include ::tripleo::profile::base::haproxy
@@ -98,8 +104,8 @@ class tripleo::profile::pacemaker::haproxy_bundle (
'options' => 'ro',
},
'haproxy-cfg-data' => {
- 'source-dir' => '/var/lib/config-data/haproxy/etc',
- 'target-dir' => '/etc',
+ 'source-dir' => '/var/lib/config-data/puppet-generated/haproxy/',
+ 'target-dir' => '/var/lib/kolla/config_files/src',
'options' => 'ro',
},
'haproxy-hosts' => {
@@ -137,6 +143,11 @@ class tripleo::profile::pacemaker::haproxy_bundle (
'target-dir' => '/dev/log',
'options' => 'rw',
},
+ 'haproxy-cert' => {
+ 'source-dir' => deployed_ssl_cert_path,
+ 'target-dir' => deployed_ssl_cert_path,
+ 'options' => 'ro',
+ },
},
}
$control_vip = hiera('controller_virtual_ip')
diff --git a/manifests/profile/pacemaker/rabbitmq_bundle.pp b/manifests/profile/pacemaker/rabbitmq_bundle.pp
index 0a6295c..2f848b4 100644
--- a/manifests/profile/pacemaker/rabbitmq_bundle.pp
+++ b/manifests/profile/pacemaker/rabbitmq_bundle.pp
@@ -121,8 +121,8 @@ class tripleo::profile::pacemaker::rabbitmq_bundle (
'options' => 'ro',
},
'rabbitmq-cfg-data' => {
- 'source-dir' => '/var/lib/config-data/rabbitmq/etc/rabbitmq',
- 'target-dir' => '/etc/rabbitmq',
+ 'source-dir' => '/var/lib/config-data/puppet-generated/rabbitmq/',
+ 'target-dir' => '/var/lib/kolla/config_files/src',
'options' => 'ro',
},
'rabbitmq-hosts' => {