diff options
| author | Florian Barca <fbarca@hortonworks.com> | 2014-12-30 13:23:57 -0800 |
|---|---|---|
| committer | Florian Barca <fbarca@hortonworks.com> | 2014-12-30 13:25:22 -0800 |
| commit | b768b9e9562aa81ad7bfc80516f6e342083652de (patch) | |
| tree | e29d282ea67c58f39dbcf8b65b44ab7c7525dccf | |
| parent | 321cdbf3673430c6578011cd5c4541938cca0e24 (diff) | |
AMBARI-8963 Metric Monitor start fails on CentOS after WIN changes
Fixed the psutils path
| -rw-r--r-- | ambari-metrics/ambari-metrics-assembly/src/main/assembly/monitor-windows.xml | 2 | ||||
| -rw-r--r-- | ambari-metrics/ambari-metrics-host-monitoring/src/main/python/core/__init__.py | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/ambari-metrics/ambari-metrics-assembly/src/main/assembly/monitor-windows.xml b/ambari-metrics/ambari-metrics-assembly/src/main/assembly/monitor-windows.xml index 65a936bbbc..3b877a7e85 100644 --- a/ambari-metrics/ambari-metrics-assembly/src/main/assembly/monitor-windows.xml +++ b/ambari-metrics/ambari-metrics-assembly/src/main/assembly/monitor-windows.xml @@ -52,7 +52,7 @@ </fileSet> <fileSet> <directory>${monitor.dir}/target/psutil_build</directory> - <outputDirectory>/sbin/core/psutil/build</outputDirectory> + <outputDirectory>/sbin/psutil/build</outputDirectory> <includes> <include>*.egg</include> </includes> diff --git a/ambari-metrics/ambari-metrics-host-monitoring/src/main/python/core/__init__.py b/ambari-metrics/ambari-metrics-host-monitoring/src/main/python/core/__init__.py index 15ad117caa..eb87cb5b64 100644 --- a/ambari-metrics/ambari-metrics-host-monitoring/src/main/python/core/__init__.py +++ b/ambari-metrics/ambari-metrics-host-monitoring/src/main/python/core/__init__.py @@ -21,7 +21,7 @@ limitations under the License. import os, sys path = os.path.abspath(__file__) -path = os.path.normpath(os.path.join(os.path.dirname(path), "psutil", "build")) +path = os.path.join(os.path.dirname(os.path.dirname(path)), "psutil", "build") for dir in os.walk(path).next()[1]: if 'lib' in dir: |