aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2016-07-21 20:44:43 +0000
committerGerrit Code Review <review@openstack.org>2016-07-21 20:44:43 +0000
commit964526ba48fb8135f283dcd29d0c8a1ae3bec364 (patch)
tree3f09ec7acc44fe6dcf341532c32e3ff4973700bb
parentd59a05ae38aad38bdd2424673d1a536045793acd (diff)
parentc1983a6da29b7ad5c5efbe9219f765bcc919969b (diff)
Merge "Deploy Keystone and Gnocchi API with new Apache profile"
-rw-r--r--manifests/profile/pacemaker/gnocchi/api.pp1
-rw-r--r--manifests/profile/pacemaker/keystone.pp1
2 files changed, 2 insertions, 0 deletions
diff --git a/manifests/profile/pacemaker/gnocchi/api.pp b/manifests/profile/pacemaker/gnocchi/api.pp
index da65731..ede4c9a 100644
--- a/manifests/profile/pacemaker/gnocchi/api.pp
+++ b/manifests/profile/pacemaker/gnocchi/api.pp
@@ -28,6 +28,7 @@ class tripleo::profile::pacemaker::gnocchi::api (
) {
include ::tripleo::profile::pacemaker::gnocchi
+ include ::tripleo::profile::pacemaker::apache
class { '::tripleo::profile::base::gnocchi::api':
step => $step,
diff --git a/manifests/profile/pacemaker/keystone.pp b/manifests/profile/pacemaker/keystone.pp
index e8e12a3..1cd5178 100644
--- a/manifests/profile/pacemaker/keystone.pp
+++ b/manifests/profile/pacemaker/keystone.pp
@@ -51,6 +51,7 @@ class tripleo::profile::pacemaker::keystone (
}
include ::tripleo::profile::base::keystone
+ include ::tripleo::profile::pacemaker::apache
if $step >= 5 and $pacemaker_master and $enable_load_balancer {
pacemaker::constraint::base { 'haproxy-then-keystone-constraint':