openstack/tripleo-heat-templates
Code Issues Proposed changes

Merge "Handle case change for dmidecode >= 3.1 in Ceph templates"

Browse Source
This commit is contained in:
Zuul 2019-02-06 00:37:43 +00:00 committed by Gerrit Code Review
commit 9127abc193
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -431,7 +431,10 @@ outputs:
- name: generate nodes-uuid data file - name: generate nodes-uuid data file
copy: copy:
dest: "{{playbook_dir}}/ceph-ansible/nodes_uuid_data.json" dest: "{{playbook_dir}}/ceph-ansible/nodes_uuid_data.json"
content: {get_param: NodeDataLookup} content:
yaql:
expression: dict($.data.keys().select($.toLower()).zip($.data.values()))
data: {get_param: NodeDataLookup}
- name: generate nodes-uuid playbook - name: generate nodes-uuid playbook
copy: copy:
dest: "{{playbook_dir}}/ceph-ansible/nodes_uuid_playbook.yml" dest: "{{playbook_dir}}/ceph-ansible/nodes_uuid_playbook.yml"
@ -443,7 +446,7 @@ outputs:
set_fact: set_fact:
nodes_data: "{% raw %}{{ lookup('file','./nodes_uuid_data.json') | from_json }}{% endraw %}" nodes_data: "{% raw %}{{ lookup('file','./nodes_uuid_data.json') | from_json }}{% endraw %}"
- name: register machine id - name: register machine id
command: dmidecode -s system-uuid command: dmidecode -s system-uuid | tr A-F a-f
register: machine_uuid register: machine_uuid
# NOTE(tonyb): 0 == no error, 1 == -EPERM or bad data and 2 == Command not found # NOTE(tonyb): 0 == no error, 1 == -EPERM or bad data and 2 == Command not found
# 1 and 2 aren't great but shouldn't cause the deploy to fail. If we're using # 1 and 2 aren't great but shouldn't cause the deploy to fail. If we're using