summaryrefslogtreecommitdiffstats
path: root/manifests
diff options
context:
space:
mode:
Diffstat (limited to 'manifests')
-rw-r--r--manifests/certmonger/ca/local.pp10
-rw-r--r--manifests/profile/base/mistral.pp9
-rw-r--r--manifests/profile/base/swift/ringbuilder.pp2
-rw-r--r--manifests/profile/base/swift/storage.pp2
4 files changed, 16 insertions, 7 deletions
diff --git a/manifests/certmonger/ca/local.pp b/manifests/certmonger/ca/local.pp
index ea08dec..b7b7328 100644
--- a/manifests/certmonger/ca/local.pp
+++ b/manifests/certmonger/ca/local.pp
@@ -29,9 +29,11 @@ class tripleo::certmonger::ca::local(
$extract_cmd = "openssl pkcs12 -in ${ca_pkcs12} -out ${ca_pem} -nokeys -nodes -passin pass:''"
$trust_ca_cmd = 'update-ca-trust extract'
exec { 'extract-and-trust-ca':
- command => "${extract_cmd} && ${trust_ca_cmd}",
- path => '/usr/bin',
- creates => $ca_pem,
- require => Package['certmonger'],
+ command => "${extract_cmd} && ${trust_ca_cmd}",
+ path => '/usr/bin',
+ creates => $ca_pem,
+ tries => 5,
+ try_sleep => 1,
+ require => Service['certmonger'],
}
}
diff --git a/manifests/profile/base/mistral.pp b/manifests/profile/base/mistral.pp
index cffb03e..3ebc3d5 100644
--- a/manifests/profile/base/mistral.pp
+++ b/manifests/profile/base/mistral.pp
@@ -27,9 +27,14 @@
# for more details.
# Defaults to hiera('step')
#
+# [*rabbit_hosts*]
+# list of the rabbbit host IPs
+# Defaults to hiera('rabbitmq_node_ips')
+
class tripleo::profile::base::mistral (
$bootstrap_node = hiera('bootstrap_nodeid', undef),
$step = hiera('step'),
+ $rabbit_hosts = hiera('rabbitmq_node_ips', undef),
) {
if $::hostname == downcase($bootstrap_node) {
$sync_db = true
@@ -42,7 +47,9 @@ class tripleo::profile::base::mistral (
}
if $step >= 4 or ($step >= 3 and $sync_db) {
- include ::mistral
+ class { '::mistral':
+ rabbit_hosts => $rabbit_hosts,
+ }
include ::mistral::config
include ::mistral::client
include ::mistral::db::sync
diff --git a/manifests/profile/base/swift/ringbuilder.pp b/manifests/profile/base/swift/ringbuilder.pp
index 98a09a0..c77d744 100644
--- a/manifests/profile/base/swift/ringbuilder.pp
+++ b/manifests/profile/base/swift/ringbuilder.pp
@@ -91,7 +91,7 @@ class tripleo::profile::base::swift::ringbuilder (
# rebalance
swift::ringbuilder::rebalance{ ['object', 'account', 'container']:
- seed => 999,
+ seed => '999',
}
Ring_object_device<| |> ~> Exec['rebalance_object']
diff --git a/manifests/profile/base/swift/storage.pp b/manifests/profile/base/swift/storage.pp
index 0b09ea6..d1660de 100644
--- a/manifests/profile/base/swift/storage.pp
+++ b/manifests/profile/base/swift/storage.pp
@@ -41,7 +41,7 @@ class tripleo::profile::base::swift::storage (
ensure => directory,
owner => 'swift',
group => 'swift',
- require => Package['openstack-swift'],
+ require => Package['swift'],
}
}
$swift_components = ['account', 'container', 'object']