You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by ao...@apache.org on 2015/09/03 14:37:48 UTC
[2/2] ambari git commit: AMBARI-12994. Devdeploy: Knox gateway start
fails on Ubuntu (aonishuk)
AMBARI-12994. Devdeploy: Knox gateway start fails on Ubuntu (aonishuk)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/1b2c3007
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/1b2c3007
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/1b2c3007
Branch: refs/heads/branch-2.1
Commit: 1b2c3007bc5f5a6fc7ff9b1238110dfc06837b95
Parents: b187f61
Author: Andrew Onishuk <ao...@hortonworks.com>
Authored: Thu Sep 3 15:35:02 2015 +0300
Committer: Andrew Onishuk <ao...@hortonworks.com>
Committed: Thu Sep 3 15:35:02 2015 +0300
----------------------------------------------------------------------
.../KNOX/0.5.0.2.2/package/scripts/params_linux.py | 2 +-
.../test/python/stacks/2.2/KNOX/test_knox_gateway.py | 12 ++++++------
2 files changed, 7 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/1b2c3007/ambari-server/src/main/resources/common-services/KNOX/0.5.0.2.2/package/scripts/params_linux.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/KNOX/0.5.0.2.2/package/scripts/params_linux.py b/ambari-server/src/main/resources/common-services/KNOX/0.5.0.2.2/package/scripts/params_linux.py
index 27a71a2..5ff30c3 100644
--- a/ambari-server/src/main/resources/common-services/KNOX/0.5.0.2.2/package/scripts/params_linux.py
+++ b/ambari-server/src/main/resources/common-services/KNOX/0.5.0.2.2/package/scripts/params_linux.py
@@ -59,7 +59,7 @@ if Script.is_hdp_stack_greater_or_equal("2.2"):
knox_master_secret_path = '/usr/hdp/current/knox-server/data/security/master'
knox_cert_store_path = '/usr/hdp/current/knox-server/data/security/keystores/gateway.jks'
- knox_data_dir = '/usr/hdp/current/knox-server/data'
+ knox_data_dir = '/usr/hdp/current/knox-server/data/'
knox_group = default("/configurations/knox-env/knox_group", "knox")
mode = 0644
http://git-wip-us.apache.org/repos/asf/ambari/blob/1b2c3007/ambari-server/src/test/python/stacks/2.2/KNOX/test_knox_gateway.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/python/stacks/2.2/KNOX/test_knox_gateway.py b/ambari-server/src/test/python/stacks/2.2/KNOX/test_knox_gateway.py
index 2acd4053..3ae42a0 100644
--- a/ambari-server/src/test/python/stacks/2.2/KNOX/test_knox_gateway.py
+++ b/ambari-server/src/test/python/stacks/2.2/KNOX/test_knox_gateway.py
@@ -39,7 +39,7 @@ class TestKnoxGateway(RMFTestCase):
target = RMFTestCase.TARGET_COMMON_SERVICES
)
- self.assertResourceCalled('Directory', '/usr/hdp/current/knox-server/data',
+ self.assertResourceCalled('Directory', '/usr/hdp/current/knox-server/data/',
owner = 'knox',
group = 'knox',
recursive = True
@@ -87,7 +87,7 @@ class TestKnoxGateway(RMFTestCase):
self.assertResourceCalled('Execute', ('chown',
'-R',
'knox:knox',
- '/usr/hdp/current/knox-server/data',
+ '/usr/hdp/current/knox-server/data/',
'/var/log/knox',
'/var/run/knox',
'/usr/hdp/current/knox-server/conf',
@@ -245,7 +245,7 @@ class TestKnoxGateway(RMFTestCase):
self.assertResourceCalled('Execute', ('tar',
'-zcvhf',
'/tmp/knox-upgrade-backup/knox-data-backup.tar',
- '/usr/hdp/current/knox-server/data'),
+ '/usr/hdp/current/knox-server/data/'),
sudo = True,
)
self.assertResourceCalled('Execute', ('hdp-select', 'set', 'knox-server', '2.2.1.0-3242'),
@@ -286,7 +286,7 @@ class TestKnoxGateway(RMFTestCase):
self.assertResourceCalled('Execute', ('tar',
'-zcvhf',
'/tmp/knox-upgrade-backup/knox-data-backup.tar',
- '/usr/hdp/current/knox-server/data'),
+ '/usr/hdp/current/knox-server/data/'),
sudo = True,
)
self.assertResourceCalled('Execute', ('hdp-select', 'set', 'knox-server', '2.3.0.0-1234'),
@@ -330,7 +330,7 @@ class TestKnoxGateway(RMFTestCase):
target = RMFTestCase.TARGET_COMMON_SERVICES)
- self.assertResourceCalled('Directory', '/usr/hdp/current/knox-server/data',
+ self.assertResourceCalled('Directory', '/usr/hdp/current/knox-server/data/',
owner = 'knox',
group = 'knox',
recursive = True
@@ -378,7 +378,7 @@ class TestKnoxGateway(RMFTestCase):
self.assertResourceCalled('Execute', ('chown',
'-R',
'knox:knox',
- '/usr/hdp/current/knox-server/data',
+ '/usr/hdp/current/knox-server/data/',
'/var/log/knox',
'/var/run/knox',
'/usr/hdp/current/knox-server/conf', '/usr/hdp/current/knox-server/conf/topologies'),