Fix invalid Ceph and BlockStorage role template

The roles would get generated with deprecated parameter group, but no
parameter in that group. Heat would then refuse that template.

Change-Id: I526c8177d1a759ae9e48cdb8b94fc2aa7fe3c6fb
Closes-Bug: #1750828
This commit is contained in:
Jiri Stransky 2018-02-21 15:06:59 +01:00
parent f85cefec43
commit 293dc73265
4 changed files with 5 additions and 5 deletions

View File

@ -237,7 +237,7 @@ parameters:
Name of the subnet on ctlplane network for this role.
type: string
{% if role.uses_deprecated_params is defined %}
{% if role.uses_deprecated_params|default(false) %}
parameter_groups:
- label: deprecated
description: Do not use deprecated params, they will be removed.

View File

@ -8,7 +8,7 @@
- InternalApi
- Storage
- StorageMgmt
uses_deprecated_params: True
uses_deprecated_params: False
deprecated_nic_config_name: 'cinder-storage.yaml'
ServicesDefault:
- OS::TripleO::Services::Aide

View File

@ -7,7 +7,7 @@
networks:
- Storage
- StorageMgmt
uses_deprecated_params: True
uses_deprecated_params: False
deprecated_nic_config_name: 'ceph-storage.yaml'
ServicesDefault:
- OS::TripleO::Services::Aide

View File

@ -247,7 +247,7 @@
- InternalApi
- Storage
- StorageMgmt
uses_deprecated_params: True
uses_deprecated_params: False
deprecated_nic_config_name: 'cinder-storage.yaml'
ServicesDefault:
- OS::TripleO::Services::Aide
@ -332,7 +332,7 @@
networks:
- Storage
- StorageMgmt
uses_deprecated_params: True
uses_deprecated_params: False
deprecated_nic_config_name: 'ceph-storage.yaml'
ServicesDefault:
- OS::TripleO::Services::Aide