openstack/tripleo-heat-templates
Code Issues Proposed changes

Merge "Passes NodeDataLookup to ceph-ansible workflow"

Browse Source
This commit is contained in:
Zuul 2017-12-18 16:30:35 +00:00 committed by Gerrit Code Review
commit 541b39ea8a
2 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
docker/services/ceph-ansible/ceph-base.yaml
View File

@ -38,6 +38,10 @@ parameters:
constraints: constraints:
- allowed_values: ['', 'UPGRADE'] - allowed_values: ['', 'UPGRADE']
default: '' default: ''
NodeDataLookup:
type: string
default: '{}'
description: json string containing per-node configuration map
CephAnsibleWorkflowName: CephAnsibleWorkflowName:
type: string type: string
description: Name of the Mistral workflow to execute description: Name of the Mistral workflow to execute
@ -200,6 +204,7 @@ outputs:
- {get_param: CephAnsibleUpgradePlaybook} - {get_param: CephAnsibleUpgradePlaybook}
- {get_param: CephAnsiblePlaybook} - {get_param: CephAnsiblePlaybook}
ansible_playbook_verbosity: {get_param: CephAnsiblePlaybookVerbosity} ansible_playbook_verbosity: {get_param: CephAnsiblePlaybookVerbosity}
node_data_lookup: {get_param: NodeDataLookup}
config_settings: config_settings:
ceph_common_ansible_vars: ceph_common_ansible_vars:
ireallymeanit: 'yes' ireallymeanit: 'yes'

2
puppet/extraconfig/pre_deploy/per_node.yaml
View File

@ -17,7 +17,7 @@ parameters:
# "8CF1A7EA-7B4B-4433-AC83-17675514B1B8": {"foo2": "bar2"}} # "8CF1A7EA-7B4B-4433-AC83-17675514B1B8": {"foo2": "bar2"}}
NodeDataLookup: NodeDataLookup:
type: string type: string
default: '' default: '{}'
description: json string containing per-node configuration map description: json string containing per-node configuration map
resources: resources: