openstack
/
tripleo-heat-templates
Code Issues Proposed changes

Merge "Fix invalid Ceph and BlockStorage role template"

This commit is contained in:
Zuul 2018-02-22 17:29:03 +00:00 committed by Gerrit Code Review
parent 3e870f9405 293dc73265
commit f7d076fd7c
4 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
puppet/role.role.j2.yaml
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.

2
roles/BlockStorage.yaml
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

2
roles/CephStorage.yaml
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

4
roles_data.yaml
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