summaryrefslogtreecommitdiffstats
path: root/environments/major-upgrade-pacemaker-converge.yaml
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2016-10-05 18:01:20 +0000
committerGerrit Code Review <review@openstack.org>2016-10-05 18:01:20 +0000
commit5e4a51363b6a5b8ce3171ca2c942113972d1892d (patch)
tree7353c264fb473e46a477c9e28f6da036d11c9920 /environments/major-upgrade-pacemaker-converge.yaml
parentef8bf6379e94ce24cfdb69d51f61bf808b555600 (diff)
parent2e6cc07c1a74c2dd7be70568f49834bace499937 (diff)
Merge "Adds Environment File for Removing Sahara during M/N upgrade"
Diffstat (limited to 'environments/major-upgrade-pacemaker-converge.yaml')
-rw-r--r--environments/major-upgrade-pacemaker-converge.yaml4
1 files changed, 4 insertions, 0 deletions
diff --git a/environments/major-upgrade-pacemaker-converge.yaml b/environments/major-upgrade-pacemaker-converge.yaml
index f023cb32..e9a5f9be 100644
--- a/environments/major-upgrade-pacemaker-converge.yaml
+++ b/environments/major-upgrade-pacemaker-converge.yaml
@@ -1,2 +1,6 @@
parameter_defaults:
UpgradeLevelNovaCompute: ''
+
+resource_registry:
+ OS::TripleO::Services::SaharaApi: ../puppet/services/sahara-api.yaml
+ OS::TripleO::Services::SaharaEngine: ../puppet/services/sahara-engine.yaml