diff options
| author | Jenkins <jenkins@review.openstack.org> | 2016-09-01 07:53:17 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2016-09-01 07:53:17 +0000 |
| commit | 677aa0ef2546062fd31bcf92f34fd42ac0583798 (patch) | |
| tree | 4e8f58f47cb4e195570e3ac79d62bd8a06e95f5a | |
| parent | cff3755ca6a217a224eed248307b7464bc750f7d (diff) | |
| parent | 7f1084808b34cfc32683e4259f88e29fd24e53be (diff) | |
| download | kolla-677aa0ef2546062fd31bcf92f34fd42ac0583798.tar.gz kolla-677aa0ef2546062fd31bcf92f34fd42ac0583798.zip | |
Merge "replace baremetal_nic with api_interface"
| -rw-r--r-- | ansible/roles/baremetal/defaults/main.yml | 2 | ||||
| -rw-r--r-- | ansible/roles/baremetal/tasks/append_to_etc_hosts.yml | 2 |
2 files changed, 1 insertions, 3 deletions
diff --git a/ansible/roles/baremetal/defaults/main.yml b/ansible/roles/baremetal/defaults/main.yml index 5ffd34b4c..87cae0e4d 100644 --- a/ansible/roles/baremetal/defaults/main.yml +++ b/ansible/roles/baremetal/defaults/main.yml @@ -1,6 +1,4 @@ --- -baremetal_nic: "{{ api_interface | default('em1') }}" - docker_apt_url: "https://apt.dockerproject.org" docker_apt_key_id: F76221572C52609D diff --git a/ansible/roles/baremetal/tasks/append_to_etc_hosts.yml b/ansible/roles/baremetal/tasks/append_to_etc_hosts.yml index b6eb60581..c577d2fe2 100644 --- a/ansible/roles/baremetal/tasks/append_to_etc_hosts.yml +++ b/ansible/roles/baremetal/tasks/append_to_etc_hosts.yml @@ -5,7 +5,7 @@ delegate_to: "{{ control_node }}" - 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 delegate_to: "{{ control_node }}" |