diff options
| author |   Jenkins <jenkins@review.openstack.org> | 2016-10-05 18:01:20 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <review@openstack.org> | 2016-10-05 18:01:20 +0000 |
| commit | 5e4a51363b6a5b8ce3171ca2c942113972d1892d (patch) | |
| tree | 7353c264fb473e46a477c9e28f6da036d11c9920 /environments | |
| parent | ef8bf6379e94ce24cfdb69d51f61bf808b555600 (diff) | |
| parent | 2e6cc07c1a74c2dd7be70568f49834bace499937 (diff) | |
Merge "Adds Environment File for Removing Sahara during M/N upgrade"
Diffstat (limited to 'environments')
| -rw-r--r-- | environments/major-upgrade-pacemaker-converge.yaml | 4 | ||||
| -rw-r--r-- | environments/major-upgrade-remove-sahara.yaml | 6 |
2 files changed, 10 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 diff --git a/environments/major-upgrade-remove-sahara.yaml b/environments/major-upgrade-remove-sahara.yaml new file mode 100644 index 00000000..e0aaf130 --- /dev/null +++ b/environments/major-upgrade-remove-sahara.yaml @@ -0,0 +1,6 @@ +parameter_defaults: + KeepSaharaServicesOnUpgrade: false +resource_registry: + OS::TripleO::Services::SaharaApi: OS::Heat::None + OS::TripleO::Services::SaharaEngine: OS::Heat::None + |