summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMark Beierl <mark.beierl@emc.com>2016-04-07 14:17:53 +0000
committerMark Beierl <mark.beierl@emc.com>2016-04-07 14:17:53 +0000
commit29364bc532710193638f14ba100015509a554dae (patch)
tree84436432a4c7c53bba5a1932a7e61f3a298caa33
parent25fe343effdc405f4080d618a1691c8f61f7a025 (diff)
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>
-rw-r--r--docker/Dockerfile4
1 files changed, 2 insertions, 2 deletions
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