summaryrefslogtreecommitdiffstats
path: root/app/install
diff options
context:
space:
mode:
authorKoren Lev <korenlev@gmail.com>2017-12-18 19:16:16 +0200
committerKoren Lev <korenlev@gmail.com>2017-12-18 19:16:16 +0200
commit98c3ac7c859e34fe60d061b9ca591aba429e4118 (patch)
tree3ff2629def8938b12c0a0147e463e74e475c9032 /app/install
parent4709d96cc240c0c4c5308d40361ca3c3da1152fd (diff)
release 1.2 + new tagging
Change-Id: I1e876451ec4a330f458dd57adadb15e39969b225 Signed-off-by: Koren Lev <korenlev@gmail.com>
Diffstat (limited to 'app/install')
-rw-r--r--app/install/calipso-installer.py21
-rw-r--r--app/install/db/clique_types.json26
-rw-r--r--app/install/db/constants.json33
-rw-r--r--app/install/db/environments_config.json94
-rw-r--r--app/install/db/monitoring_config_templates.json51
-rw-r--r--app/install/db/supported_environments.json15
6 files changed, 236 insertions, 4 deletions
diff --git a/app/install/calipso-installer.py b/app/install/calipso-installer.py
index 84b10da..78bb927 100644
--- a/app/install/calipso-installer.py
+++ b/app/install/calipso-installer.py
@@ -292,6 +292,22 @@ def start_ui(host, dbuser, dbpassword, webport, dbport):
environment=[root_url, mongo_url, LDAP_CONFIG])
+def start_test():
+ name = "calipso-test"
+ if container_started(name):
+ return
+ print("\nstarting container {}...\n".format(name))
+ image_name = "korenlev/calipso:test"
+ download_image(image_name)
+ ports = {'22/tcp': 10022}
+ DockerClient.containers.run(image_name,
+ detach=True,
+ name=name,
+ ports=ports,
+ restart_policy=RESTART_POLICY,
+ environment=[PYTHON_PATH, MONGO_CONFIG],
+ volumes=calipso_volume)
+
# check and stop a calipso container by given name
def container_stop(container_name):
if not container_started(container_name, print_message=False):
@@ -395,7 +411,7 @@ else:
container = ""
action = ""
-container_names = ["calipso-ui", "calipso-scan", "calipso-listen",
+container_names = ["calipso-ui", "calipso-scan", "calipso-test", "calipso-listen",
"calipso-ldap", "calipso-api", "calipso-sensu", "calipso-mongo"]
container_actions = ["stop", "start"]
while action not in container_actions:
@@ -460,6 +476,9 @@ if action == "start":
if container == "calipso-scan" or container == "all":
start_scan()
time.sleep(1)
+ 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)
time.sleep(1)
diff --git a/app/install/db/clique_types.json b/app/install/db/clique_types.json
index 77e2d7d..624de70 100644
--- a/app/install/db/clique_types.json
+++ b/app/install/db/clique_types.json
@@ -26,6 +26,23 @@
],
"name" : "vservice"
},
+{
+ "environment" : "config_based_example",
+ "focal_point_type" : "vservice",
+ "link_types" : [
+ "vservice-vnic",
+ "vnic-vedge",
+ "vedge-otep",
+ "otep-vconnector",
+ "vconnector-host_pnic",
+ "host_pnic-network"
+ ],
+ "name" : "vservice_config_based",
+ "distribution" : "Mirantis",
+ "distribution_version" : "6.0",
+ "mechanism_drivers" : "OVS",
+ "type_drivers" : "vxlan"
+},
{
"environment" : "ANY",
"focal_point_type" : "network",
@@ -135,5 +152,14 @@
"vnic-vservice"
],
"name" : "network"
+},
+{
+ "name" : "instance",
+ "use_implicit_links" : true,
+ "link_types" : [
+ "instance-network"
+ ],
+ "environment" : "implicit-links-ex",
+ "focal_point_type" : "instance"
}
]
diff --git a/app/install/db/constants.json b/app/install/db/constants.json
index 6912eeb..8ea89e9 100644
--- a/app/install/db/constants.json
+++ b/app/install/db/constants.json
@@ -58,6 +58,27 @@
],
"name" : "log_levels"
},
+{
+ "data" : [
+ {
+ "label" : "OpenStack",
+ "value" : "OpenStack"
+ },
+ {
+ "label" : "Kubernetes",
+ "value" : "Kubernetes"
+ },
+ {
+ "label" : "VMware",
+ "value" : "VMware"
+ },
+ {
+ "label" : "Bare-metal",
+ "value" : "Bare-metal"
+ }
+ ],
+ "name" : "environment_types"
+},
{
"data" : [
{
@@ -530,6 +551,10 @@
"label" : "10239"
},
{
+ "label" : "10307",
+ "value" : "10307"
+ },
+ {
"value" : "10918",
"label" : "10918"
},
@@ -727,6 +752,14 @@
{
"label" : "switch",
"value" : "switch"
+ },
+ {
+ "value" : "namespace",
+ "label" : "namespace"
+ },
+ {
+ "value" : "namespaces_folder",
+ "label" : "namespaces_folder"
}
]
},
diff --git a/app/install/db/environments_config.json b/app/install/db/environments_config.json
index d7157e7..80bc6aa 100644
--- a/app/install/db/environments_config.json
+++ b/app/install/db/environments_config.json
@@ -37,7 +37,8 @@
"server_name" : "sensu_server",
"env_type" : "production",
"provision" : "None",
- "name" : "Monitoring",
+ "name" : "Monitoring",
+ "install_monitoring_client": false,
"ssh_port" : "20022",
"rabbitmq_pass" : "dummy_pwd",
"ssh_password" : "dummy_pwd",
@@ -55,7 +56,7 @@
}
],
"enable_monitoring" : true,
- "name" : "DEMO-ENVIRONMENT-SCHEME",
+ "name" : "DEMO-OpenStack",
"distribution" : "Mirantis",
"distribution_version" : "8.0",
"last_scanned" : "filled-by-scanning",
@@ -74,6 +75,93 @@
"wNLeBJxNDyw8G7Ssg"
]
},
- "type" : "environment"
+ "type" : "environment",
+ "environment_type" : "OpenStack"
+},
+{
+ "user" : "wNLeBJxNDyw8G7Ssg",
+ "name" : "DEMO-Kubernetes",
+ "last_scanned" : "filled-by-scanning",
+ "auth" : {
+ "view-env" : [
+ "wNLeBJxNDyw8G7Ssg"
+ ],
+ "edit-env" : [
+ "wNLeBJxNDyw8G7Ssg"
+ ]
+ },
+ "type_drivers" : "vxlan",
+ "distribution_version" : "8.0",
+ "enable_monitoring" : true,
+ "operational" : "stopped",
+ "mechanism_drivers" : [
+ "OVS"
+ ],
+ "type" : "environment",
+ "distribution" : "Mirantis",
+ "listen" : true,
+ "configuration" : [
+ {
+ "user" : "adminuser",
+ "name" : "OpenStack",
+ "pwd" : "dummy_pwd",
+ "host" : "10.0.0.1",
+ "admin_token" : "dummy_token",
+ "port" : "5000"
+ },
+ {
+ "host" : "10.56.20.78",
+ "name" : "Kubernetes",
+ "user" : "koren",
+ "token" : "baba-token-xyz",
+ "port" : "6443"
+ },
+ {
+ "user" : "mysqluser",
+ "name" : "mysql",
+ "pwd" : "dummy_pwd",
+ "port" : "3307",
+ "host" : "10.0.0.1"
+ },
+ {
+ "user" : "sshuser",
+ "name" : "CLI",
+ "pwd" : "dummy_pwd",
+ "host" : "10.0.0.1"
+ },
+ {
+ "user" : "rabbitmquser",
+ "name" : "AMQP",
+ "pwd" : "dummy_pwd",
+ "port" : "5673",
+ "host" : "10.0.0.1"
+ },
+ {
+ "name" : "Monitoring",
+ "install_monitoring_client": false,
+ "api_port" : 4567,
+ "ssh_port" : "20022",
+ "rabbitmq_pass" : "dummy_pwd",
+ "env_type" : "production",
+ "rabbitmq_port" : "5671",
+ "server_ip" : "10.0.0.1",
+ "config_folder" : "/local_dir/sensu_config",
+ "type" : "Sensu",
+ "provision" : "None",
+ "ssh_user" : "root",
+ "ssh_password" : "dummy_pwd",
+ "rabbitmq_user" : "sensu",
+ "server_name" : "sensu_server"
+ },
+ {
+ "user" : "admin",
+ "name" : "ACI",
+ "pwd" : "dummy_pwd",
+ "host" : "10.1.1.104"
+ }
+ ],
+ "app_path" : "/home/scan/calipso_prod/app",
+ "scanned" : false,
+ "environment_type" : "Kubernetes"
}
]
diff --git a/app/install/db/monitoring_config_templates.json b/app/install/db/monitoring_config_templates.json
index 9bddfa2..b5c47df 100644
--- a/app/install/db/monitoring_config_templates.json
+++ b/app/install/db/monitoring_config_templates.json
@@ -311,6 +311,34 @@
"type" : "client_check_link_vnic-vconnector.json"
},
{
+ "side" : "client",
+ "order" : "1",
+ "condition" : {
+ "mechanism_drivers" : [
+ "OVS"
+ ]
+ },
+ "config" : {
+ "checks" : {
+ "{objtype}_{objid}" : {
+ "interval" : 15,
+ "command" : "check_vconnector_ovs.py {name}",
+ "standalone" : true,
+ "type": "metric",
+ "subscribers" : [
+ "base"
+ ],
+ "handlers" : [
+ "file",
+ "osdna-monitor"
+ ]
+ }
+ }
+ },
+ "monitoring_system" : "sensu",
+ "type" : "client_check_vconnector_ovs.json"
+},
+{
"side" : "client",
"order" : "1",
"condition" : {
@@ -394,5 +422,28 @@
},
"monitoring_system" : "sensu",
"type" : "client_check_vservice.json"
+},
+{
+ "side" : "client",
+ "order" : "1",
+ "config" : {
+ "checks" : {
+ "{objtype}_{objid}" : {
+ "standalone" : true,
+ "interval" : 15,
+ "command" : "PYTHONPATH=/etc/sensu/plugins check_instance_communications.py {services_and_vnics}",
+ "handlers" : [
+ "file",
+ "osdna-monitor"
+ ],
+ "type" : "metric",
+ "subscribers" : [
+ "base"
+ ]
+ }
+ }
+ },
+ "monitoring_system" : "sensu",
+ "type" : "client_check_instance.json"
}
]
diff --git a/app/install/db/supported_environments.json b/app/install/db/supported_environments.json
index c2c376b..baa3150 100644
--- a/app/install/db/supported_environments.json
+++ b/app/install/db/supported_environments.json
@@ -12,6 +12,21 @@
"monitoring" : true
}
},
+ {
+ "environment" : {
+ "distribution_version" : [
+ "10307"
+ ],
+ "distribution" : "Mercury",
+ "type_drivers" : "vlan",
+ "mechanism_drivers" : "OVS"
+ },
+ "features" : {
+ "scanning" : true,
+ "monitoring" : false,
+ "listening" : true
+ }
+ },
{
"environment" : {
"distribution" : "Devstack",