openstack
/
deb-openstack-meta-packages
Code Issues Proposed changes

Merge branch 'debian/mitaka' of git+ssh://git.debian.org/git/openstack/openstack-meta-packages into debian/mitaka

This commit is contained in:
Thomas Goirand 2016-08-02 09:27:11 +02:00
parent 3a8bcd43c5 30e6f9074a
commit c2a47b7909
6 changed files with 32 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
debian/changelog vendored
View File

@ -1,4 +1,4 @@
openstack-meta-packages (0.15) UNRELEASED; urgency=medium
openstack-meta-packages (0.14) unstable; urgency=medium
[ Thomas Goirand ]
* Update to mitaka instead of liberty.
@ -20,16 +20,6 @@ openstack-meta-packages (0.15) UNRELEASED; urgency=medium
* Added some tweaks to make it work with Newton b1 as well (compatible with
Mitaka though...).
* Added openstack-tempest-merge-repo.
[ Ondřej Nový ]
* Fixed VCS URLs (https).
* Fixed tempest.api.object_storage.test_crossdomain.CrossdomainTest
.test_get_crossdomain_policy
-- Thomas Goirand <zigo@debian.org> Thu, 16 Jun 2016 17:24:18 +0200
openstack-meta-packages (0.14) experimental; urgency=medium
* Fixed --shared option when deploying proxy network.
* Fixed ssh user for cirros in openstack-deploy-tempest.
* Switched to using liberty instead of Kilo.
@ -41,8 +31,19 @@ openstack-meta-packages (0.14) experimental; urgency=medium
* Fixed compute image_ssh_user.
* Do not set public_router_id at all (this adds failures).
* Added the setup of swift.
* Standards-Version is now 3.9.8 (no change).
-- Thomas Goirand <zigo@debian.org> Sat, 16 May 2015 07:26:45 +0200
[ Ondřej Nový ]
* Fixed VCS URLs (https).
* Fixed tempest.api.object_storage.test_crossdomain.CrossdomainTest
.test_get_crossdomain_policy
[ gustavo panizzo ]
* openstack-deploy: Ignore errors preseeding man-db
* openstack-deply: Determine the MySQL server version automatically
* openstack-deploy: now it can be used in sid
-- Thomas Goirand <zigo@debian.org> Wed, 13 Jul 2016 10:48:29 +0000
openstack-meta-packages (0.13) unstable; urgency=medium

2
debian/control vendored
View File

@ -4,7 +4,7 @@ Priority: extra
Maintainer: PKG OpenStack <openstack-devel@lists.alioth.debian.org>
Uploaders: Thomas Goirand <zigo@debian.org>,
Build-Depends: debhelper (>= 9),
Standards-Version: 3.9.6
Standards-Version: 3.9.8
Homepage: http://openstack.alioth.debian.org/
Vcs-Browser: https://anonscm.debian.org/cgit/openstack/openstack-meta-packages.git/
Vcs-Git: https://anonscm.debian.org/git/openstack/openstack-meta-packages.git

7
src/openstack-deploy
View File

@ -37,6 +37,10 @@ osinstall_install_if_not_installed () {
fi
}
mysql_version () {
MYSQL_VERSION=$(apt-cache policy mysql-server |grep Candidate |awk '{print $2}' | cut -c 1-3)
}
osinstall_rcvalue () {
local RC_VARNAME RC_VARCONTENT RC_MESSAGE RC_ISPASS RC_DEFAULT
RC_VARNAME=${1}
@ -82,7 +86,7 @@ else
fi
osinstall_mysql_server () {
osinstall_rcvalue RC_MYSQL_SERVER_PKG_NAME "MySQL package name [mysql-server-5.5]: " no mysql-server-5.5
osinstall_rcvalue RC_MYSQL_SERVER_PKG_NAME "MySQL package name [mysql-server-${MYSQL_VERSION}]: " no mysql-server-${MYSQL_VERSION}
osinstall_rcvalue RC_MYSQL_PASSWORD "MySQL server password [generated-password]: " yes
if ! osinstall_check_installed ${RC_MYSQL_SERVER_PKG_NAME} ; then
echo "${RC_MYSQL_SERVER_PKG_NAME} mysql-server/root_password password ${RC_MYSQL_PASSWORD}
@ -122,6 +126,7 @@ osinstall_pgsql_server () {
osinstall_install_services () {
os_pressed_misc
mysql_version
osinstall_mysql_server
osinstall_install_if_not_installed mongodb
osinstall_install_if_not_installed rabbitmq-server

15
src/openstack-preseed
View File

@ -28,7 +28,7 @@ dbconfig-common dbconfig-common/remember-admin-pass boolean true
fix_man_db () {
echo "man-db man-db/install-setuid seen true
man-db man-db/install-setuid boolean false
" | debconf-set-selections
" | debconf-set-selections || true
}
fix_ca_certs () {
@ -37,11 +37,15 @@ ca-certificates ca-certificates/trust_new_crts select yes
" | debconf-set-selections
}
mysql_version () {
MYSQL_VERSION=$(apt-cache policy mysql-server |grep Candidate |awk '{print $2}' | cut -c 1-3)
}
install_mysql_server () {
echo "mysql-server-5.5 mysql-server/root_password password ${MYSQL_PASSWORD}
mysql-server-5.5 mysql-server/root_password seen true
mysql-server-5.5 mysql-server/root_password_again password ${MYSQL_PASSWORD}
mysql-server-5.5 mysql-server/root_password_again seen true
echo "mysql-server-${MYSQL_VERSION} mysql-server/root_password password ${MYSQL_PASSWORD}
mysql-server-${MYSQL_VERSION} mysql-server/root_password seen true
mysql-server-${MYSQL_VERSION} mysql-server/root_password_again password ${MYSQL_PASSWORD}
mysql-server-${MYSQL_VERSION} mysql-server/root_password_again seen true
" | debconf-set-selections
$APTGET install -y mysql-server
}
@ -192,6 +196,7 @@ if [ "${INSTALL_TYPE}" = "compute-node" ] ; then
preseed_quantum ${INSTALL_TYPE}
preseed_nova
else
mysql_version
install_mysql_server
$APTGET install -y openstack-cloud-services
install_keystone

2
src/openstack-purge
View File

@ -88,7 +88,7 @@ libxi6 libxml2 libxml2-dev libxml2-utils libxtst6 libyajl2 lsof mongodb-clients
open-iscsi poppler-data qemu-keymaps reiserfsprogs scrub seabios sgml-base sharutils strace tsconf ttf-dejavu-core vgabios \
vlan x11-common xfsprogs xml-core zerofree
apt-get -y purge mysql-server mysql-server-5.5 mysql-server-core-5.5 mysql-client-5.5 mysql-common libmysqlclient18 \
apt-get -y purge mysql-server mysql-server-5.5 mysql-server-5.6 mysql-server-core-5.5 mysql-server-core-5.6 mysql-client-5.5 mysql-client-5.6 mysql-common libmysqlclient18 \
libaio1 libdbd-mysql-perl libdbi-perl libnet-daemon-perl psmisc
apt-get -y --purge autoremove

2
src/preseed-lib
View File

@ -211,7 +211,7 @@ dbconfig-common dbconfig-common/remember-admin-pass boolean true
os_pressed_man_db () {
echo "man-db man-db/install-setuid seen true
man-db man-db/install-setuid boolean false
" | debconf-set-selections
" | debconf-set-selections || true
}
os_pressed_ca_certs () {