diff options
| author | Jenkins <jenkins@review.openstack.org> | 2016-08-31 14:51:02 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2016-08-31 14:51:02 +0000 |
| commit | 5f0ea5847f7a4307a416afc270c48c67a7809726 (patch) | |
| tree | 1b66875a00ad78ef4a98e6745b22d4235e837ae2 | |
| parent | 730086bfd18a8bc9c7ce0113f1c7d8b4a4f37c58 (diff) | |
| parent | 7d0a2aa9f0680e7da211a6f25b780be9c843d3a2 (diff) | |
| download | kolla-5f0ea5847f7a4307a416afc270c48c67a7809726.tar.gz kolla-5f0ea5847f7a4307a416afc270c48c67a7809726.zip | |
Merge "Limit hostfile generation to control nodes"
| -rw-r--r-- | ansible/roles/baremetal/tasks/append_to_etc_hosts.yml | 6 | ||||
| -rw-r--r-- | ansible/roles/baremetal/tasks/pre-install.yml | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/ansible/roles/baremetal/tasks/append_to_etc_hosts.yml b/ansible/roles/baremetal/tasks/append_to_etc_hosts.yml index 8b26d0101..b6eb60581 100644 --- a/ansible/roles/baremetal/tasks/append_to_etc_hosts.yml +++ b/ansible/roles/baremetal/tasks/append_to_etc_hosts.yml @@ -2,12 +2,12 @@ - name: get real node hostname shell: echo $(hostname) register: real_node_hostname - delegate_to: "{{ baremetal_node }}" + delegate_to: "{{ control_node }}" - name: get real node ip - shell: ip -4 addr show "{{ hostvars[baremetal_node]['baremetal_nic'] }}" | grep -oP "(?<=inet )[\d\.]+(?=/)" + shell: ip -4 addr show "{{ hostvars[control_node]['baremetal_nic'] }}" | grep -oP "(?<=inet )[\d\.]+(?=/)" register: real_node_ip - delegate_to: "{{ baremetal_node }}" + delegate_to: "{{ control_node }}" - name: Insert hosts entries for all kolla-ansible hosts lineinfile: diff --git a/ansible/roles/baremetal/tasks/pre-install.yml b/ansible/roles/baremetal/tasks/pre-install.yml index 9aa13c256..2e8f37c84 100644 --- a/ansible/roles/baremetal/tasks/pre-install.yml +++ b/ansible/roles/baremetal/tasks/pre-install.yml @@ -39,9 +39,9 @@ when: customize_etc_hosts | bool == True - include: append_to_etc_hosts.yml - with_inventory_hostnames: baremetal + with_inventory_hostnames: control loop_control: - loop_var: baremetal_node + loop_var: control_node become: True when: customize_etc_hosts | bool == True |