Leave only compute pinning
It was found that if control plane was upgraded with some different
pinning options (e.g.: scheduler) except compute and pinning
wasn`t deleted while compute nodes are not yet upgraded
it leads to inability to boot instance with RPC versions error.
It was decided to leave only compute pinning.
Change-Id: Ib168e54432f08faba641c5604899346472fa8576
Related-PROD: PROD-30410
diff --git a/nova/map.jinja b/nova/map.jinja
index eae09cc..012aa74 100644
--- a/nova/map.jinja
+++ b/nova/map.jinja
@@ -118,23 +118,10 @@
{% set upgrade = pillar.get('nova', {}).get('upgrade', {}) %}
{% set pin_level = pillar.get('nova', {}).get('upgrade', {}).get('old_release','') %}
-{% if pin_level == "ocata" %}
+{% if pin_level not in ["juno", "kilo", "liberty", "mitaka", "newton", "ocata"] %}
{% set upgrade_levels = {
'upgrade_levels': {
- 'scheduler': pin_level,
- 'compute': pin_level,
- 'cells': pin_level,
- 'network': pin_level,
- 'console': pin_level,
- 'consoleauth': pin_level,
- 'conductor': pin_level,
- },
-} %}
-{% elif pin_level == "pike" %}
-{% set upgrade_levels = {
- 'upgrade_levels': {
- 'scheduler': pin_level,
- 'compute': pin_level,
+ 'compute': 'auto',
},
} %}
{% else%}
@@ -285,7 +272,7 @@
{% set compute = salt["grains.filter_by"](compute_defaults, merge=pillar.nova.get("compute", {}), base='BaseDefaults') %}
{%- if pillar.nova.get('upgrade',{}).get('enabled',False) %}
- {% do compute.update({'upgrade_levels': {'compute': 'auto'}}) %}
+ {% do compute.update(upgrade_levels) %}
{% do controller.update(upgrade_levels) %}
{%- endif %}