diff options
Diffstat (limited to 'deploy/adapters/ansible/roles/config-compute')
| -rw-r--r-- | deploy/adapters/ansible/roles/config-compute/tasks/Ubuntu.yml | 6 | ||||
| -rw-r--r-- | deploy/adapters/ansible/roles/config-compute/templates/compute.j2 | 3 |
2 files changed, 1 insertions, 8 deletions
diff --git a/deploy/adapters/ansible/roles/config-compute/tasks/Ubuntu.yml b/deploy/adapters/ansible/roles/config-compute/tasks/Ubuntu.yml index 4bf243b5..886a407f 100644 --- a/deploy/adapters/ansible/roles/config-compute/tasks/Ubuntu.yml +++ b/deploy/adapters/ansible/roles/config-compute/tasks/Ubuntu.yml @@ -7,12 +7,6 @@ # http://www.apache.org/licenses/LICENSE-2.0 ############################################################################## --- -- name: remove resolv.conf - file: "dest=/etc/resolv.conf state=absent" - -- name: make a symbolic link - shell: "ln -s /var/run/resolvconf/resolv.conf /etc/resolv.conf" - - name: configure network template: src: compute.j2 diff --git a/deploy/adapters/ansible/roles/config-compute/templates/compute.j2 b/deploy/adapters/ansible/roles/config-compute/templates/compute.j2 index 9a734385..66c3297b 100644 --- a/deploy/adapters/ansible/roles/config-compute/templates/compute.j2 +++ b/deploy/adapters/ansible/roles/config-compute/templates/compute.j2 @@ -69,9 +69,8 @@ iface br-vlan inet static # -- Putting this here is primarily for tempest to work. address {{host_info[inventory_hostname].VLAN_IP_SECOND}} netmask 255.255.252.0 - dns-nameservers {{ DNS }} -# compute1 Storage bridge +# compute storage bridge auto br-storage iface br-storage inet static bridge_stp off |