summaryrefslogtreecommitdiffstats
path: root/docker-compose
diff options
context:
space:
mode:
Diffstat (limited to 'docker-compose')
-rw-r--r--docker-compose/create-compose.py13
-rw-r--r--docker-compose/docker-compose.yaml3
2 files changed, 11 insertions, 5 deletions
diff --git a/docker-compose/create-compose.py b/docker-compose/create-compose.py
index 1a63336..3e3b0c0 100644
--- a/docker-compose/create-compose.py
+++ b/docker-compose/create-compose.py
@@ -26,6 +26,8 @@ services:
container_name: "storperf-master"
image: "opnfv/storperf-master:{storperf_tag}"
env_file: {ENV_FILE}
+ volumes:
+ - ./certs:/etc/ssl/certs/
links:
- storperf-graphite
@@ -54,19 +56,20 @@ services:
- storperf-swaggerui
- storperf-graphite
'''
-storeperf_tag = input("Enter image TAG for storperf-master: ") or 'latest'
+storeperf_tag = input("Enter image TAG for storperf-master: ") \
+ or 'x86_64-latest'
assert isinstance(storeperf_tag, str)
-reporting_tag = input("Enter image TAG for reporting: ") or 'latest'
+reporting_tag = input("Enter image TAG for reporting: ") or 'x86_64-latest'
assert isinstance(reporting_tag, str)
-frontend_tag = input("Enter image TAG for frontend: ") or 'latest'
+frontend_tag = input("Enter image TAG for frontend: ") or 'x86_64-latest'
assert isinstance(frontend_tag, str)
-graphite_tag = input("Enter image TAG for graphite: ") or 'latest'
+graphite_tag = input("Enter image TAG for graphite: ") or 'x86_64-latest'
assert isinstance(graphite_tag, str)
-swaggerui_tag = input("Enter image TAG for swaggerui: ") or 'latest'
+swaggerui_tag = input("Enter image TAG for swaggerui: ") or 'x86_64-latest'
assert isinstance(swaggerui_tag, str)
env_file = input("Enter path to environment file: ")
diff --git a/docker-compose/docker-compose.yaml b/docker-compose/docker-compose.yaml
index 734fb5b..7280d90 100644
--- a/docker-compose/docker-compose.yaml
+++ b/docker-compose/docker-compose.yaml
@@ -13,6 +13,8 @@ services:
container_name: "storperf-master"
image: "opnfv/storperf-master:${TAG}"
env_file: ${ENV_FILE}
+ volumes:
+ - ./certs:/etc/ssl/certs/
links:
- storperf-graphite
@@ -30,6 +32,7 @@ services:
volumes:
- ${CARBON_DIR}:/opt/graphite/storage/whisper
+
storperf-httpfrontend:
container_name: "storperf-httpfrontend"
image: "opnfv/storperf-httpfrontend:${TAG}"