[CORD-1650]
Use p-i/roles/interface-config to bring up network
Documentation updates
[CORD-1478]
Don't use Vagrant provisioner to configure network on the head node
Change-Id: I0564b706fdb18a91b5c0a3682cbac14a1cb919ba
diff --git a/ansible/head-net.yml b/ansible/head-net.yml
deleted file mode 100644
index 7fac49d..0000000
--- a/ansible/head-net.yml
+++ /dev/null
@@ -1,23 +0,0 @@
-
-# Copyright 2017-present Open Networking Foundation
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-
----
-
-- hosts: all
- become: yes
- serial: 1
- roles:
- - head-net
diff --git a/ansible/roles/head-net/files/fabric.cfg b/ansible/roles/head-net/files/fabric.cfg
deleted file mode 100644
index 70c3466..0000000
--- a/ansible/roles/head-net/files/fabric.cfg
+++ /dev/null
@@ -1,23 +0,0 @@
-auto fabric
-iface fabric inet static
- address 10.6.1.1
- network 10.6.1.0
- netmask 255.255.255.0
- broadcast 10.6.1.255
- gateway 10.6.1.1
- bridge_ports eth3
- hwaddress ether a4:23:05:06:01:01
-
-# vSG public gateway
-# should be configurable
-auto fabric:0
-iface fabric:0 inet static
- address 10.7.1.1
- netmask 255.255.255.0
-
-# public network gateway
-# should be configurable
-auto fabric:1
-iface fabric:1 inet static
- address 10.8.1.1
- netmask 255.255.255.0
diff --git a/ansible/roles/head-net/files/mgmtbr.cfg b/ansible/roles/head-net/files/mgmtbr.cfg
deleted file mode 100644
index 626ab3c..0000000
--- a/ansible/roles/head-net/files/mgmtbr.cfg
+++ /dev/null
@@ -1,8 +0,0 @@
-auto mgmtbr
-iface mgmtbr inet static
- address 10.1.0.1
- network 10.1.0.0
- netmask 255.255.255.0
- broadcast 10.1.0.255
- gateway 10.1.0.1
- bridge_ports eth2
diff --git a/ansible/roles/head-net/tasks/main.yml b/ansible/roles/head-net/tasks/main.yml
deleted file mode 100644
index 98424fc..0000000
--- a/ansible/roles/head-net/tasks/main.yml
+++ /dev/null
@@ -1,49 +0,0 @@
-
-# Copyright 2017-present Open Networking Foundation
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-
-- name: Bridge Support is Present
- apt:
- name: bridge-utils
- force: yes
- tags: [prod]
-
-- name: Ensure Management Bridge
- copy:
- src: mgmtbr.cfg
- dest: /etc/network/interfaces.d/mgmtbr.cfg
- owner: root
- group: root
- mode: 0644
-
-- name: Ensure Management Bridge Up
- command: ifup mgmtbr
- changed_when: true
-
-- name: Ensure fabric bridge
- copy:
- src: fabric.cfg
- dest: /etc/network/interfaces.d/fabric.cfg
- owner: root
- group: root
- mode: 0644
-
-- name: Ensure fabric bridge
- command: ifup {{ item }}
- changed_when: true
- with_items:
- - fabric
- - fabric:0
- - fabric:1
diff --git a/docs/scripts/descriptions.md b/docs/scripts/descriptions.md
index 65b21fb..3401793 100644
--- a/docs/scripts/descriptions.md
+++ b/docs/scripts/descriptions.md
@@ -122,10 +122,10 @@
Symbolic links to create to use the extra space that is mounted when using
CloudLab
-## compute_external_interfaces
+## computenode_fabric_interfaces
-List of possible VTN external interfaces on the compute node, for setting up
-OpenStack with the VTN ML2 plugin.
+List of possible VTN external interfaces on the compute node that connect to
+the fabric, for setting up OpenStack with the VTN ML2 plugin.
## config_cord_dir
@@ -240,12 +240,6 @@
Filename of the JSON file used to configure the Fabric ONOS.
-## frontend_only
-
-`frontend_only` suppresses starting synchronzier containers as a part of the
-XOS container set. It is used in testing scenarios where synchronizers aren't
-needed.
-
## gerrit_changesets
List of gerrit
@@ -332,6 +326,10 @@
DNS Name of the headnode on the system, used to configure NSD DNS aliases.
+## headnode_fabric_bridge
+
+Name of the fabric bridge interface on the head node.
+
## headnode_nat_interface
Network interface on the head node that is connected to the internet. NAT is
@@ -342,10 +340,6 @@
DPDK setting to control memory allocation.
-## hwaddr_prefix
-
-MAC address prefix used when creating LXD containers, to assign them DHCP addresses.
-
## image_dir
Directory to download OpenStack glance images into on the head node.
@@ -371,27 +365,15 @@
Hostname (or IP) for the ElasticStack logging host machine.
-## management_hosts_net_cidr
+## management_net_bridge
-CIDR for the management_hosts VTN network.
-
-## management_hosts_net_range_xos_high
-
-Last IP address to assign as a part of the management_hosts VTN network.
-
-## management_hosts_net_range_xos_low
-
-First IP address to assign as a part of the management_hosts VTN network.
+Name of the management bridge interface on head and compute nodes.
## management_net_cidr
CIDR of the head node management network that connects between the OpenStack
LXC containers and compute nodes.
-## management_network_cidr
-
-CIDR for VTN MANAGEMENT_LOCAL network
-
## management_net_interfaces
List of physical interfaces on a node connected to the management network.
@@ -409,10 +391,6 @@
Password used with the [NG40 tester software](profiles/mcord/installation_guide.md#ng40-vtester-m-cord-license).
-## mgmt_ipv4_first_octets
-
-First 3 octets of the IP address of the management network.
-
## min_memtotal_mb
Minimum amount of memory to allow for a full virtual POD to be built with.
@@ -625,6 +603,10 @@
Enables the use of `apt-cacher-ng` to cache APT packages on Head/LXC/Compute nodes.
+## use_elasticstack
+
+Enables elasticstack (aka `ELK`) for log aggregation
+
## use_dpdk
Enable DPDK in OpenStack Nova and Neutron
@@ -637,10 +619,6 @@
Use MaaS to manage compute nodes and switches.
-## use_management_hosts
-
-Whether the management_hosts network type in VTN should be enabled.
-
## use_openstack
Bring up and use OpenStack to manage VM's.
@@ -670,23 +648,34 @@
DNS name of the server to ping when running the vSG portion of the
[pod-test](install_virtual.md#test-vsg).
-## vtn_data_plane_interface
+## vtn_integration_bridge_interface
-Physical interface network used for the VTN data plane.
+Which network interface is added to the `br-int` integration bridge by VTN when
+setting up OpenVSwitch on compute nodes.
## vtn_net_management_host_hwaddr_prefix
MAC address prefix for interfaces on the VTN MANAGEMENT_HOST network.
-## vtn_management_host_net_interface
-
-Network interface to use on the head/compute nodes for the management_host
-network.
-
## vtn_net_management_host_cidr
CIDR for the MANAGEMENT_HOST VTN network.
+## vtn_net_management_host_interface
+
+
+## vtn_net_management_host_range_xos_high
+
+Last IP address to assign as a part of the management_hosts VTN network.
+
+## vtn_net_management_host_range_xos_low
+
+First IP address to assign as a part of the management_hosts VTN network.
+
+## vtn_net_management_local_cidr
+
+CIDR for the management_local VTN network. Used for local networking on compute nodes.
+
## vtn_net_public_cidr
CIDR for the PUBLIC VTN network.
diff --git a/scenarios/controlkube/config.yml b/scenarios/controlkube/config.yml
index 2c482ed..f38d12c 100644
--- a/scenarios/controlkube/config.yml
+++ b/scenarios/controlkube/config.yml
@@ -92,13 +92,6 @@
vm_public_network_name: cordpub
vm_public_network_cidr: "10.230.100.0/24"
-# which network interfaces belong to which bond on nodes
-management_net_interfaces:
- - eth1
-
-fabric_net_interfaces:
- - eth2
-
# images for imagebuilder to build/pull (tagged elsewhere)
docker_image_whitelist:
- "xosproject/xos-base"
diff --git a/scenarios/cord/Vagrantfile b/scenarios/cord/Vagrantfile
index 2216375..9799a91 100644
--- a/scenarios/cord/Vagrantfile
+++ b/scenarios/cord/Vagrantfile
@@ -58,9 +58,6 @@
v.memory = settings['head_vm_mem']
v.cpus = settings['head_vm_cpu']
end
- d.vm.provision :ansible do |ansible|
- ansible.playbook = $cordpath + "/build/ansible/head-net.yml"
- end
d.vm.provider :libvirt do |v, override|
v.memory = settings['head_vm_mem']
v.cpus = settings['head_vm_cpu']
diff --git a/scenarios/cord/config.yml b/scenarios/cord/config.yml
index d93e91b..66a3bef 100644
--- a/scenarios/cord/config.yml
+++ b/scenarios/cord/config.yml
@@ -102,6 +102,13 @@
vm_management_network_name: cordmgmt
+# name of the fabric bridge interface used by VTN (to match maas-configured
+# compute node interfaces)
+vtn_integration_bridge_interface: fabric
+
+# name of the management network bridge (to match maas-configured interface)
+management_net_bridge: mgmtbr
+
# Enable experimental fabric
enable_fabric: False
diff --git a/scenarios/preppedkube/config.yml b/scenarios/preppedkube/config.yml
index ef4e85b..833ef99 100644
--- a/scenarios/preppedkube/config.yml
+++ b/scenarios/preppedkube/config.yml
@@ -89,35 +89,10 @@
- name: compute2
ipv4_last_octet: 18
-management_net_bridge: "mgmtbridge"
-
vm_management_network_name: cordmgmt
vm_public_network_name: cordpub
vm_public_network_cidr: "10.230.100.0/24"
-# which network interfaces belong to which bond on nodes
-management_net_interfaces:
- - eth1
-
-fabric_net_interfaces:
- - eth2
-
-# veth pair connected between a linux and integration bridge are described here
-# https://wiki.opencord.org/display/CORD/VTN+Manual+Tests#VTNManualTests-Testenvironmentsetup
-# but may not work?
-# vtn_integration_bridge_interface: vethfabric1
-
-vtn_integration_bridge_interface: fabricbond
-
-headnode_fabric_bridge: fabricbridge
-
-use_vtn_net_management_host: False
-
-vtn_net_management_host_interface: vethmgmt1
-
-use_addresspool_vsg: True
-use_addresspool_public: True
-
# images for imagebuilder to build/pull (tagged elsewhere)
docker_image_whitelist:
- "xosproject/xos-base"
diff --git a/scenarios/preppedpod/config.yml b/scenarios/preppedpod/config.yml
index e928e1f..172e213 100644
--- a/scenarios/preppedpod/config.yml
+++ b/scenarios/preppedpod/config.yml
@@ -89,36 +89,10 @@
compute_vm_mem: 16384
compute_vm_cpu: 8
-management_net_bridge: "mgmtbridge"
-
vm_management_network_name: cordmgmt
vm_public_network_name: cordpub
vm_public_network_cidr: "10.230.100.0/24"
-# which network interfaces belong to which bond on nodes
-management_net_interfaces:
- - eth1
-
-fabric_net_interfaces:
- - eth2
-
-# veth pair connected between a linux and integration bridge are described here
-# https://wiki.opencord.org/display/CORD/VTN+Manual+Tests#VTNManualTests-Testenvironmentsetup
-# but may not work?
-# vtn_integration_bridge_interface: vethfabric1
-
-vtn_integration_bridge_interface: fabricbond
-
-headnode_fabric_bridge: fabricbridge
-
-use_vtn_net_management_host: False
-
-vtn_net_management_host_interface: vethmgmt1
-
-use_addresspool_vsg: True
-use_addresspool_public: True
-
-
# images for imagebuilder to build/pull (tagged elsewhere)
docker_image_whitelist:
- "xosproject/xos-base"