Add few more variations of container names for RHOSP13 setup

Change-Id: Iadc50e9cd87716d74e5ff4c221db398dda52e23f Closes-bug: #1785762
Juniper · Aug 8, 2018 · a8846a0 · a8846a0
1 parent e0eecf9
commit a8846a0
Showing 1 changed file with 12 additions and 12 deletions.
diff --git a/common/contrail_services.py b/common/contrail_services.py
@@ -1,29 +1,29 @@
 CONTRAIL_SERVICES_CONTAINER_MAP = {
     'api-server': ['config_api', 'contrail-config-api'],
     'schema': ['config_schema', 'contrail-schema-transformer'],
-    'svc-monitor': ['config_svcmonitor', 'contrail-svcmonitor'],
-    'device-manager': ['config_devicemgr', 'contrail-devicemgr'],
+    'svc-monitor': ['config_svcmonitor', 'contrail-svcmonitor', 'config_svc_monitor'],
+    'device-manager': ['config_devicemgr', 'contrail-devicemgr', 'device_manager'],
     'control': ['control_control', 'k8s_contrail-control'],
     'dns': ['control_dns', 'contrail-dns'],
     'named': ['control_named', 'contrail-named'],
     'analytics-api': ['analytics_api', 'contrail-analytics-api'],
-    'alarm-gen': ['analytics_alarm-gen', 'contrail-alarm-gen'],
-    'query-engine': ['analytics_query-engine', 'contrail-query-engine'],
+    'alarm-gen': ['analytics_alarm-gen', 'contrail-alarm-gen', 'analytics_alarmgen'],
+    'query-engine': ['analytics_query-engine', 'contrail-query-engine', 'analytics_queryengine'],
     'topology': ['analytics_topology', 'contrail-topology'],
     'collector': ['analytics_collector', 'contrail-collector'],
-    'snmp-collector': ['analytics_snmp-collector', 'contrail-snmp-collector'],
-    'agent': ['contrail-agent', 'vrouter-agent', 'contrail-vrouter-agent'],
+    'snmp-collector': ['analytics_snmp-collector', 'contrail-snmp-collector', 'analytics_snmp_collector'],
+    'agent': ['contrail-agent', 'vrouter-agent', 'contrail-vrouter-agent', 'vrouter_agent'],
     'webui': ['webui_web', 'contrail-webui_'],
     'webui-middleware': ['webui_job', 'contrail-webui-middleware'],
     'config-rabbitmq': ['configdatabase_rabbitmq', 'rabbitmq'],
     'config-zookeeper': ['configdatabase_zookeeper',
-                         'contrail-config-zookeeper', 'config_database_zookeeper'],
-    'config-cassandra': ['configdatabase_cassandra', 'contrail-configdb', 'config_database_cassandra'],
-    'analytics-kafka': ['analyticsdatabase_kafka', 'contrail-kafka', 'analytics_database_kafka'],
+                         'contrail-config-zookeeper', 'config_database_zookeeper', 'config_zookeeper'],
+    'config-cassandra': ['configdatabase_cassandra', 'contrail-configdb', 'config_database_cassandra', 'config_database'],
+    'analytics-kafka': ['analyticsdatabase_kafka', 'contrail-kafka', 'analytics_database_kafka', 'analytics_kafka'],
     'analytics-zookeeper': ['analyticsdatabase_zookeeper',
-                            'contrail-analytics-zookeeper', 'analytics_database_zookeeper'],
+                            'contrail-analytics-zookeeper', 'analytics_database_zookeeper', 'analytics_zookeeper'],
     'analytics-cassandra': ['analyticsdatabase_cassandra',
-                            'contrail-analyticsdb', 'analytics_database_cassandra'],
+                            'contrail-analyticsdb', 'analytics_database_cassandra', 'contrail_analytics_database'],
     'nova': ['nova_api', 'nova-api-osapi'],
     'nova-compute': ['nova_compute', 'nova-compute'],
     'nova-conductor': ['nova_conductor', 'nova-conductor'],
@@ -35,7 +35,7 @@
     'neutron': ['neutron', 'neutron-server'],
     'mysql': ['mariadb'],
     'redis': ['webui_redis', 'webui-redis','redis'],
-    'vrouter-nodemgr': ['vrouter_nodemgr', 'vrouter-nodemgr'],
+    'vrouter-nodemgr': ['vrouter_nodemgr', 'vrouter-nodemgr', 'vrouter_agent_nodemgr'],
     'config-nodemgr': ['config_nodemgr', 'config-nodemgr'],
     'analytics-nodemgr': ['analytics_nodemgr', 'analytics-nodemgr'],
     'control-nodemgr': ['control_nodemgr', 'control-nodemgr'],