diff options
| -rw-r--r-- | deploy/adapters/ansible/roles/config-compute/tasks/main.yml | 4 | ||||
| -rwxr-xr-x | deploy/adapters/ansible/roles/config-controller/controller.j2 | 66 |
2 files changed, 2 insertions, 68 deletions
diff --git a/deploy/adapters/ansible/roles/config-compute/tasks/main.yml b/deploy/adapters/ansible/roles/config-compute/tasks/main.yml index 1c5b4865..886a407f 100644 --- a/deploy/adapters/ansible/roles/config-compute/tasks/main.yml +++ b/deploy/adapters/ansible/roles/config-compute/tasks/main.yml @@ -14,6 +14,8 @@ notify: - restart network service +- meta: flush_handlers + - name: Install apt packages apt: pkg: "nfs-kernel-server" @@ -32,5 +34,3 @@ dest: /etc/exports notify: - restart nfs service - -- meta: flush_handlers diff --git a/deploy/adapters/ansible/roles/config-controller/controller.j2 b/deploy/adapters/ansible/roles/config-controller/controller.j2 deleted file mode 100755 index a4f073f0..00000000 --- a/deploy/adapters/ansible/roles/config-controller/controller.j2 +++ /dev/null @@ -1,66 +0,0 @@ -# This file describes the network interfaces available on your system -# and how to activate them. For more information, see interfaces(5). - -# The loopback network interface -auto lo -iface lo inet loopback - -# Physical interface -auto eth0 -iface eth0 inet manual - -# OpenStack Networking VXLAN (tunnel/overlay) VLAN interface -auto {{sys_intf_mappings["mgmt"]["interface"]}}.{{sys_intf_mappings["mgmt"]["vlan_tag"]}} -iface {{sys_intf_mappings["mgmt"]["interface"]}}.{{sys_intf_mappings["mgmt"]["vlan_tag"]}} inet manual - vlan-raw-device {{sys_intf_mappings["mgmt"]["interface"]}} - -# Storage network VLAN interface (optional) -auto {{sys_intf_mappings["storage"]["interface"]}}.{{sys_intf_mappings["storage"]["vlan_tag"]}} -iface {{sys_intf_mappings["storage"]["interface"]}}.{{sys_intf_mappings["storage"]["vlan_tag"]}} inet manual - vlan-raw-device {{sys_intf_mappings["storage"]["interface"]}} - -# Container/Host management bridge -auto br-mgmt -iface br-mgmt inet static - bridge_stp off - bridge_waitport 0 - bridge_fd 0 - bridge_ports eth0 - address {{host_info[inventory_hostname].MGMT_IP}} - netmask 255.255.255.0 - -# OpenStack Networking VXLAN (tunnel/overlay) bridge -# -# Only the COMPUTE and NETWORK nodes must have an IP address -# on this bridge. When used by infrastructure nodes, the -# IP addresses are assigned to containers which use this -# bridge. -# -auto br-vxlan -iface br-vxlan inet manual - bridge_stp off - bridge_waitport 0 - bridge_fd 0 - bridge_ports {{sys_intf_mappings["mgmt"]["interface"]}}.{{sys_intf_mappings["mgmt"]["vlan_tag"]}} - -# OpenStack Networking VLAN bridge -auto br-vlan -iface br-vlan inet static - bridge_stp off - bridge_waitport 0 - bridge_fd 0 - bridge_ports {{ network_cfg["provider_net_mappings"][0]["interface"] }} - address {{ ip_settings[inventory_hostname]["br-prv"]["ip"] }} - netmask 255.255.255.0 - gateway {{ ip_settings[inventory_hostname]["br-prv"]["gw"] }} - dns-nameserver 8.8.8.8 8.8.4.4 - -# compute1 Storage bridge -auto br-storage -iface br-storage inet static - bridge_stp off - bridge_waitport 0 - bridge_fd 0 - bridge_ports {{sys_intf_mappings["storage"]["interface"]}}.{{sys_intf_mappings["storage"]["vlan_tag"]}} - address {{ ip_settings[inventory_hostname]["storage"]["ip"] }} - netmask 255.255.252.0 |