summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKoren Lev <korenlev@gmail.com>2017-09-12 15:09:47 +0300
committerKoren Lev <korenlev@gmail.com>2017-09-12 15:09:47 +0300
commit41c459381ab3e94ca6f28600d6ed17c6b5676028 (patch)
tree486b4af3d46d7dd560e6bbcf9d88f8ba9b036865
parentb439cf896a52e086c791dd8516140cfa6b1a4cd2 (diff)
split versions and distributions
Change-Id: Id8ac8782d1f6206a6d4534540cf3b03f8fcc19b2 Signed-off-by: Koren Lev <korenlev@gmail.com>
-rw-r--r--app/install/db/constants.json117
-rw-r--r--app/install/db/environments_config.json3
-rw-r--r--app/install/db/supported_environments.json280
3 files changed, 222 insertions, 178 deletions
diff --git a/app/install/db/constants.json b/app/install/db/constants.json
index 3848d1d..2ad8921 100644
--- a/app/install/db/constants.json
+++ b/app/install/db/constants.json
@@ -421,94 +421,115 @@
}
]
},
-{
+{
+ "name" : "distributions",
"data" : [
{
- "label" : "Mirantis-6.0",
- "value" : "Mirantis-6.0"
+ "value" : "Mirantis",
+ "label" : "Mirantis"
},
{
- "label" : "Mirantis-7.0",
- "value" : "Mirantis-7.0"
+ "value" : "RDO",
+ "label" : "RDO"
},
{
- "label" : "Mirantis-8.0",
- "value" : "Mirantis-8.0"
+ "value" : "Devstack",
+ "label" : "Devstack"
},
{
- "label" : "Mirantis-9.0",
- "value" : "Mirantis-9.0"
+ "value" : "Canonical",
+ "label" : "Canonical"
},
{
- "label" : "RDO-Mitaka",
- "value" : "RDO-Mitaka"
+ "value" : "Apex",
+ "label" : "Apex"
},
{
- "label" : "RDO-Liberty",
- "value" : "RDO-Liberty"
+ "value" : "Packstack",
+ "label" : "Packstack"
},
{
- "label" : "RDO-Juno",
- "value" : "RDO-Juno"
+ "value" : "Stratoscale",
+ "label" : "Stratoscale"
},
{
- "label" : "RDO-kilo",
- "value" : "RDO-kilo"
+ "value" : "Mercury",
+ "label" : "Mercury"
+ }
+ ]
+},
+{
+ "name" : "distribution_versions",
+ "data" : [
+ {
+ "value" : "6.0",
+ "label" : "6.0"
},
{
- "label" : "devstack-liberty",
- "value" : "devstack-liberty"
+ "value" : "7.0",
+ "label" : "7.0"
},
{
- "label" : "Canonical-icehouse",
- "value" : "Canonical-icehouse"
+ "value" : "8.0",
+ "label" : "8.0"
},
{
- "label" : "Canonical-juno",
- "value" : "Canonical-juno"
+ "value" : "9.0",
+ "label" : "9.0"
},
{
- "label" : "Canonical-liberty",
- "value" : "Canonical-liberty"
+ "value" : "Mitaka",
+ "label" : "Mitaka"
},
{
- "label" : "Canonical-mitaka",
- "value" : "Canonical-mitaka"
+ "value" : "Liberty",
+ "label" : "Liberty"
},
{
- "label" : "Apex-Mitaka",
- "value" : "Apex-Mitaka"
+ "value" : "Newton",
+ "label" : "Newton"
},
{
- "label" : "Devstack-Mitaka",
- "value" : "Devstack-Mitaka"
+ "value" : "Ocata",
+ "label" : "Ocata"
},
{
- "label" : "packstack-7.0.0-0.10.dev1682",
- "value" : "packstack-7.0.0-0.10.dev1682"
+ "value" : "Juno",
+ "label" : "Juno"
},
{
- "label" : "Stratoscale-v2.1.6",
- "value" : "Stratoscale-v2.1.6"
+ "value" : "Kilo",
+ "label" : "Kilo"
},
{
- "label" : "Mirantis-9.1",
- "value" : "Mirantis-9.1"
- },
+ "value" : "Icehouse",
+ "label" : "Icehouse"
+ },
{
- "value" : "Mirantis-10.0",
- "label" : "Mirantis-10.0"
- },
+ "value" : "7.0.0-0.10.dev1682",
+ "label" : "7.0.0-0.10.dev1682"
+ },
{
- "value" : "Apex-Euphrates",
- "label" : "Apex-Euphrates"
- },
+ "value" : "2.1.6",
+ "label" : "2.1.6"
+ },
{
- "label" : "Mercury_10239",
- "value" : "Mercury_10239"
+ "value" : "9.1",
+ "label" : "9.1"
+ },
+ {
+ "value" : "10.0",
+ "label" : "10.0"
+ },
+ {
+ "value" : "Euphrates",
+ "label" : "Euphrates"
+ },
+ {
+ "value" : "10239",
+ "label" : "10239"
}
- ],
- "name" : "distributions"
+ ]
},
{
"name" : "message_source_systems",
diff --git a/app/install/db/environments_config.json b/app/install/db/environments_config.json
index 0991447..93971a2 100644
--- a/app/install/db/environments_config.json
+++ b/app/install/db/environments_config.json
@@ -56,7 +56,8 @@
],
"enable_monitoring" : true,
"name" : "DEMO-ENVIRONMENT-SCHEME",
- "distribution" : "Mirantis-8.0",
+ "distribution" : "Mirantis",
+ "distribution_version" : "8.0",
"last_scanned" : "filled-by-scanning",
"app_path" : "/home/scan/calipso_prod/app",
"scanned" : false,
diff --git a/app/install/db/supported_environments.json b/app/install/db/supported_environments.json
index c5cd0ef..9a9ddcb 100644
--- a/app/install/db/supported_environments.json
+++ b/app/install/db/supported_environments.json
@@ -1,266 +1,288 @@
[
{
"environment" : {
- "distribution" : "Mirantis-10.0",
- "type_drivers" : "vlan",
- "mechanism_drivers" : "OVS"
+ "distribution" : "Mirantis",
+ "distribution_version" : "10.0",
+ "mechanism_drivers" : "OVS",
+ "type_drivers" : "vlan"
},
"features" : {
+ "listening" : true,
"scanning" : true,
- "monitoring" : true,
- "listening" : true
+ "monitoring" : true
}
},
{
"environment" : {
- "type_drivers" : "vlan",
+ "distribution" : "Mercury",
+ "distribution_version" : "10239",
"mechanism_drivers" : "OVS",
- "distribution" : "Mercury_10239"
+ "type_drivers" : "vlan"
},
"features" : {
- "monitoring" : false,
+ "listening" : true,
"scanning" : true,
- "listening" : true
+ "monitoring" : false
}
},
-{
+{
"environment" : {
- "distribution" : "Apex-Euphrates",
- "type_drivers" : "vxlan",
- "mechanism_drivers" : "OVS"
- },
+ "distribution" : "Apex",
+ "distribution_version" : "Euphrates",
+ "mechanism_drivers" : "OVS",
+ "type_drivers" : "vxlan"
+ },
"features" : {
- "scanning" : true,
- "monitoring" : true,
- "listening" : true
+ "listening" : true,
+ "scanning" : true,
+ "monitoring" : true
}
},
-{
+{
"environment" : {
- "distribution" : "Stratoscale-v2.1.6",
+ "distribution" : "Stratoscale",
+ "distribution_version" : "2.1.6",
"mechanism_drivers" : "OVS",
"type_drivers" : "vlan"
},
"features" : {
- "monitoring" : true,
"listening" : false,
- "scanning" : true
+ "scanning" : true,
+ "monitoring" : true
}
},
-{
+{
"environment" : {
- "distribution" : "Mirantis-6.0",
+ "distribution" : "Mirantis",
+ "distribution_version" : "6.0",
"mechanism_drivers" : "OVS",
"type_drivers" : "vxlan"
},
"features" : {
- "monitoring" : true,
"listening" : true,
- "scanning" : true
+ "scanning" : true,
+ "monitoring" : true
}
},
-{
+{
"environment" : {
- "distribution" : "Mirantis-7.0",
+ "distribution" : "Mirantis",
+ "distribution_version" : "7.0",
"mechanism_drivers" : "OVS",
"type_drivers" : "vxlan"
},
"features" : {
- "monitoring" : true,
"listening" : true,
- "scanning" : true
+ "scanning" : true,
+ "monitoring" : true
}
},
-{
+{
"environment" : {
- "distribution" : "Mirantis-8.0",
+ "distribution" : "Mirantis",
+ "distribution_version" : "8.0",
"mechanism_drivers" : "OVS",
"type_drivers" : "vxlan"
},
"features" : {
- "monitoring" : true,
"listening" : true,
- "scanning" : true
+ "scanning" : true,
+ "monitoring" : true
}
},
-{
+{
"environment" : {
- "distribution" : "Mirantis-9.1",
+ "distribution" : "Mirantis",
+ "distribution_version" : "9.1",
"mechanism_drivers" : "OVS",
"type_drivers" : "vxlan"
},
"features" : {
- "monitoring" : true,
"listening" : false,
- "scanning" : true
+ "scanning" : true,
+ "monitoring" : true
}
},
-{
+{
"environment" : {
- "distribution" : "RDO-Mitaka",
+ "distribution" : "RDO",
+ "distribution_version" : "Mitaka",
"mechanism_drivers" : "OVS",
"type_drivers" : "vxlan"
},
"features" : {
- "monitoring" : true,
"listening" : true,
- "scanning" : true
+ "scanning" : true,
+ "monitoring" : true
}
},
-{
+{
"environment" : {
- "distribution" : "RDO-Liberty",
+ "distribution" : "RDO",
+ "distribution_version" : "Liberty",
"mechanism_drivers" : "OVS",
"type_drivers" : "vxlan"
},
"features" : {
- "monitoring" : true,
"listening" : true,
- "scanning" : true
+ "scanning" : true,
+ "monitoring" : true
}
},
-{
+{
"environment" : {
- "distribution" : "Mirantis-9.0",
- "mechanism_drivers" : "OVS",
+ "distribution" : "Mirantis",
+ "distribution_version" : "9.0",
+ "mechanism_drivers" : "OVS",
"type_drivers" : "vxlan"
- },
+ },
"features" : {
- "monitoring" : true,
- "listening" : true,
- "scanning" : true
+ "listening" : true,
+ "scanning" : true,
+ "monitoring" : true
}
},
-{
+{
"environment" : {
- "distribution" : "Mirantis-9.0",
- "mechanism_drivers" : "OVS",
+ "distribution" : "Mirantis",
+ "distribution_version" : "9.0",
+ "mechanism_drivers" : "OVS",
"type_drivers" : "vlan"
- },
+ },
"features" : {
- "monitoring" : true,
- "listening" : true,
- "scanning" : true
+ "listening" : true,
+ "scanning" : true,
+ "monitoring" : true
}
},
-{
+{
"environment" : {
- "distribution" : "Mirantis-8.0",
- "mechanism_drivers" : "OVS",
+ "distribution" : "Mirantis",
+ "distribution_version" : "8.0",
+ "mechanism_drivers" : "OVS",
"type_drivers" : "vlan"
- },
+ },
"features" : {
- "monitoring" : true,
- "listening" : true,
- "scanning" : true
+ "listening" : true,
+ "scanning" : true,
+ "monitoring" : true
}
},
-{
+{
"environment" : {
- "distribution" : "Mirantis-6.0",
- "mechanism_drivers" : "OVS",
+ "distribution" : "Mirantis",
+ "distribution_version" : "6.0",
+ "mechanism_drivers" : "OVS",
"type_drivers" : "vlan"
- },
+ },
"features" : {
- "monitoring" : true,
- "listening" : true,
- "scanning" : true
+ "listening" : true,
+ "scanning" : true,
+ "monitoring" : true
}
},
-{
+{
"environment" : {
- "distribution" : "Mirantis-7.0",
- "mechanism_drivers" : "OVS",
+ "distribution" : "Mirantis",
+ "distribution_version" : "7.0",
+ "mechanism_drivers" : "OVS",
"type_drivers" : "vlan"
- },
+ },
"features" : {
- "monitoring" : true,
- "listening" : true,
- "scanning" : true
+ "listening" : true,
+ "scanning" : true,
+ "monitoring" : true
}
},
-{
+{
"environment" : {
- "distribution" : "Mirantis-9.1",
- "mechanism_drivers" : "OVS",
+ "distribution" : "Mirantis",
+ "distribution_version" : "9.1",
+ "mechanism_drivers" : "OVS",
"type_drivers" : "vlan"
- },
+ },
"features" : {
- "monitoring" : true,
- "listening" : true,
- "scanning" : true
+ "listening" : true,
+ "scanning" : true,
+ "monitoring" : true
}
},
-{
+{
"environment" : {
- "distribution" : "RDO-Mitaka",
- "mechanism_drivers" : "VPP",
+ "distribution" : "RDO",
+ "distribution_version" : "Mitaka",
+ "mechanism_drivers" : "VPP",
"type_drivers" : "vxlan"
- },
+ },
"features" : {
- "monitoring" : true,
- "listening" : true,
- "scanning" : true
+ "listening" : true,
+ "scanning" : true,
+ "monitoring" : true
}
},
-{
+{
"environment" : {
- "distribution" : "RDO-Mitaka",
- "mechanism_drivers" : "VPP",
+ "distribution" : "RDO",
+ "distribution_version" : "Mitaka",
+ "mechanism_drivers" : "VPP",
"type_drivers" : "vlan"
- },
+ },
"features" : {
- "monitoring" : true,
- "listening" : true,
- "scanning" : true
+ "listening" : true,
+ "scanning" : true,
+ "monitoring" : true
}
},
-{
+{
"environment" : {
- "distribution" : "Devstack-Mitaka",
- "mechanism_drivers" : "VPP",
+ "distribution" : "Devstack",
+ "distribution_version" : "Mitaka",
+ "mechanism_drivers" : "VPP",
"type_drivers" : "vlan"
- },
+ },
"features" : {
- "monitoring" : true,
- "listening" : true,
- "scanning" : true
+ "listening" : true,
+ "scanning" : true,
+ "monitoring" : true
}
},
-{
+{
"environment" : {
- "distribution" : "Devstack-Mitaka",
- "mechanism_drivers" : "VPP",
+ "distribution" : "Devstack",
+ "distribution_version" : "Mitaka",
+ "mechanism_drivers" : "VPP",
"type_drivers" : "vxlan"
- },
+ },
"features" : {
- "monitoring" : true,
- "listening" : true,
- "scanning" : true
+ "listening" : true,
+ "scanning" : true,
+ "monitoring" : true
}
},
-{
+{
"environment" : {
- "distribution" : "RDO-Mitaka",
- "mechanism_drivers" : "OVS",
+ "distribution" : "RDO",
+ "distribution_version" : "Mitaka",
+ "mechanism_drivers" : "OVS",
"type_drivers" : "vlan"
- },
+ },
"features" : {
- "monitoring" : true,
- "listening" : true,
- "scanning" : true
+ "listening" : true,
+ "scanning" : true,
+ "monitoring" : true
}
},
-{
+{
"environment" : {
- "distribution" : "RDO-Liberty",
- "mechanism_drivers" : "OVS",
+ "distribution" : "RDO",
+ "distribution_version" : "Liberty",
+ "mechanism_drivers" : "OVS",
"type_drivers" : "vlan"
- },
+ },
"features" : {
- "monitoring" : true,
- "listening" : true,
- "scanning" : true
+ "listening" : true,
+ "scanning" : true,
+ "monitoring" : true
}
}
]