openstack
/
fuel-devops
Code Issues Proposed changes

Replace 'baremetal' with 'hybrid' doc for YAML template 

- baremetal_example.yaml.rst replaced with already working template
  for hybrid environment and additional details
- add a known issue for fuel-devops3.0 with libvirt1.2.2 : network
  interface names on nodes can conflict between different
  environments.

Change-Id: I79d3e54a7d2ef19dd510933f62b871829cf291fa
blueprint: devops-bare-metal-driver
This commit is contained in:
Dennis Dmitriev 2016-05-27 15:50:28 +03:00
parent ed01e8f82f
commit c746e4aba3
3 changed files with 143 additions and 69 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
doc/source/install.rst
View File

@ -536,4 +536,3 @@ Known issues
`Bug 1133155 <https://bugzilla.redhat.com/show_bug.cgi?id=1133155>`_.
Workaround: upgrade libvirt to the latest version.

2
doc/source/template_examples/default_example.yaml.rst
View File

@ -52,7 +52,7 @@ by most of fuel-qa system tests:
groups:
- name: default
driver:
name: devops.driver.libvirt.libvirt_driver
name: devops.driver.libvirt
params:
connection_string: !os_env CONNECTION_STRING, qemu:///system
storage_pool_name: !os_env STORAGE_POOL_NAME, default

209
doc/source/template_examples/baremetal_example.yaml.rst → doc/source/template_examples/hybrid_example.yaml.rst
View File

@ -1,16 +1,71 @@
.. _baremetal_example.yaml:
.. _hybrid_example.yaml:
Baremetal YAML template
=======================
Hybrid YAML template
====================
This template describes an environment configuration where Fuel admin node
is on a VM on the host, that has connectivity to the baremetal networks
('fuelweb_admin' for PXE provisioning and 'public' for setup NAT from the
baremetal lab to the Internet.
baremetal lab to the Internet).
This template, with correct IPMI credentials and sudo access on the host
for `brctl` command, can be used for run most of fuel-qa system tests on
a baremetal lab (requires the [1] merged to fuel-qa).
Requirements to use the template with the baremetal lab:
1. If 'parent_iface' is used for any of libvirt l2_network_device,
'sudo' access on the host is required to automatic connect host's interfaces
to libvirt virtual networks (linux bridges).
2. Export necessary environment variables:
.. code-block:: bash
- ENV_NAME
- ISO_PATH
- BAREMETAL_ADMIN_IFACE # Interface of the host, that has untagged
# connectivity to the baremetal PXE network
# and other tagged baremetal networks.
# It should be in UP state.
# Tip: if the 'admin' network should be
# connected to an existing bridge on the host,
# you can use a veth pair, one iface of
# which is included into the bridge, and
# another iface is provided in the environment
# variable BAREMETAL_ADMIN_IFACE.
- IPMI_HOST{1..5}, IPMI_USER, IPMI_PASSWORD # Access credentials
# to IPMI nodes
3. Configure MACs for *all* interfaces. In this template, order of the
interfaces doesn't matter, because mapping OpenStack networks on node
interfaces will be done using specified MAC addresses. So if a server
has 4 network interfaces, but you planned to use only 2 interfaces for
OpenStack networks, you can configure here only these 2 interfaces.
4. Use this template to create the environment:
- From command line:
.. code-block:: bash
$ dos.py create-env ./path/to/hybrid_template.yaml
- For already existing system tests (TEST_GROUP='smoke_neutron' for example)
(requires fuel-qa branch > stable/mitaka, with support for fuel-devops3.0)
.. code-block:: bash
$ export DEVOPS_SETTINGS_TEMPLATE=./path/to/hybrid_template.yaml
$ sh -x "utils/jenkins/system_tests.sh" \
-t test \
-w "${WORKSPACE}" \
-V "${VENV_PATH}" \
-j "${JOB_NAME}" \
-o --group="${TEST_GROUP}" \
-i "${ISO_PATH}"
- For fuel-qa/fuel_tests (pytest-based):
- In the test class, initialize self.config_file=./path/to/hybrid_template.yaml
- Use @pytest.mark.need_ready_cluster for test case methods to load the config and
prepare the environment.
Additional details about this template:
- Fuel master node is on a separate node group because different fuel-devops
drivers are used for Fuel master node and for baremetal nodes;
@ -23,11 +78,14 @@ a baremetal lab (requires the [1] merged to fuel-qa).
- By default, 'eth1' is added to the libvirt bridge of the 'admin'
l2_network_device to get connectivity to the baremetal networks connected
to this host's interface;
- 'public' l2_network_device is used for providing NAT from baremetal public
network to the Internet, and for access to the public IPs from system
tests;
[1] https://review.openstack.org/#/c/292977/
- 'public' l2_network_device in the libvirt group is used for providing NAT
from baremetal tagged public network to the Internet, and for access to
public IPs on the baremetal nodes directly from system tests.
- Despite the fact that there is used two node groups, all baremetal nodes
actually are connected to the PXE admin network of the first node group
and will be bootstrapped as the nodes of the first node group. Second
node group will not be used with this config, because it requires another
network setup and manual Fuel configuration for additional interfaces.
.. code-block:: yaml
@ -41,6 +99,7 @@ a baremetal lab (requires the [1] merged to fuel-qa).
default_interface_model:
- &interface_model !os_env INTERFACE_MODEL, e1000
template:
devops_settings:
env_name: !os_env ENV_NAME
@ -50,6 +109,7 @@ a baremetal lab (requires the [1] merged to fuel-qa).
fuelweb_admin-pool01:
net: *pool_default
params:
vlan_start: 0
ip_reserved:
gateway: +1
l2_network_device: +1 # l2_network_device will get this IP address
@ -59,7 +119,7 @@ a baremetal lab (requires the [1] merged to fuel-qa).
public-pool01:
net: *pool_default
params:
vlan_start: 100
vlan_start: 200
ip_reserved:
gateway: +1
l2_network_device: +1 # l2_network_device will get this IP address
@ -70,21 +130,48 @@ a baremetal lab (requires the [1] merged to fuel-qa).
storage-pool01:
net: *pool_default
params:
vlan_start: 101
vlan_start: 201
management-pool01:
net: *pool_default
params:
vlan_start: 102
vlan_start: 202
private-pool01:
net: *pool_default
params:
vlan_start: 960
vlan_end: 1000
fuelweb_admin-pool02:
net: *pool_default
params:
vlan_start: 0
public-pool02:
net: *pool_default
params:
vlan_start: 200
storage-pool02:
net: *pool_default
params:
vlan_start: 201
management-pool02:
net: *pool_default
params:
vlan_start: 202
private-pool02:
net: *pool_default
params:
vlan_start: 960
groups:
- name: default
driver:
name: devops.driver.libvirt.libvirt_driver
name: devops.driver.libvirt
params:
connection_string: !os_env CONNECTION_STRING, qemu:///system
storage_pool_name: !os_env STORAGE_POOL_NAME, default
@ -109,9 +196,11 @@ a baremetal lab (requires the [1] merged to fuel-qa).
forward:
mode: nat
parent_iface:
# If the 'admin' network should be connected to an existing
# bridge instead of dedicated interface, use a veth pair.
phys_dev: !os_env BAREMETAL_ADMIN_IFACE, eth1
vlan_ifaces:
- 100
- 200
public:
address_pool: public-pool01
@ -120,7 +209,7 @@ a baremetal lab (requires the [1] merged to fuel-qa).
mode: nat
parent_iface:
l2_net_dev: admin
tag: 100
tag: 200
nodes:
- name: admin # Custom name of VM for Fuel admin node
@ -145,44 +234,42 @@ a baremetal lab (requires the [1] merged to fuel-qa).
l2_network_device: admin # Libvirt bridge name. It is *NOT* a Nailgun network
interface_model: *interface_model
network_config:
iface1
iface1:
networks:
- fuelweb_admin
groups:
- name: baremetal-rack-01
- name: baremetal-rack01
driver:
name: devops.driver.baremetal.ipmi_driver
name: devops.driver.baremetal
# Slave nodes
network_pools: # Address pools for OpenStack networks.
# Actual names should be used for keys
# (the same as in Nailgun, for example)
fuelweb_admin: fuelweb_admin-pool01
public: public-pool01
storage: storage-pool01
management: management-pool01
private: private-pool01
fuelweb_admin: fuelweb_admin-pool02
public: public-pool02
storage: storage-pool02
management: management-pool02
private: private-pool02
nodes:
- name: slave-01 # Custom name of baremetal for Fuel slave node
role: fuel_slave # Fixed role for Fuel master node properties
params:
ipmi_user: username1
ipmi_password: password1
ipmi_user: !os_env IPMI_USER
ipmi_password: !os_env IPMI_PASSWORD
ipmi_previlegies: OPERATOR
ipmi_host: ipmi1.test.local
ipmi_host: !os_env IPMI_HOST1
ipmi_lan_interface: lanplus
ipmi_port: 623
impi_cmd: ipmitool
# so, interfaces can be turn on in one or in a different switches.
interfaces:
- label: iface1
mac: aa:bb:cc:dd:ee:11
mac_address: xx:xx:xx:xx:xx:xx
- label: iface2
mac: aa:bb:cc:dd:ee:12
mac_address: xx:xx:xx:xx:xx:xx
network_config:
iface1:
networks:
@ -197,20 +284,19 @@ a baremetal lab (requires the [1] merged to fuel-qa).
- name: slave-02 # Custom name of baremetal for Fuel slave node
role: fuel_slave # Fixed role for Fuel master node properties
params:
ipmi_user: username2
ipmi_password: password2
ipmi_user: !os_env IPMI_USER
ipmi_password: !os_env IPMI_PASSWORD
ipmi_previlegies: OPERATOR
ipmi_host: ipmi2.test.local
ipmi_host: !os_env IPMI_HOST2
ipmi_lan_interface: lanplus
ipmi_port: 623
impi_cmd: ipmitool
# so, interfaces can be turn on in one or in a different switches.
interfaces:
- label: iface1
mac: aa:bb:cc:dd:ee:21
mac_address: xx:xx:xx:xx:xx:xx
- label: iface2
mac: aa:bb:cc:dd:ee:22
mac_address: xx:xx:xx:xx:xx:xx
network_config:
iface1:
networks:
@ -225,20 +311,19 @@ a baremetal lab (requires the [1] merged to fuel-qa).
- name: slave-03 # Custom name of baremetal for Fuel slave node
role: fuel_slave # Fixed role for Fuel master node properties
params:
ipmi_user: username3
ipmi_password: password3
ipmi_user: !os_env IPMI_USER
ipmi_password: !os_env IPMI_PASSWORD
ipmi_previlegies: OPERATOR
ipmi_host: ipmi3.test.local
ipmi_host: !os_env IPMI_HOST3
ipmi_lan_interface: lanplus
ipmi_port: 623
impi_cmd: ipmitool
# so, interfaces can be turn on in one or in a different switches.
interfaces:
- label: iface1
mac: aa:bb:cc:dd:ee:31
mac_address: xx:xx:xx:xx:xx:xx
- label: iface2
mac: aa:bb:cc:dd:ee:32
mac_address: xx:xx:xx:xx:xx:xx
network_config:
iface1:
networks:
@ -253,67 +338,57 @@ a baremetal lab (requires the [1] merged to fuel-qa).
- name: slave-04 # Custom name of baremetal for Fuel slave node
role: fuel_slave # Fixed role for Fuel master node properties
params:
ipmi_user: username4
ipmi_password: password4
ipmi_user: !os_env IPMI_USER
ipmi_password: !os_env IPMI_PASSWORD
ipmi_previlegies: OPERATOR
ipmi_host: ipmi4.test.local
ipmi_host: !os_env IPMI_HOST4
ipmi_lan_interface: lanplus
ipmi_port: 623
impi_cmd: ipmitool
# so, interfaces can be turn on in one or in a different switches.
interfaces:
- label: iface1
mac: aa:bb:cc:dd:ee:41
- label: iface2
mac: aa:bb:cc:dd:ee:42
mac_address: xx:xx:xx:xx:xx:xx
- label: iface3
mac: aa:bb:cc:dd:ee:43
mac_address: xx:xx:xx:xx:xx:xx
- label: iface4
mac: aa:bb:cc:dd:ee:44
mac_address: xx:xx:xx:xx:xx:xx
network_config:
iface1:
networks:
- fuelweb_admin ## OpenStack network, NOT switch name
iface2:
- public ## OpenStack network, NOT switch name
iface3:
networks:
- storage ## OpenStack network, NOT switch name
- management ## OpenStack network, NOT switch name
iface4:
- private ## OpenStack network, NOT switch name
- name: slave-05 # Custom name of baremetal for Fuel slave node
role: fuel_slave # Fixed role for Fuel master node properties
params:
ipmi_user: username5
ipmi_password: password5
ipmi_user: !os_env IPMI_USER
ipmi_password: !os_env IPMI_PASSWORD
ipmi_previlegies: OPERATOR
ipmi_host: ipmi5.test.local
ipmi_host: !os_env IPMI_HOST5
ipmi_lan_interface: lanplus
ipmi_port: 623
impi_cmd: ipmitool
# so, interfaces can be turn on in one or in a different switches.
interfaces:
- label: iface1
mac: aa:bb:cc:dd:ee:51
- label: iface2
mac: aa:bb:cc:dd:ee:52
mac_address: xx:xx:xx:xx:xx:xx
- label: iface3
mac: aa:bb:cc:dd:ee:53
mac_address: xx:xx:xx:xx:xx:xx
- label: iface4
mac: aa:bb:cc:dd:ee:54
mac_address: xx:xx:xx:xx:xx:xx
network_config:
iface1:
networks:
- fuelweb_admin ## OpenStack network, NOT switch name
iface2:
- public ## OpenStack network, NOT switch name
iface3:
networks:
- storage ## OpenStack network, NOT switch name
- management ## OpenStack network, NOT switch name
iface4:
- private ## OpenStack network, NOT switch name