зеркало из https://github.com/mozilla/treeherder.git
Bug 1318295 - Vagrant: Move libmysqlclient install to shell provisioner
The vendor script outputs its own status message, so none required in `vagrant/setup.sh`.
This commit is contained in:
Родитель
162975c420
Коммит
a9729e7cc1
|
@ -1,10 +1,5 @@
|
|||
class python {
|
||||
|
||||
exec {"vendor-libmysqlclient":
|
||||
command => "${PROJ_DIR}/bin/vendor-libmysqlclient.sh ${VENV_DIR}",
|
||||
user => "${APP_USER}",
|
||||
}
|
||||
|
||||
exec{"pip-install":
|
||||
require => [
|
||||
Exec['vendor-libmysqlclient'],
|
||||
|
|
|
@ -8,6 +8,7 @@ SRC_DIR="$HOME/treeherder"
|
|||
VENV_DIR="$HOME/venv"
|
||||
ELASTICSEARCH_VERSION="2.3.5"
|
||||
|
||||
export PATH="$VENV_DIR/bin:$PATH"
|
||||
# Suppress prompts during apt-get invocations.
|
||||
export DEBIAN_FRONTEND=noninteractive
|
||||
|
||||
|
@ -87,6 +88,8 @@ if [[ ! -d "$VENV_DIR" ]]; then
|
|||
virtualenv "$VENV_DIR"
|
||||
fi
|
||||
|
||||
./bin/vendor-libmysqlclient.sh "$VENV_DIR"
|
||||
|
||||
echo '-----> Initialising MySQL database'
|
||||
# The default `root@localhost` grant only allows loopback interface connections.
|
||||
mysql -u root -e 'GRANT ALL PRIVILEGES ON *.* to root@"%"'
|
||||
|
|
Загрузка…
Ссылка в новой задаче