summaryrefslogtreecommitdiffstats
path: root/environments
diff options
context:
space:
mode:
authorDan Prince <dprince@redhat.com>2016-03-23 20:14:54 -0400
committerDan Prince <dprince@redhat.com>2016-04-21 01:03:51 +0000
commit7588f749197624b0c37e98192ed10ac5434f6c6d (patch)
tree47f9544fe8996da2a5d5ea52f093a5dc773fbd0e /environments
parentd1e59ff7205d950ddc1fc30276d90c56fadd944b (diff)
composable glance services
Adds new puppet and puppet pacemaker specific services for Glance API and Glance Registry. The Pacemaker templates extend the default glance services and swap in the pacemaker specific puppet-tripleo profile instead. In the case of pacemaker glance-registry there is no separate puppet manifest so only the configuration parameters are maintained there. (Due to the way the pacemaker glance constraints are written the pacemaker varients of this service can't be split out...) Depends-On: Ifc388f7058ccfff2818f531bcbc00c7179874bbc Change-Id: I00a8c916129af43cda225754eb10370289bb4b41
Diffstat (limited to 'environments')
-rw-r--r--environments/puppet-pacemaker.yaml2
1 files changed, 2 insertions, 0 deletions
diff --git a/environments/puppet-pacemaker.yaml b/environments/puppet-pacemaker.yaml
index e3188090..2e6e5ec9 100644
--- a/environments/puppet-pacemaker.yaml
+++ b/environments/puppet-pacemaker.yaml
@@ -10,3 +10,5 @@ resource_registry:
# which use pacemaker. In the future (with upcoming HA light work) this
# list will hopefully be much smaller however.
OS::TripleO::Services::Keystone: ../puppet/services/pacemaker/keystone.yaml
+ OS::TripleO::Services::GlanceApi: ../puppet/services/pacemaker/glance-api.yaml
+ OS::TripleO::Services::GlanceRegistry: ../puppet/services/pacemaker/glance-registry.yaml