x
/
packstack
Code Issues Proposed changes

Move nova:pci class invocation to before nova::api 

After [1] nova::pci is included nova::api and packstack fails with
duplicate declaration.

This patch is moving nova:pci class invocation to before nova::api
in order to handle the duplicate declaration.

Also, this patch is installing python3-wheel to unblock CI jobs which
are failing with error:

"ERROR: 'pip wheel' requires the 'wheel' package. To fix this, run: pip install wheel"

[1] https://review.opendev.org/#/c/760327/

Change-Id: I264a0104aaf9ad8b927126cb523a4e8df9c5e6b7
This commit is contained in:
Alfredo Moralejo 2020-11-10 10:23:05 +01:00 committed by yatin
parent 745214d0a7
commit 19c71e92d1
2 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
packstack/puppet/modules/packstack/manifests/nova/api.pp
View File

@ -23,6 +23,10 @@ class packstack::nova::api ()
$pci_alias = hiera('CONFIG_NOVA_PCI_ALIAS')
}
class { '::nova::pci':
aliases => $pci_alias,
}
class { '::nova::api':
api_bind_address => $bind_host,
enabled => true,
@ -58,10 +62,6 @@ class packstack::nova::api ()
db_sync_timeout => 600,
}
class { '::nova::pci':
aliases => $pci_alias,
}
class { '::nova::placement':
auth_url => $www_authenticate_uri,
password => $admin_password,

3
run_tests.sh
View File

@ -179,6 +179,7 @@ OS_VERSION=$(facter operatingsystemmajrelease)
if ([ "$OS_NAME" = "RedHat" ] || [ "$OS_NAME" = "CentOS" ]) && [ $OS_VERSION -gt 7 ]; then
$SUDO $PKG_MGR -y install python3-setuptools \
python3-devel \
python3-wheel \
python3-pyyaml
else
$SUDO $PKG_MGR -y install python-setuptools \
@ -190,7 +191,7 @@ fi
which pip3 && PIP=pip3
if [ -z $PIP ]; then
if ([ "$OS_NAME" = "RedHat" ] || [ "$OS_NAME" = "CentOS" ]) && [ $OS_VERSION -gt 7 ]; then
$SUDO $PKG_MGR -y install python3-pip
$SUDO $PKG_MGR -y install python3-pip python3-wheel
PIP=pip3
else
which pip || $SUDO easy_install pip