From 293dc73265fde99e678f21cad8696ddb9f9298b1 Mon Sep 17 00:00:00 2001 From: Jiri Stransky Date: Wed, 21 Feb 2018 15:06:59 +0100 Subject: [PATCH] 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 --- puppet/role.role.j2.yaml | 2 +- roles/BlockStorage.yaml | 2 +- roles/CephStorage.yaml | 2 +- roles_data.yaml | 4 ++-- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/puppet/role.role.j2.yaml b/puppet/role.role.j2.yaml index 1f6a56e522..d623b5421d 100644 --- a/puppet/role.role.j2.yaml +++ b/puppet/role.role.j2.yaml @@ -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. diff --git a/roles/BlockStorage.yaml b/roles/BlockStorage.yaml index 1a100377f9..1dad61e6a7 100644 --- a/roles/BlockStorage.yaml +++ b/roles/BlockStorage.yaml @@ -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 diff --git a/roles/CephStorage.yaml b/roles/CephStorage.yaml index 253c2bf7f1..3e3a9501c7 100644 --- a/roles/CephStorage.yaml +++ b/roles/CephStorage.yaml @@ -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 diff --git a/roles_data.yaml b/roles_data.yaml index 2cb7067745..307c24a0b8 100644 --- a/roles_data.yaml +++ b/roles_data.yaml @@ -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