Fedora updates
Updates for F23 host, F22 guest: - unbound default Fedora requirements - reinstate python-mysql install - remove enable/start for mysqld under systemd - adjust mysql /etc config manipulations - update postgresql vendor rpm - fix broken pymongo install - make sure SSH_DIR perms are correct Change-Id: I8f74ab10181e7282bc4d4dca503209325907653e Closes-Bug: 1549313
This commit is contained in:
parent
8dc1948a3a
commit
fd2442a7f2
|
@ -10,7 +10,7 @@ dnf install -y python-devel libxml2-devel libxslt-devel python-setuptools \
|
|||
python-sqlalchemy python-lxml \
|
||||
python-routes python-eventlet python-webob \
|
||||
python-kombu python-paste-deploy python-paste python-netaddr \
|
||||
python-httplib2 python-iso8601 python-pip \
|
||||
python-httplib2 python-iso8601 python-pip python-mysql \
|
||||
python-migrate python-anyjson gcc python-pexpect
|
||||
|
||||
# pick up the requirements file left for us by
|
||||
|
|
|
@ -6,4 +6,4 @@
|
|||
set -e
|
||||
set -o xtrace
|
||||
|
||||
pip-python install pymongo>=3.0.2,!=3.1
|
||||
pip install pymongo>=3.0.2,!=3.1
|
||||
|
|
|
@ -6,12 +6,11 @@
|
|||
set -e
|
||||
set -o xtrace
|
||||
|
||||
dnf -y install https://dev.mysql.com/get/mysql-community-release-fc21-6.noarch.rpm
|
||||
dnf -y install https://repo.mysql.com/mysql-community-release-fc22.rpm
|
||||
dnf -y install mysql-community-server
|
||||
|
||||
# move the config until proper changes are placed in the service file for fedora
|
||||
# move the config dir for now but leave /etc/my.cnf alone
|
||||
# ln -s creates problems for the systemd script
|
||||
mkdir /etc/mysql
|
||||
mv /etc/my.cnf /etc/mysql/my.cnf
|
||||
mv /etc/my.cnf.d /etc/mysql/conf.d
|
||||
chown -R mysql:mysql /etc/mysql
|
||||
|
|
|
@ -3,6 +3,4 @@
|
|||
set -e
|
||||
set -o xtrace
|
||||
|
||||
# Enable and start service
|
||||
systemctl enable mysqld
|
||||
systemctl start mysqld
|
||||
# DO NOT enable or start mysqld for systemd, let the guestagent coordinate startup
|
||||
|
|
|
@ -28,7 +28,7 @@ exit \$?
|
|||
|
||||
_EOF_
|
||||
|
||||
dnf install -y http://yum.postgresql.org/9.3/fedora/fedora-21-x86_64/pgdg-fedora93-9.3-2.noarch.rpm
|
||||
dnf install -y http://yum.postgresql.org/9.3/fedora/fedora-22-x86_64/pgdg-fedora93-9.3-3.noarch.rpm
|
||||
dnf install -y postgresql93-server postgresql93-contrib
|
||||
|
||||
# Though /var/lib/pgsql is the preferred directory, need to move it as
|
||||
|
|
|
@ -14,15 +14,15 @@ passlib
|
|||
jinja2>=2.6
|
||||
python-neutronclient>=2.3.11,<3
|
||||
netifaces>=0.10.4
|
||||
oslo.config>=1.9.3,<1.10.0 # Apache-2.0
|
||||
oslo.config>=1.9.3 # Apache-2.0
|
||||
oslo.messaging>=1.8.0 # Apache-2.0
|
||||
oslo.i18n>=1.5.0,<1.6.0 # Apache-2.0
|
||||
oslo.serialization>=1.4.0,<1.5.0 # Apache-2.0
|
||||
oslo.i18n>=1.5.0 # Apache-2.0
|
||||
oslo.serialization>=1.4.0 # Apache-2.0
|
||||
oslo.service>=0.1.0 # Apache-2.0
|
||||
oslo.utils>=1.4.0,<1.5.0 # Apache-2.0
|
||||
oslo.utils>=1.4.0 # Apache-2.0
|
||||
oslo.log>=1.8.0 # Apache-2.0
|
||||
osprofiler>=0.3.0
|
||||
oslo.concurrency>=1.8.0,<1.9.0 # Apache-2.0
|
||||
oslo.concurrency>=1.8.0 # Apache-2.0
|
||||
pexpect>=3.1,!=3.3
|
||||
enum34;python_version=='2.7' or python_version=='2.6' or python_version=='3.3' # BSD
|
||||
pycrypto>=2.6 # Public Domain
|
||||
|
|
|
@ -137,7 +137,7 @@ function manage_ssh_keys() {
|
|||
echo "${SSH_DIR} already exists"
|
||||
else
|
||||
echo "Creating ${SSH_DIR} for ${HOST_USERNAME}"
|
||||
sudo -Hiu ${HOST_USERNAME} mkdir -p ${SSH_DIR}
|
||||
sudo -Hiu ${HOST_USERNAME} mkdir -m go-w -p ${SSH_DIR}
|
||||
fi
|
||||
|
||||
if [ ! -f ${SSH_DIR}/id_rsa.pub ]; then
|
||||
|
|
|
@ -248,8 +248,6 @@ function install_prep_packages() {
|
|||
exclaim 'Installing dependencies (part 1b)...'
|
||||
pkg_install python-pip
|
||||
if is_fedora; then
|
||||
# python-mysql obsoletes MySQL-python
|
||||
sudo dnf remove -y python-mysql || true
|
||||
pkg_install git gettext
|
||||
else
|
||||
pkg_install git-core kvm-ipxe gettext
|
||||
|
|
Loading…
Reference in New Issue