name, volume_path,
baremetal_interfaces=network_settings.enabled_network_list,
memory=node['memory'], cpus=node['cpu'],
- macs=[node['mac_address']],
+ macs=node['mac'],
template_dir=template_dir)
virt_utils.host_setup({name: node['pm_port']})
# move ipmi_* to pm_*
# make mac a list
- def munge_nodes(node):
+ def munge_node(node):
node['pm_addr'] = node['ipmi_ip']
node['pm_password'] = node['ipmi_pass']
node['pm_user'] = node['ipmi_user']
for i in ('ipmi_ip', 'ipmi_pass', 'ipmi_user', 'mac_address',
'disk_device'):
- if i == 'disk_device' and 'disk_device' in node.keys():
- self.root_device = node[i]
- else:
- continue
- del node[i]
+ if i in node.keys():
+ if i == 'disk_device':
+ self.root_device = node[i]
+ del node[i]
return node
-
- super().__init__({'nodes': list(map(munge_nodes, init_dict['nodes']))})
+ super().__init__({'nodes': list(map(munge_node, init_dict['nodes']))})
# verify number of nodes
- if ha and len(self['nodes']) < 5 and not virtual:
+ if ha and len(self['nodes']) < 5:
raise InventoryException('You must provide at least 5 '
- 'nodes for HA baremetal deployment')
+ 'nodes for HA deployment')
elif len(self['nodes']) < 2:
raise InventoryException('You must provide at least 2 nodes '
- 'for non-HA baremetal deployment')
+ 'for non-HA deployment')
if virtual:
self['host-ip'] = '192.168.122.1'
--- /dev/null
+nodes:
+ node0:
+ arch: x86_64
+ capabilities: profile:control
+ cpu: 4
+ disk: 41
+ ipmi_ip: 192.168.122.1
+ ipmi_pass: password
+ ipmi_user: admin
+ mac_address: 00:a8:58:29:f9:99
+ memory: 10240
+ pm_port: 6230
+ pm_type: pxe_ipmitool
--- /dev/null
+nodes:
+ node0:
+ arch: x86_64
+ capabilities: profile:control
+ cpu: 4
+ disk: 41
+ ipmi_ip: 192.168.122.1
+ ipmi_pass: password
+ ipmi_user: admin
+ mac_address: 00:a8:58:29:f9:99
+ memory: 10240
+ pm_port: 6230
+ pm_type: pxe_ipmitool
+ node1:
+ arch: x86_64
+ capabilities: profile:compute
+ cpu: 4
+ disk: 41
+ ipmi_ip: 192.168.122.1
+ ipmi_pass: password
+ ipmi_user: admin
+ mac_address: 00:9d:c8:10:d9:64
+ memory: 8192
+ pm_port: 6231
+ pm_type: pxe_ipmitool
from apex import Inventory
from apex.inventory.inventory import InventoryException
-from apex.tests.constants import TEST_CONFIG_DIR
+from apex.tests.constants import (
+ TEST_CONFIG_DIR,
+ TEST_DUMMY_CONFIG
+)
inventory_files = ('intel_pod2_settings.yaml',
'nokia_pod1_settings.yaml',
def teardown(self):
"""This method is run once after _each_ test method is executed"""
- def test_init(self):
+ def test_inventory_baremetal(self):
for f in inventory_files:
i = Inventory(os.path.join(files_dir, f))
assert_equal(i.dump_instackenv_json(), None)
- # test virtual
- i = Inventory(i, virtual=True)
- assert_equal(i.dump_instackenv_json(), None)
+ def test_inventory_invalid_ha_count(self):
+ assert_raises(InventoryException, Inventory,
+ os.path.join(TEST_DUMMY_CONFIG, 'inventory-virt.yaml'),
+ virtual=True, ha=True)
- # Remove nodes to violate HA node count
- while len(i['nodes']) >= 5:
- i['nodes'].pop()
- assert_raises(InventoryException,
- Inventory, i)
+ def test_inventory_invalid_noha_count(self):
+ assert_raises(InventoryException, Inventory,
+ os.path.join(TEST_DUMMY_CONFIG,
+ 'inventory-virt-1-node.yaml'),
+ virtual=True, ha=False)
- # Remove nodes to violate non-HA node count
- while len(i['nodes']) >= 2:
- i['nodes'].pop()
- assert_raises(InventoryException,
- Inventory, i, ha=False)
+ def test_inventory_virtual(self):
+ i = Inventory(os.path.join(TEST_DUMMY_CONFIG, 'inventory-virt.yaml'),
+ virtual=True, ha=False)
+ assert_equal(i.dump_instackenv_json(), None)
def test_exception(self):
e = InventoryException("test")
gpgcheck=0
EOF
+# Kubernetes Repo
+cat > ${BUILD_DIR}/kubernetes.repo << EOF
+[kubernetes]
+name=Kubernetes
+baseurl=https://packages.cloud.google.com/yum/repos/kubernetes-el7-x86_64
+enabled=1
+gpgcheck=1
+repo_gpgcheck=1
+gpgkey=https://packages.cloud.google.com/yum/doc/yum-key.gpg
+ https://packages.cloud.google.com/yum/doc/rpm-package-key.gpg
+EOF
+
# Get Real Time Kernel from kvm4nfv
populate_cache $kvmfornfv_uri_base/$kvmfornfv_kernel_rpm
--upload ${BUILD_DIR}/puppet-fdio.tar.gz:/etc/puppet/modules \
--run-command "cd /etc/puppet/modules && tar xzf puppet-fdio.tar.gz" \
--upload ${BUILD_DIR}/fdio.repo:/etc/yum.repos.d/ \
+ --upload ${BUILD_DIR}/kubernetes.repo:/etc/yum.repos.d/ \
--run-command "mkdir /root/fdio" \
--upload ${BUILD_DIR}/noarch/$netvpp_pkg:/root/fdio \
$fdio_pkg_str \
--install python2-networking-sfc \
--install python-etcd,puppet-etcd \
--install patch \
+ --install docker,kubelet,kubeadm,kubectl,kubernetes-cni \
-a overcloud-full_build.qcow2
# upload and install barometer packages