From 4cdf46c7f373a10cdcda23b05d34b74edb02dc65 Mon Sep 17 00:00:00 2001 From: aviau Date: Fri, 29 May 2015 09:36:41 -0400 Subject: [PATCH] Fixed dependencies issues Change-Id: Iff0b9edc7350edcf97ee7bb91bf2e8a1a3a61cbb --- Dockerfile | 2 +- tools/docker/alignak_container/Dockerfile | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index 00595ed..edf9396 100644 --- a/Dockerfile +++ b/Dockerfile @@ -35,7 +35,7 @@ ADD surveil /opt/surveil/surveil ENV PBR_VERSION=PROD # We are using develop so that the code can be mounted when in DEV. -RUN pip install -U six +RUN pip install -U six requests RUN cd /opt/surveil && python setup.py develop # Set to 'surveil' or 'keystone' diff --git a/tools/docker/alignak_container/Dockerfile b/tools/docker/alignak_container/Dockerfile index 4c29e53..9536485 100644 --- a/tools/docker/alignak_container/Dockerfile +++ b/tools/docker/alignak_container/Dockerfile @@ -88,11 +88,12 @@ RUN apt-get update && apt-get install -y subversion && \ apt-get remove -y subversion ## Install plugins dependencies +RUN pip install "pbr>=0.6,!=0.7,<1.0" RUN pip install shinkenplugins python-keystoneclient python-glanceclient ## Install Plugins -RUN cd /plugins/check_glance && sudo python setup.py install RUN cd /plugins/check_keystone && sudo python setup.py install +RUN cd /plugins/check_glance && sudo python setup.py install RUN cd /plugins/check_nova && sudo python setup.py install RUN cd /plugins/check_cinder && sudo python setup.py install RUN cd /plugins/check_ceilometer && sudo python setup.py install