ambari-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dmitriu...@apache.org
Subject [1/2] ambari git commit: AMBARI-9863. Redundant item in setup options of ambari-server setup-security (dlysnichenko)
Date Sun, 01 Mar 2015 19:54:57 GMT
Repository: ambari
Updated Branches:
  refs/heads/branch-2.0.0 706464b00 -> 8742b8fa2
  refs/heads/trunk 3ef90e193 -> 0270df87a


AMBARI-9863. Redundant item in setup options of ambari-server setup-security (dlysnichenko)


Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/0270df87
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/0270df87
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/0270df87

Branch: refs/heads/trunk
Commit: 0270df87a32248060d014657c9465c878917d9d3
Parents: 3ef90e1
Author: Lisnichenko Dmitro <dlysnichenko@hortonworks.com>
Authored: Sun Mar 1 21:52:51 2015 +0200
Committer: Lisnichenko Dmitro <dlysnichenko@hortonworks.com>
Committed: Sun Mar 1 21:52:51 2015 +0200

----------------------------------------------------------------------
 ambari-server/src/main/python/ambari-server.py            | 3 +--
 ambari-server/src/main/python/ambari_server/setupHttps.py | 4 ----
 ambari-server/src/test/python/TestAmbariServer.py         | 8 +-------
 3 files changed, 2 insertions(+), 13 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ambari/blob/0270df87/ambari-server/src/main/python/ambari-server.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/python/ambari-server.py b/ambari-server/src/main/python/ambari-server.py
index a737b14..4adac67 100755
--- a/ambari-server/src/main/python/ambari-server.py
+++ b/ambari-server/src/main/python/ambari-server.py
@@ -35,7 +35,7 @@ from ambari_server.serverConfiguration import configDefaults, get_ambari_propert
 from ambari_server.serverUtils import is_server_runing, refresh_stack_hash
 from ambari_server.serverSetup import reset, setup, setup_jce_policy
 from ambari_server.serverUpgrade import upgrade, upgrade_stack
-from ambari_server.setupHttps import setup_https, setup_ganglia_https
+from ambari_server.setupHttps import setup_https
 
 from ambari_server.setupActions import BACKUP_ACTION, LDAP_SETUP_ACTION, LDAP_SYNC_ACTION,
PSTART_ACTION, \
   REFRESH_STACK_HASH_ACTION, RESET_ACTION, RESTORE_ACTION, SETUP_ACTION, SETUP_SECURITY_ACTION,
START_ACTION, \
@@ -204,7 +204,6 @@ def create_setup_security_actions(args):
 def create_setup_security_actions(args):
   action_list = [
       ['Enable HTTPS for Ambari server.', UserActionRestart(setup_https, args)],
-      ['Enable HTTPS for Ganglia service.', UserAction(setup_ganglia_https)],
       ['Encrypt passwords stored in ambari.properties file.', UserAction(setup_master_key)],
       ['Setup Ambari kerberos JAAS configuration.', UserAction(setup_ambari_krb5_jaas)],
     ]

http://git-wip-us.apache.org/repos/asf/ambari/blob/0270df87/ambari-server/src/main/python/ambari_server/setupHttps.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/python/ambari_server/setupHttps.py b/ambari-server/src/main/python/ambari_server/setupHttps.py
index 1b803a5..fb0f725 100644
--- a/ambari-server/src/main/python/ambari_server/setupHttps.py
+++ b/ambari-server/src/main/python/ambari_server/setupHttps.py
@@ -496,7 +496,3 @@ def setup_component_https(component, command, property, alias):
     properties.store(f, "Changed by 'ambari-server " + command + "' command")
   else:
     print command + " is not enabled in silent mode."
-
-def setup_ganglia_https():
-  setup_component_https("Ganglia", "setup-ganglia-https", GANGLIA_HTTPS,
-                        "ganglia_cert")

http://git-wip-us.apache.org/repos/asf/ambari/blob/0270df87/ambari-server/src/test/python/TestAmbariServer.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/python/TestAmbariServer.py b/ambari-server/src/test/python/TestAmbariServer.py
index a06ba63..dcea3c6 100644
--- a/ambari-server/src/test/python/TestAmbariServer.py
+++ b/ambari-server/src/test/python/TestAmbariServer.py
@@ -298,15 +298,9 @@ class TestAmbariServer(TestCase):
 
     get_validated_string_input_mock.return_value = '2'
     _ambari_server_.setup_security(args)
-    self.assertTrue(setup_component_https_mock.called)
-    setup_component_https_mock.assert_called_with("Ganglia", "setup-ganglia-https",
-                          GANGLIA_HTTPS, "ganglia_cert")
-
-    get_validated_string_input_mock.return_value = '3'
-    _ambari_server_.setup_security(args)
     self.assertTrue(setup_master_key_mock.called)
 
-    get_validated_string_input_mock.return_value = '4'
+    get_validated_string_input_mock.return_value = '3'
     _ambari_server_.setup_security(args)
     self.assertTrue(setup_ambari_krb5_jaas_mock.called)
     pass


Mime
View raw message