aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichal (inc0) Jastrzebski <inc007@gmail.com>2016-08-30 16:41:16 +0000
committerMichal (inc0) Jastrzebski <inc007@gmail.com>2016-08-30 16:41:16 +0000
commit7d0a2aa9f0680e7da211a6f25b780be9c843d3a2 (patch)
tree5e7b43b5d50f7a0271f18915af95f73d19b1fba8
parentdb0dc4ae48eebf69d1378bdf21841abb0238c4bf (diff)
downloadkolla-7d0a2aa9f0680e7da211a6f25b780be9c843d3a2.tar.gz
kolla-7d0a2aa9f0680e7da211a6f25b780be9c843d3a2.zip
Limit hostfile generation to control nodes
With current implementation generation of hostfile is N^2, let's at least limit this to controller nodes. Currently only RabbitMQ requires hostnames, and these lands on control. TrivialFix Change-Id: I15f8d98386ede8bbc89f66923f21547efe20ff37
-rw-r--r--ansible/roles/baremetal/tasks/append_to_etc_hosts.yml6
-rw-r--r--ansible/roles/baremetal/tasks/pre-install.yml4
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