Browse Source

AMBARI-11150 - [WinTP2] Ambari Windows services description should not include version

Artem Baranchuk 10 years ago
parent
commit
45822d2476

+ 0 - 2
ambari-agent/conf/windows/service_wrapper.py

@@ -66,8 +66,6 @@ class AmbariAgentService(AmbariService):
   AmbariService._svc_display_name_ = "Ambari Agent"
   AmbariService._svc_description_ = "Ambari Agent"
 
-  AmbariService._AdjustServiceVersion()
-
   heartbeat_stop_handler = None
 
   # Adds the necessary script dir to the Python's modules path

+ 0 - 10
ambari-common/src/main/python/ambari_commons/ambari_service.py

@@ -64,16 +64,6 @@ class AmbariService(WinService):
     self.SvcDoRun()
     pass
 
-  # Call during initialization to implement standard service versioning
-  @classmethod
-  def _AdjustServiceVersion(cls):
-    if os.environ.has_key(AMBARI_VERSION_VAR):
-      ambariVer = os.environ[AMBARI_VERSION_VAR]
-    else:
-      ambariVer = "1.3.0-SNAPSHOT"
-    AmbariService._svc_display_name_ += "-" + ambariVer
-    AmbariService._svc_description_ += " v" + ambariVer
-
   # Override to customize the command-line arguments
   def _InitOptionsParser(self):
     pass

+ 0 - 2
ambari-metrics/ambari-metrics-host-monitoring/src/main/python/amhm_service.py

@@ -40,8 +40,6 @@ class AMHostMonitoringService(AmbariService):
   AmbariService._svc_display_name_ = "Ambari Metrics Host Monitoring"
   AmbariService._svc_description_ = "Ambari Metrics Host Monitoring Service"
 
-  AmbariService._AdjustServiceVersion()
-
   # Adds the necessary script dir to the Python's modules path.
   # Modify this as the deployed product's dir structure changes.
   def _adjustPythonPath(self, current_dir):

+ 0 - 2
ambari-metrics/ambari-metrics-timelineservice/src/main/python/amc_service.py

@@ -38,8 +38,6 @@ class AMCollectorService(AmbariService):
   AmbariService._svc_display_name_ = "Ambari Metrics Collector"
   AmbariService._svc_description_ = "Ambari Metrics Collector Service"
 
-  AmbariService._AdjustServiceVersion()
-
   # Adds the necessary script dir(s) to the Python's modules path.
   # Modify this as the deployed product's dir structure changes.
   def _adjustPythonPath(self, current_dir):

+ 0 - 2
ambari-server/src/main/python/ambari_windows_service.py

@@ -35,8 +35,6 @@ class AmbariServerService(AmbariService):
   AmbariService._svc_display_name_ = "Ambari Server"
   AmbariService._svc_description_ = "Ambari Server"
 
-  AmbariService._AdjustServiceVersion()
-
   # Adds the necessary script dir to the Python's modules path
   def _adjustPythonPath(self, current_dir):
     python_path = os.path.join(current_dir, "sbin")