Repository: ambari Updated Branches: refs/heads/branch-1.7.0 690fa082a -> 7df59aa3f refs/heads/trunk 9000f4379 -> 718a90918
AMBARI-7788. Nagios password can be changed on the UI, but it's not reflected in Nagios Web itself (the password never updates) (aonishuk) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/718a9091 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/718a9091 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/718a9091 Branch: refs/heads/trunk Commit: 718a90918bb74a91946a3f897be7b1c6930707e3 Parents: 9000f43 Author: Andrew Onishuk <aonis...@hortonworks.com> Authored: Thu Oct 16 14:38:24 2014 +0300 Committer: Andrew Onishuk <aonis...@hortonworks.com> Committed: Thu Oct 16 14:38:24 2014 +0300 ---------------------------------------------------------------------- .../stacks/BIGTOP/0.8/services/NAGIOS/package/scripts/nagios.py | 5 +---- .../stacks/HDP/1.3.2/services/NAGIOS/package/scripts/nagios.py | 5 +---- .../stacks/HDP/2.0.6/services/NAGIOS/package/scripts/nagios.py | 5 +---- .../src/test/python/stacks/1.3.2/NAGIOS/test_nagios_server.py | 3 +-- .../src/test/python/stacks/2.0.6/NAGIOS/test_nagios_server.py | 3 +-- 5 files changed, 5 insertions(+), 16 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/718a9091/ambari-server/src/main/resources/stacks/BIGTOP/0.8/services/NAGIOS/package/scripts/nagios.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/BIGTOP/0.8/services/NAGIOS/package/scripts/nagios.py b/ambari-server/src/main/resources/stacks/BIGTOP/0.8/services/NAGIOS/package/scripts/nagios.py index ca2d64c..a63ea38 100644 --- a/ambari-server/src/main/resources/stacks/BIGTOP/0.8/services/NAGIOS/package/scripts/nagios.py +++ b/ambari-server/src/main/resources/stacks/BIGTOP/0.8/services/NAGIOS/package/scripts/nagios.py @@ -91,10 +91,7 @@ def set_web_permisssions(): import params cmd = format("{htpasswd_cmd} -c -b {conf_dir}/htpasswd.users {nagios_web_login} {nagios_web_password!p}") - test = format("grep {nagios_web_login} {conf_dir}/htpasswd.users") - Execute( cmd, - not_if = test - ) + Execute(cmd) File( format("{conf_dir}/htpasswd.users"), owner = params.nagios_user, http://git-wip-us.apache.org/repos/asf/ambari/blob/718a9091/ambari-server/src/main/resources/stacks/HDP/1.3.2/services/NAGIOS/package/scripts/nagios.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/HDP/1.3.2/services/NAGIOS/package/scripts/nagios.py b/ambari-server/src/main/resources/stacks/HDP/1.3.2/services/NAGIOS/package/scripts/nagios.py index 7756c47..1f7a04c 100644 --- a/ambari-server/src/main/resources/stacks/HDP/1.3.2/services/NAGIOS/package/scripts/nagios.py +++ b/ambari-server/src/main/resources/stacks/HDP/1.3.2/services/NAGIOS/package/scripts/nagios.py @@ -78,10 +78,7 @@ def set_web_permisssions(): import params cmd = format("{htpasswd_cmd} -c -b /etc/nagios/htpasswd.users {nagios_web_login} {nagios_web_password!p}") - test = format("grep {nagios_web_login} /etc/nagios/htpasswd.users") - Execute( cmd, - not_if = test - ) + Execute(cmd) File( "/etc/nagios/htpasswd.users", owner = params.nagios_user, http://git-wip-us.apache.org/repos/asf/ambari/blob/718a9091/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/NAGIOS/package/scripts/nagios.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/NAGIOS/package/scripts/nagios.py b/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/NAGIOS/package/scripts/nagios.py index ca2d64c..a63ea38 100644 --- a/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/NAGIOS/package/scripts/nagios.py +++ b/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/NAGIOS/package/scripts/nagios.py @@ -91,10 +91,7 @@ def set_web_permisssions(): import params cmd = format("{htpasswd_cmd} -c -b {conf_dir}/htpasswd.users {nagios_web_login} {nagios_web_password!p}") - test = format("grep {nagios_web_login} {conf_dir}/htpasswd.users") - Execute( cmd, - not_if = test - ) + Execute(cmd) File( format("{conf_dir}/htpasswd.users"), owner = params.nagios_user, http://git-wip-us.apache.org/repos/asf/ambari/blob/718a9091/ambari-server/src/test/python/stacks/1.3.2/NAGIOS/test_nagios_server.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/python/stacks/1.3.2/NAGIOS/test_nagios_server.py b/ambari-server/src/test/python/stacks/1.3.2/NAGIOS/test_nagios_server.py index 17f0dca..d5a35bc 100644 --- a/ambari-server/src/test/python/stacks/1.3.2/NAGIOS/test_nagios_server.py +++ b/ambari-server/src/test/python/stacks/1.3.2/NAGIOS/test_nagios_server.py @@ -260,8 +260,7 @@ class TestNagiosServer(RMFTestCase): mode=0755 ) self.assertResourceCalled('Execute', - 'htpasswd2 -c -b /etc/nagios/htpasswd.users nagiosadmin \'!`"\'"\'"\' 1\'', - not_if="grep nagiosadmin /etc/nagios/htpasswd.users" + 'htpasswd2 -c -b /etc/nagios/htpasswd.users nagiosadmin \'!`"\'"\'"\' 1\'' ) self.assertResourceCalled('File', '/etc/nagios/htpasswd.users', http://git-wip-us.apache.org/repos/asf/ambari/blob/718a9091/ambari-server/src/test/python/stacks/2.0.6/NAGIOS/test_nagios_server.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/python/stacks/2.0.6/NAGIOS/test_nagios_server.py b/ambari-server/src/test/python/stacks/2.0.6/NAGIOS/test_nagios_server.py index 58c04f3..3e4ea26 100644 --- a/ambari-server/src/test/python/stacks/2.0.6/NAGIOS/test_nagios_server.py +++ b/ambari-server/src/test/python/stacks/2.0.6/NAGIOS/test_nagios_server.py @@ -289,8 +289,7 @@ class TestNagiosServer(RMFTestCase): mode=0755 ) self.assertResourceCalled('Execute', - 'htpasswd2 -c -b /etc/nagios/htpasswd.users nagiosadmin \'!`"\'"\'"\' 1\'', - not_if="grep nagiosadmin /etc/nagios/htpasswd.users" + 'htpasswd2 -c -b /etc/nagios/htpasswd.users nagiosadmin \'!`"\'"\'"\' 1\'' ) self.assertResourceCalled('File', '/etc/nagios/htpasswd.users', owner='nagios',
