aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKoren Lev <korenlev@gmail.com>2018-04-07 22:48:02 +0300
committerKoren Lev <korenlev@gmail.com>2018-04-07 22:54:06 +0300
commitd8f75705138a283b080394d7fdd2a83512cfe939 (patch)
treea8dc7f3e8743a6aab6535d3f2c4bf55c8281e32b
parent2e47d8704fa0fe56ced38ddb4fc94f111079bd82 (diff)
container change sensu->monitor
Change-Id: I06f6882d371fe09a5a3819f0b06b96a2c858a870 Signed-off-by: Koren Lev <korenlev@gmail.com>
-rw-r--r--app/install/calipso-installer.py12
-rwxr-xr-xcalipso/tests/functest/smoke_test.py2
2 files changed, 7 insertions, 7 deletions
diff --git a/app/install/calipso-installer.py b/app/install/calipso-installer.py
index ad2b4e0..ccb9cdc 100644
--- a/app/install/calipso-installer.py
+++ b/app/install/calipso-installer.py
@@ -261,12 +261,12 @@ def start_scan():
volumes=calipso_volume)
-def start_sensu(uchiwaport, sensuport, rabbitport, rabbitmport):
- name = "calipso-sensu"
+def start_monitor(uchiwaport, sensuport, rabbitport, rabbitmport):
+ name = "calipso-monitor"
if container_started(name):
return
print("\nstarting container {}...\n".format(name))
- image_name = "korenlev/calipso:sensu"
+ image_name = "korenlev/calipso:monitor"
download_image(image_name)
sensu_ports = {'22/tcp': 20022, '3000/tcp': uchiwaport, '4567/tcp': sensuport,
'5671/tcp': rabbitport, '15672/tcp': rabbitmport}
@@ -420,7 +420,7 @@ else:
action = ""
container_names = ["calipso-ui", "calipso-scan", "calipso-test", "calipso-listen",
- "calipso-ldap", "calipso-api", "calipso-sensu", "calipso-mongo"]
+ "calipso-ldap", "calipso-api", "calipso-monitor", "calipso-mongo"]
container_actions = ["stop", "start"]
while action not in container_actions:
action = input("Action? (stop, start, or 'q' to quit):\n")
@@ -488,8 +488,8 @@ if action == "start":
if container == "calipso-test" or container == "all":
start_test()
time.sleep(1)
- if container == "calipso-sensu" or container == "all":
- start_sensu(args.uchiwaport, args.sensuport, args.rabbitport, args.rabbitmport)
+ if container == "calipso-monitor" or container == "all":
+ start_monitor(args.uchiwaport, args.sensuport, args.rabbitport, args.rabbitmport)
time.sleep(1)
if container == "calipso-ui" or container == "all":
start_ui(args.hostname, args.dbuser, args.dbpassword, args.webport,
diff --git a/calipso/tests/functest/smoke_test.py b/calipso/tests/functest/smoke_test.py
index 09b394f..c9bbaf2 100755
--- a/calipso/tests/functest/smoke_test.py
+++ b/calipso/tests/functest/smoke_test.py
@@ -17,7 +17,7 @@ import sys
from utils.binary_converter import BinaryConverter
-IMAGES_TO_SEARCH = ["ui", "sensu", "scan", "api", "ldap", "listen", "mongo"]
+IMAGES_TO_SEARCH = ["ui", "monitor", "scan", "api", "ldap", "listen", "mongo"]
class DockerImageCheck: