There are three sets of changes:

1. Changing module (id) names to be consistent with service name changes.
2. Making svc-monitor and schema-transformer file names consistent
3. Make contrail-database file names consistent with over contrail file
naming convention.
4. Deletes unnecessary files

This commit requires changes in contrail-controller, contrail-packaging,
contrail-packages, contrail-provisioning, contrail-puppet and
contrail-test repos.

Change-Id: I44c272aa9f0ae108557b00de580a0cbca6976fec
Closes-PR: 1365845
Closes-PR: 1355712

contrail/manifests/contrail_config.pp

@@ -7,7 +7,7 @@
         mode => 0755,
         owner => root,
         group => root,
-        require => [File["/etc/contrail/ctrl-details"],Config-template-scripts["schema_transformer.conf"],Config-template-scripts["svc_monitor.conf"]]
+        require => [File["/etc/contrail/ctrl-details"],Config-template-scripts["contrail-schema.conf"],Config-template-scripts["contrail-svc-monitor.conf"]]
     }
     exec { "setup-${title}" :
         command => "/bin/bash /opt/contrail/bin/${title}.sh $operatingsystem && echo setup-${title} >> /etc/contrail/contrail_config_exec.out",
@@ -231,8 +231,8 @@
 
     # Ensure all config files with correct content are present.
     config-template-scripts { ["contrail-api.conf",
-                               "schema_transformer.conf",
-                               "svc_monitor.conf",
+                               "contrail-schema.conf",
+                               "contrail-svc-monitor.conf",
                                "contrail-discovery.conf",
                                "vnc_api_lib.ini",
                                "contrail_plugin.ini"]: }
@@ -419,7 +419,7 @@
 
 ###############################
 
-    File["/etc/contrail/ctrl-details"]->File["/etc/contrail/service.token"]->Config-template-scripts["contrail-api.conf"]->File["/etc/contrail/contrail_plugin.ini"]->Config-template-scripts["schema_transformer.conf"]->Config-template-scripts["svc_monitor.conf"]->Config-template-scripts["contrail-discovery.conf"]->Config-template-scripts["vnc_api_lib.ini"]
+    File["/etc/contrail/ctrl-details"]->File["/etc/contrail/service.token"]->Config-template-scripts["contrail-api.conf"]->File["/etc/contrail/contrail_plugin.ini"]->Config-template-scripts["contrail-schema.conf"]->Config-template-scripts["contrail-svc-monitor.conf"]->Config-template-scripts["contrail-discovery.conf"]->Config-template-scripts["vnc_api_lib.ini"]
 
     # Initialize the multi tenancy option will update latter based on vns argument
     if ($contrail_multi_tenancy == "True") {

contrail/templates/contrail-nodemgr-database.ini.erb

@@ -4,7 +4,7 @@
 ; sent by supervisor.
 
 [eventlistener:contrail-database-nodemgr]
-command=/bin/bash -c "/usr/bin/contrail-nodemgr --rules=/etc/contrail/supervisord_database_files/supervisord_contrail_database.rules --nodetype=contrail-database  --discovery_server <%= contrail_config_ip %>"
+command=/bin/bash -c "/usr/bin/contrail-nodemgr --rules=/etc/contrail/supervisord_database_files/contrail-database.rules --nodetype=contrail-database  --discovery_server <%= contrail_config_ip %>"
 events=PROCESS_COMMUNICATION,PROCESS_STATE
 environment_file= /etc/contrail/database_nodemgr_param