From 1971e7b049f13a8a2d45fb77412ff1a87ca043c2 Mon Sep 17 00:00:00 2001 From: Giulio Fidente Date: Wed, 6 Dec 2017 14:53:18 +0100 Subject: [PATCH] Passes NodeDataLookup to ceph-ansible workflow Per-node customizations were only dumped as hieradata, so the ceph-ansible workflow could not consume them. This change passes the structure to the mistral workflow so that it can consume the data and populate the inventory accordingly. Change-Id: Ie7a9f10f0c821b8c642494a4d3933b2901f39d40 Depends-On: Ia23825aea938f6f9bcf536e35cad562a1b96c93b Closes-Bug: #1736707 --- docker/services/ceph-ansible/ceph-base.yaml | 5 +++++ puppet/extraconfig/pre_deploy/per_node.yaml | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/docker/services/ceph-ansible/ceph-base.yaml b/docker/services/ceph-ansible/ceph-base.yaml index a9899c5638..69e5e8417c 100644 --- a/docker/services/ceph-ansible/ceph-base.yaml +++ b/docker/services/ceph-ansible/ceph-base.yaml @@ -38,6 +38,10 @@ parameters: constraints: - allowed_values: ['', 'UPGRADE'] default: '' + NodeDataLookup: + type: string + default: '{}' + description: json string containing per-node configuration map CephAnsibleWorkflowName: type: string description: Name of the Mistral workflow to execute @@ -200,6 +204,7 @@ outputs: - {get_param: CephAnsibleUpgradePlaybook} - {get_param: CephAnsiblePlaybook} ansible_playbook_verbosity: {get_param: CephAnsiblePlaybookVerbosity} + node_data_lookup: {get_param: NodeDataLookup} config_settings: ceph_common_ansible_vars: ireallymeanit: 'yes' diff --git a/puppet/extraconfig/pre_deploy/per_node.yaml b/puppet/extraconfig/pre_deploy/per_node.yaml index 33ae3e28af..c39b4857d9 100644 --- a/puppet/extraconfig/pre_deploy/per_node.yaml +++ b/puppet/extraconfig/pre_deploy/per_node.yaml @@ -17,7 +17,7 @@ parameters: # "8CF1A7EA-7B4B-4433-AC83-17675514B1B8": {"foo2": "bar2"}} NodeDataLookup: type: string - default: '' + default: '{}' description: json string containing per-node configuration map resources: