From 86694d656ce8b66be172603537be4dd57983a5e1 Mon Sep 17 00:00:00 2001
From: Mehdi Abaakouk <sileht@redhat.com>
Date: Fri, 19 May 2017 07:35:26 +0200
Subject: [PATCH] travis: fix travis-ci docker image

A couple of fix for the docker image used by travis:

* locale package is no more installed by default
* liberasurecode-dev is required, now
* sphinx >= 1.6.0 have broken sphinx-versioning
* Don't use sphinx math module

Change-Id: Iba06d0c4667e2a11495fb25375de7152b2b02597
---
 doc/source/running.rst           |  4 +---
 setup.cfg                        |  2 +-
 tools/travis-ci-setup.dockerfile | 17 +++++++++++------
 3 files changed, 13 insertions(+), 10 deletions(-)

diff --git a/doc/source/running.rst b/doc/source/running.rst
index 1880fde2..9e96730e 100644
--- a/doc/source/running.rst
+++ b/doc/source/running.rst
@@ -182,9 +182,7 @@ metrics the system will capture. Additionally, the number of sacks, should
 be higher than the total number of active `gnocchi-metricd` workers.
 
 In general, use the following equation to determine the appropriate `sacks`
-value to set:
-
-.. math::
+value to set::
 
    sacks value = number of **active** metrics / 300
 
diff --git a/setup.cfg b/setup.cfg
index a2f544a7..6675c97b 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -58,7 +58,7 @@ file =
     lz4>=0.9.0
     tooz>=1.38
 doc =
-    sphinx
+    sphinx<1.6.0
     sphinx_rtd_theme
     sphinxcontrib-httpdomain
     PyYAML
diff --git a/tools/travis-ci-setup.dockerfile b/tools/travis-ci-setup.dockerfile
index 784c14c8..be2179bc 100644
--- a/tools/travis-ci-setup.dockerfile
+++ b/tools/travis-ci-setup.dockerfile
@@ -2,12 +2,8 @@ FROM ubuntu:16.04
 ENV GNOCCHI_SRC /home/tester/src
 ENV DEBIAN_FRONTEND noninteractive
 
-#NOTE(sileht): really no utf-8 in 2017 !?
-ENV LANG en_US.UTF-8
-RUN update-locale
-RUN locale-gen $LANG
-
 RUN apt-get update -y && apt-get install -qy \
+        locales \
         git \
         wget \
         nodejs \
@@ -17,7 +13,7 @@ RUN apt-get update -y && apt-get install -qy \
         python3 \
         python-dev \
         python3-dev \
-        python-tox \
+        python-pip \
         redis-server \
         build-essential \
         libffi-dev \
@@ -26,9 +22,18 @@ RUN apt-get update -y && apt-get install -qy \
         mysql-client \
         mysql-server \
         librados-dev \
+        liberasurecode-dev \
         ceph \
     && apt-get clean -y
 
+#NOTE(sileht): really no utf-8 in 2017 !?
+ENV LANG en_US.UTF-8
+RUN update-locale
+RUN locale-gen $LANG
+
+#NOTE(sileht): Upgrade python dev tools
+RUN pip install -U pip tox virtualenv
+
 RUN useradd -ms /bin/bash tester
 RUN mkdir $GNOCCHI_SRC
 RUN chown -R tester: $GNOCCHI_SRC