openstack
/
tripleo-heat-templates
Code Issues Proposed changes

Merge "Replace raw_get with dict access syntax"

This commit is contained in:
Zuul 2018-07-12 04:25:32 +00:00 committed by Gerrit Code Review
parent 6118dec096 99e933c7aa
commit dda5f34265
2 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
extraconfig/services/openshift-master.yaml
View File

@ -145,15 +145,15 @@ outputs:
nodes:
- new_node: "{{origin_nodes.results | selectattr('item', 'equalto', item) | selectattr('stdout', 'equalto', 'false') | list | count > 0}}"
hostname: "{{item}}"
ansible_user: "{{ hostvars.raw_get(item)['ansible_user'] | default(hostvars.raw_get(item)['ansible_ssh_user']) | default('root') }}"
ansible_host: "{{ hostvars.raw_get(item)['ansible_host'] | default(item) }}"
ansible_user: "{{ hostvars[item]['ansible_user'] | default(hostvars[item]['ansible_ssh_user']) | default('root') }}"
ansible_host: "{{ hostvars[item]['ansible_host'] | default(item) }}"
ansible_become: true
etcd_ip: "{{hostvars.raw_get(item)[openshift_master_network + '_ip']}}"
openshift_ip: "{{hostvars.raw_get(item)[openshift_master_network + '_ip']}}"
openshift_master_bind_addr: "{{hostvars.raw_get(item)[openshift_master_network + '_ip']}}"
openshift_public_ip: "{{hostvars.raw_get(item)[openshift_master_network + '_ip']}}"
openshift_hostname: "{{hostvars.raw_get(item)[openshift_master_network + '_ip']}}"
openshift_public_hostname: "{{hostvars.raw_get(item)[openshift_master_network + '_ip']}}"
etcd_ip: "{{hostvars[item][openshift_master_network + '_ip']}}"
openshift_ip: "{{hostvars[item][openshift_master_network + '_ip']}}"
openshift_master_bind_addr: "{{hostvars[item][openshift_master_network + '_ip']}}"
openshift_public_ip: "{{hostvars[item][openshift_master_network + '_ip']}}"
openshift_hostname: "{{hostvars[item][openshift_master_network + '_ip']}}"
openshift_public_hostname: "{{hostvars[item][openshift_master_network + '_ip']}}"
register: all_master_nodes
with_items: "{{groups[tripleo_role_name] | default([]) }}"

14
extraconfig/services/openshift-worker.yaml
View File

@ -87,14 +87,14 @@ outputs:
nodes:
- new_node: "{{origin_nodes.results | selectattr('item', 'equalto', item) | selectattr('stdout', 'equalto', 'false') | list | count > 0}}"
hostname: "{{item}}"
ansible_user: "{{ hostvars.raw_get(item)['ansible_user'] | default(hostvars.raw_get(item)['ansible_ssh_user']) | default('root') }}"
ansible_host: "{{ hostvars.raw_get(item)['ansible_host'] | default(item) }}"
ansible_user: "{{ hostvars[item]['ansible_user'] | default(hostvars[item]['ansible_ssh_user']) | default('root') }}"
ansible_host: "{{ hostvars[item]['ansible_host'] | default(item) }}"
ansible_become: true
etcd_ip: "{{hostvars.raw_get(item)[openshift_master_network + '_ip']}}"
openshift_ip: "{{hostvars.raw_get(item)[openshift_master_network + '_ip']}}"
openshift_public_ip: "{{hostvars.raw_get(item)[openshift_master_network + '_ip']}}"
openshift_hostname: "{{hostvars.raw_get(item)[openshift_master_network + '_ip']}}"
openshift_public_hostname: "{{hostvars.raw_get(item)[openshift_master_network + '_ip']}}"
etcd_ip: "{{hostvars[item][openshift_master_network + '_ip']}}"
openshift_ip: "{{hostvars[item][openshift_master_network + '_ip']}}"
openshift_public_ip: "{{hostvars[item][openshift_master_network + '_ip']}}"
openshift_hostname: "{{hostvars[item][openshift_master_network + '_ip']}}"
openshift_public_hostname: "{{hostvars[item][openshift_master_network + '_ip']}}"
openshift_schedulable: true
openshift_node_labels:
region: 'infra'