openstack/kolla-ansible
Code Issues Proposed changes

Merge "replace baremetal_nic with api_interface"

Browse Source
This commit is contained in:
Jenkins 2016-09-01 07:53:17 +00:00 committed by Gerrit Code Review
commit 677aa0ef25
2 changed files with 1 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ansible/roles/baremetal/defaults/main.yml
View File

@ -1,6 +1,4 @@
--- ---
baremetal_nic: "{{ api_interface | default('em1') }}"
docker_apt_url: "https://apt.dockerproject.org" docker_apt_url: "https://apt.dockerproject.org"
docker_apt_key_id: F76221572C52609D docker_apt_key_id: F76221572C52609D

2
ansible/roles/baremetal/tasks/append_to_etc_hosts.yml
View File

@ -5,7 +5,7 @@
delegate_to: "{{ control_node }}" delegate_to: "{{ control_node }}"
- name: get real node ip - name: get real node ip
shell: ip -4 addr show "{{ hostvars[control_node]['baremetal_nic'] }}" | grep -oP "(?<=inet )[\d\.]+(?=/)" shell: ip -4 addr show "{{ hostvars[control_node]['api_interface'] }}" | grep -oP "(?<=inet )[\d\.]+(?=/)"
register: real_node_ip register: real_node_ip
delegate_to: "{{ control_node }}" delegate_to: "{{ control_node }}"