From: Mark Beierl <mark.beierl@emc.com>
Date: Thu, 7 Apr 2016 14:17:53 +0000 (+0000)
Subject: Graphite module load fix - reopen
X-Git-Tag: colorado.1.0~26
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=29364bc532710193638f14ba100015509a554dae;p=storperf.git

Graphite module load fix - reopen

Create symlinks for whisper so that Graphite
can find the modules at runtime. Needs to be
done after Graphite is installed

Change-Id: I383557138fa083d4ffeea307868465f72efaeb69
JIRA: STORPERF-41
Signed-off-by: Mark Beierl <mark.beierl@emc.com>
---

diff --git a/docker/Dockerfile b/docker/Dockerfile
index 222bec4..fab768f 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -68,8 +68,6 @@ RUN cd ${repos_dir}/fio && git checkout tags/fio-2.2.10
 RUN cd ${repos_dir}/fio && make -j 6 install
 RUN puppet module install gdsoperations-graphite
 
-RUN ln -s /opt/graphite/lib/whisper* /usr/lib/python2.7/
-
 RUN chmod 600 ${repos_dir}/storperf/storperf/resources/ssh/storperf_rsa
 
 RUN pip install -r ${repos_dir}/storperf/docker/requirements.pip
@@ -77,6 +75,8 @@ RUN pip install -r ${repos_dir}/storperf/docker/requirements.pip
 COPY storperf.pp /etc/puppet/manifests/storperf.pp
 RUN puppet apply /etc/puppet/manifests/storperf.pp
 
+RUN ln -s /opt/graphite/lib/whisper* /usr/lib/python2.7/
+
 # Open access to SSH if desired
 EXPOSE 22