Focal-related fixes: libguestfs, mysql 8, requirements
- use the the python3 guestfs bindings, not the old python2 (not availbale anymore on the newer systems); - fix the compatibility with mysql 8, which unfortunately removes the shortend for user creation + password setting; - bump the values in lower-requirements.txt (also requirements.txt and test-requirements.txt when needed) so they they work with python 3.8 (inspired by other similar bumps). Change-Id: Icaa3c008bbe179098244f7bb9d80790068430fe2
This commit is contained in:
parent
7cdda56b2c
commit
8a026b95bd
|
@ -23,7 +23,7 @@ postgresql-devel [platform:rpm]
|
|||
|
||||
# The Python binding for libguestfs are used by the sahara-image-pack
|
||||
# command.
|
||||
python-guestfs [platform:dpkg]
|
||||
python3-guestfs [platform:dpkg]
|
||||
libguestfs-xfs [platform:dpkg]
|
||||
python3-libguestfs [platform:rpm]
|
||||
libguestfs-xfs [platform:redhat]
|
||||
|
|
|
@ -80,9 +80,9 @@ run whichever of the following is appropriate to your OS:
|
|||
|
||||
::
|
||||
|
||||
sudo yum install libguestfs python-libguestfs libguestfs-tools
|
||||
sudo dnf install libguestfs python-libguestfs libguestfs-tools
|
||||
sudo apt-get install libguestfs python-guestfs libguestfs-tools
|
||||
sudo yum install libguestfs python3-libguestfs libguestfs-tools
|
||||
sudo dnf install libguestfs python3-libguestfs libguestfs-tools
|
||||
sudo apt-get install libguestfs python3-guestfs libguestfs-tools
|
||||
|
||||
If you are using tox to create virtual environments for your Sahara work,
|
||||
please use the ``images`` environment to run sahara-image-pack. This
|
||||
|
|
|
@ -11,7 +11,7 @@ botocore==1.5.1
|
|||
cachetools==2.0.1
|
||||
castellan==0.16.0
|
||||
certifi==2018.1.18
|
||||
cffi==1.11.5
|
||||
cffi==1.14.0
|
||||
chardet==3.0.4
|
||||
click==6.7
|
||||
cliff==2.11.0
|
||||
|
@ -27,7 +27,7 @@ docutils==0.14
|
|||
dogpile.cache==0.6.5
|
||||
dulwich==0.19.0
|
||||
enum-compat==0.0.2
|
||||
eventlet==0.18.2
|
||||
eventlet==0.26.0
|
||||
extras==1.0.0
|
||||
fasteners==0.14.1
|
||||
fixtures==3.0.0
|
||||
|
@ -37,7 +37,7 @@ future==0.16.0
|
|||
futurist==1.6.0
|
||||
gitdb2==2.0.3
|
||||
GitPython==2.1.8
|
||||
greenlet==0.4.13
|
||||
greenlet==0.4.15
|
||||
hacking==1.1.0
|
||||
idna==2.6
|
||||
imagesize==1.0.0
|
||||
|
@ -50,11 +50,11 @@ jsonpointer==2.0
|
|||
jsonschema==3.2.0
|
||||
keystoneauth1==3.4.0
|
||||
keystonemiddleware==4.17.0
|
||||
kombu==4.1.0
|
||||
kombu==5.0.1
|
||||
linecache2==1.0.0
|
||||
logilab-common==1.4.1
|
||||
Mako==1.0.7
|
||||
MarkupSafe==1.0
|
||||
MarkupSafe==1.1.0
|
||||
mccabe==0.2.1
|
||||
microversion-parse==0.2.1
|
||||
monotonic==1.4
|
||||
|
@ -73,7 +73,7 @@ oslo.cache==1.29.0
|
|||
oslo.concurrency==3.26.0
|
||||
oslo.config==5.2.0
|
||||
oslo.context==2.19.2
|
||||
oslo.db==4.27.0
|
||||
oslo.db==6.0.0
|
||||
oslo.i18n==3.15.3
|
||||
oslo.log==3.36.0
|
||||
oslo.messaging==5.29.0
|
||||
|
@ -86,14 +86,14 @@ oslo.upgradecheck==0.1.0
|
|||
oslo.utils==3.33.0
|
||||
oslotest==3.2.0
|
||||
packaging==17.1
|
||||
paramiko==2.0.0
|
||||
paramiko==2.7.1
|
||||
Paste==2.0.3
|
||||
PasteDeploy==1.5.2
|
||||
pbr==2.0.0
|
||||
pika-pool==0.1.3
|
||||
pika==0.10.0
|
||||
prettytable==0.7.2
|
||||
psycopg2==2.7.3
|
||||
psycopg2==2.8.0
|
||||
pyasn1==0.4.2
|
||||
pycadf==2.7.0
|
||||
pycparser==2.18
|
||||
|
@ -102,7 +102,7 @@ pyflakes==0.8.1
|
|||
Pygments==2.2.0
|
||||
pyinotify==0.9.6
|
||||
pylint==1.4.5
|
||||
PyMySQL==0.7.6
|
||||
PyMySQL==0.8.0
|
||||
PyNaCl==1.2.1
|
||||
pyOpenSSL==17.5.0
|
||||
pyparsing==2.2.0
|
||||
|
@ -120,10 +120,10 @@ python-neutronclient==6.7.0
|
|||
python-novaclient==9.1.0
|
||||
python-openstackclient==3.14.0
|
||||
python-saharaclient==1.4.0
|
||||
python-subunit==1.2.0
|
||||
python-subunit==1.4.0
|
||||
python-swiftclient==3.2.0
|
||||
pytz==2018.3
|
||||
PyYAML==3.12
|
||||
PyYAML==3.13
|
||||
reno==2.5.0
|
||||
repoze.lru==0.7
|
||||
requests==2.14.2
|
||||
|
@ -138,17 +138,17 @@ snowballstemmer==1.2.1
|
|||
Sphinx==1.6.2
|
||||
sphinxcontrib-httpdomain==1.3.0
|
||||
sphinxcontrib-websupport==1.0.1
|
||||
sqlalchemy-migrate==0.11.0
|
||||
sqlalchemy-migrate==0.13.0
|
||||
SQLAlchemy==1.0.10
|
||||
sqlparse==0.2.4
|
||||
statsd==3.2.2
|
||||
stestr==1.0.0
|
||||
stevedore==1.20.0
|
||||
Tempita==0.5.2
|
||||
tenacity==4.9.0
|
||||
tenacity==6.1.0
|
||||
testresources==2.0.0
|
||||
testscenarios==0.4
|
||||
testtools==2.2.0
|
||||
testtools==2.4.0
|
||||
tooz==1.58.0
|
||||
traceback2==1.4.0
|
||||
unittest2==1.1.0
|
||||
|
|
|
@ -7,7 +7,7 @@ pbr!=2.1.0,>=2.0.0 # Apache-2.0
|
|||
alembic>=0.8.10 # MIT
|
||||
botocore>=1.5.1 # Apache-2.0
|
||||
castellan>=0.16.0 # Apache-2.0
|
||||
eventlet!=0.18.3,!=0.20.1,>=0.18.2 # MIT
|
||||
eventlet>=0.26.0 # MIT
|
||||
Flask>=1.0.2 # BSD
|
||||
iso8601>=0.1.11 # MIT
|
||||
Jinja2>=2.10 # BSD License (3 clause)
|
||||
|
@ -18,7 +18,7 @@ microversion-parse>=0.2.1 # Apache-2.0
|
|||
oslo.config>=5.2.0 # Apache-2.0
|
||||
oslo.concurrency>=3.26.0 # Apache-2.0
|
||||
oslo.context>=2.19.2 # Apache-2.0
|
||||
oslo.db>=4.27.0 # Apache-2.0
|
||||
oslo.db>=6.0.0 # Apache-2.0
|
||||
oslo.i18n>=3.15.3 # Apache-2.0
|
||||
oslo.log>=3.36.0 # Apache-2.0
|
||||
oslo.messaging>=5.29.0 # Apache-2.0
|
||||
|
@ -29,7 +29,7 @@ oslo.serialization!=2.19.1,>=2.18.0 # Apache-2.0
|
|||
oslo.service!=1.28.1,>=1.24.0 # Apache-2.0
|
||||
oslo.upgradecheck>=0.1.0 # Apache-2.0
|
||||
oslo.utils>=3.33.0 # Apache-2.0
|
||||
paramiko>=2.0.0 # LGPLv2.1+
|
||||
paramiko>=2.7.1 # LGPLv2.1+
|
||||
requests>=2.14.2 # Apache-2.0
|
||||
python-cinderclient!=4.0.0,>=3.3.0 # Apache-2.0
|
||||
python-keystoneclient>=3.8.0 # Apache-2.0
|
||||
|
|
|
@ -4,7 +4,7 @@
|
|||
|
||||
hacking>=3.0.1,<3.1.0 # Apache-2.0
|
||||
|
||||
PyMySQL>=0.7.6 # MIT License
|
||||
PyMySQL>=0.8.0 # MIT License
|
||||
bandit>=1.1.0,<1.6.0 # Apache-2.0
|
||||
bashate>=0.5.1 # Apache-2.0
|
||||
coverage!=4.4,>=4.0 # Apache-2.0
|
||||
|
@ -12,9 +12,9 @@ doc8>=0.6.0 # Apache-2.0
|
|||
fixtures>=3.0.0 # Apache-2.0/BSD
|
||||
oslotest>=3.2.0 # Apache-2.0
|
||||
stestr>=1.0.0 # Apache-2.0
|
||||
psycopg2>=2.7.3 # LGPL/ZPL
|
||||
psycopg2>=2.8.0 # LGPL/ZPL
|
||||
pylint==1.4.5 # GPLv2
|
||||
testresources>=2.0.0 # Apache-2.0/BSD
|
||||
testscenarios>=0.4 # Apache-2.0/BSD
|
||||
testtools>=2.2.0 # MIT
|
||||
testtools>=2.4.0 # MIT
|
||||
python-saharaclient>=1.4.0 # Apache-2.0
|
||||
|
|
|
@ -23,8 +23,8 @@ sudo -H mysqladmin -u root password $DB_ROOT_PW
|
|||
sudo -H mysql -u root -p$DB_ROOT_PW -h localhost -e "
|
||||
DELETE FROM mysql.user WHERE User='';
|
||||
FLUSH PRIVILEGES;
|
||||
GRANT ALL PRIVILEGES ON *.*
|
||||
TO '$DB_USER'@'%' identified by '$DB_PW' WITH GRANT OPTION;"
|
||||
CREATE USER '$DB_USER'@'%' IDENTIFIED BY '$DB_PW';
|
||||
GRANT ALL PRIVILEGES ON *.* TO '$DB_USER'@'%' WITH GRANT OPTION;"
|
||||
|
||||
# Now create our database.
|
||||
mysql -u $DB_USER -p$DB_PW -h 127.0.0.1 -e "
|
||||
|
|
Loading…
Reference in New Issue