cc0c466044
After merging [0], the step for each upgrade_task is now handled in a 'when' condition. This patch corrects some templates which where not following that logic or had some syntax error. [0] https://review.openstack.org/#/c/510902/ Change-Id: I5e42fa6b3d84ad6e0163900ee8146fd224fb5103
80 lines
2.3 KiB
YAML
80 lines
2.3 KiB
YAML
heat_template_version: queens
|
|
|
|
description: >
|
|
Ceph OSD service.
|
|
|
|
parameters:
|
|
ServiceData:
|
|
default: {}
|
|
description: Dictionary packing service data
|
|
type: json
|
|
ServiceNetMap:
|
|
default: {}
|
|
description: Mapping of service_name -> network name. Typically set
|
|
via parameter_defaults in the resource registry. This
|
|
mapping overrides those in ServiceNetMapDefaults.
|
|
type: json
|
|
DefaultPasswords:
|
|
default: {}
|
|
type: json
|
|
RoleName:
|
|
default: ''
|
|
description: Role name on which the service is applied
|
|
type: string
|
|
RoleParameters:
|
|
default: {}
|
|
description: Parameters specific to the role
|
|
type: json
|
|
EndpointMap:
|
|
default: {}
|
|
description: Mapping of service endpoint -> protocol. Typically set
|
|
via parameter_defaults in the resource registry.
|
|
type: json
|
|
CephAnsibleDisksConfig:
|
|
type: json
|
|
description: Disks config settings for ceph-ansible
|
|
default:
|
|
devices:
|
|
- /dev/vdb
|
|
journal_size: 512
|
|
osd_scenario: collocated
|
|
|
|
resources:
|
|
CephBase:
|
|
type: ./ceph-base.yaml
|
|
properties:
|
|
ServiceData: {get_param: ServiceData}
|
|
ServiceNetMap: {get_param: ServiceNetMap}
|
|
DefaultPasswords: {get_param: DefaultPasswords}
|
|
EndpointMap: {get_param: EndpointMap}
|
|
RoleName: {get_param: RoleName}
|
|
RoleParameters: {get_param: RoleParameters}
|
|
|
|
outputs:
|
|
role_data:
|
|
description: Role data for the Ceph OSD service.
|
|
value:
|
|
service_name: ceph_osd
|
|
upgrade_tasks:
|
|
- name: Check legacy Ceph hieradata
|
|
tags: validation
|
|
when: step|int == 0
|
|
shell: test "nil" == "$(hiera -c /etc/puppet/hiera.yaml ceph::profile::params::osds)"
|
|
puppet_config:
|
|
config_image: ''
|
|
config_volume: ''
|
|
step_config: ''
|
|
docker_config: {}
|
|
workflow_tasks: {get_attr: [CephBase, role_data, workflow_tasks]}
|
|
config_settings:
|
|
map_merge:
|
|
- tripleo.ceph_osd.firewall_rules:
|
|
'111 ceph_osd':
|
|
dport:
|
|
- '6800-7300'
|
|
- ceph_osd_ansible_vars:
|
|
map_merge:
|
|
- {get_attr: [CephBase, role_data, config_settings, ceph_common_ansible_vars]}
|
|
- osd_objectstore: filestore
|
|
- {get_param: CephAnsibleDisksConfig}
|