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/04/21 00:28:19 UTC
ambari git commit: AMBARI-10614. Ranger functionality is broken
(repos are not created) (aonishuk)
Repository: ambari
Updated Branches:
refs/heads/trunk f04358d71 -> 9e2b60bac
AMBARI-10614. Ranger functionality is broken (repos are not created) (aonishuk)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/9e2b60ba
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/9e2b60ba
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/9e2b60ba
Branch: refs/heads/trunk
Commit: 9e2b60bacddd0b22196a74cb8d6160ca86e87e83
Parents: f04358d
Author: Andrew Onishuk <ao...@hortonworks.com>
Authored: Tue Apr 21 01:28:01 2015 +0300
Committer: Andrew Onishuk <ao...@hortonworks.com>
Committed: Tue Apr 21 01:28:01 2015 +0300
----------------------------------------------------------------------
.../libraries/functions/ranger_functions.py | 2 +-
.../libraries/providers/modify_properties_file.py | 7 +++++--
.../libraries/providers/properties_file.py | 5 +++--
.../RANGER/0.4.0/configuration/usersync-properties.xml | 5 +++++
.../common-services/RANGER/0.4.0/package/scripts/params.py | 2 ++
5 files changed, 16 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/9e2b60ba/ambari-common/src/main/python/resource_management/libraries/functions/ranger_functions.py
----------------------------------------------------------------------
diff --git a/ambari-common/src/main/python/resource_management/libraries/functions/ranger_functions.py b/ambari-common/src/main/python/resource_management/libraries/functions/ranger_functions.py
index 00d88be..99b8c2c 100644
--- a/ambari-common/src/main/python/resource_management/libraries/functions/ranger_functions.py
+++ b/ambari-common/src/main/python/resource_management/libraries/functions/ranger_functions.py
@@ -242,7 +242,7 @@ class Rangeradmin:
result = urllib2.urlopen(request)
response_code = result.getcode()
response = json.loads(result.read())
- if response_code == 200 and len(response['vXUsers']) > 0:
+ if response_code == 200 and len(response['vXUsers']) >= 0:
ambari_admin_username = ambari_admin_username
flag_ambari_admin_present = False
for vxuser in response['vXUsers']:
http://git-wip-us.apache.org/repos/asf/ambari/blob/9e2b60ba/ambari-common/src/main/python/resource_management/libraries/providers/modify_properties_file.py
----------------------------------------------------------------------
diff --git a/ambari-common/src/main/python/resource_management/libraries/providers/modify_properties_file.py b/ambari-common/src/main/python/resource_management/libraries/providers/modify_properties_file.py
index a44ecd1..a07881b 100644
--- a/ambari-common/src/main/python/resource_management/libraries/providers/modify_properties_file.py
+++ b/ambari-common/src/main/python/resource_management/libraries/providers/modify_properties_file.py
@@ -24,6 +24,7 @@ from resource_management.core.resources import File
from resource_management.core.providers import Provider
from resource_management.libraries.functions.format import format
from resource_management.core.environment import Environment
+from resource_management.core.source import InlineTemplate
from resource_management.core.logger import Logger
from resource_management import sudo
@@ -51,13 +52,15 @@ class ModifyPropertiesFileProvider(Provider):
in_var_value = line.split(delimiter)[1].strip()
if in_var_name in properties:
- new_content_lines[line_num] = u"{0}{1}{2}".format(unicode(in_var_name), delimiter, unicode(properties[in_var_name]))
+ value = InlineTemplate(unicode(properties[in_var_name])).get_content().strip()
+ new_content_lines[line_num] = u"{0}{1}{2}".format(unicode(in_var_name), delimiter, value)
unsaved_values.remove(in_var_name)
else:
Logger.info(format("Creating new properties file as {filename} doesn't exist"))
for property_name in unsaved_values:
- line = u"{0}{1}{2}".format(unicode(property_name), delimiter, unicode(properties[property_name]))
+ value = InlineTemplate(unicode(properties[property_name])).get_content().strip()
+ line = u"{0}{1}{2}".format(unicode(property_name), delimiter, value)
new_content_lines.append(line)
with Environment.get_instance_copy() as env:
http://git-wip-us.apache.org/repos/asf/ambari/blob/9e2b60ba/ambari-common/src/main/python/resource_management/libraries/providers/properties_file.py
----------------------------------------------------------------------
diff --git a/ambari-common/src/main/python/resource_management/libraries/providers/properties_file.py b/ambari-common/src/main/python/resource_management/libraries/providers/properties_file.py
index c1ea2c4..1bc23d6 100644
--- a/ambari-common/src/main/python/resource_management/libraries/providers/properties_file.py
+++ b/ambari-common/src/main/python/resource_management/libraries/providers/properties_file.py
@@ -22,6 +22,7 @@ Ambari Agent
import time
import os
+import resource_management
from resource_management.core.resources import File
from resource_management.core.providers import Provider
from resource_management.core.source import InlineTemplate
@@ -41,8 +42,8 @@ class PropertiesFileProvider(Provider):
config_content = InlineTemplate('''# Generated by Apache Ambari. {{time.asctime(time.localtime())}}
{% for key, value in properties_dict|dictsort %}
-{{key}}{{key_value_delimiter}}{{value}}{% endfor %}
- ''', extra_imports=[time], properties_dict=self.resource.properties, key_value_delimiter=self.resource.key_value_delimiter)
+{{key}}{{key_value_delimiter}}{{ resource_management.core.source.InlineTemplate(value).get_content().strip() }}{% endfor %}
+ ''', extra_imports=[time, resource_management, resource_management.core, resource_management.core.source], properties_dict=self.resource.properties, key_value_delimiter=self.resource.key_value_delimiter)
Logger.info(format("Generating properties file: {filepath}"))
http://git-wip-us.apache.org/repos/asf/ambari/blob/9e2b60ba/ambari-server/src/main/resources/common-services/RANGER/0.4.0/configuration/usersync-properties.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/RANGER/0.4.0/configuration/usersync-properties.xml b/ambari-server/src/main/resources/common-services/RANGER/0.4.0/configuration/usersync-properties.xml
index 794c3d6..79b9bb7 100644
--- a/ambari-server/src/main/resources/common-services/RANGER/0.4.0/configuration/usersync-properties.xml
+++ b/ambari-server/src/main/resources/common-services/RANGER/0.4.0/configuration/usersync-properties.xml
@@ -31,6 +31,11 @@
<description></description>
</property>
<property>
+ <name>policymanager.baseURL</name>
+ <value>{{usersync_exturl}}</value>
+ <description>Policy Manager external url</description>
+ </property>
+ <property>
<name>SYNC_INTERVAL</name>
<value>1</value>
<description></description>
http://git-wip-us.apache.org/repos/asf/ambari/blob/9e2b60ba/ambari-server/src/main/resources/common-services/RANGER/0.4.0/package/scripts/params.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/RANGER/0.4.0/package/scripts/params.py b/ambari-server/src/main/resources/common-services/RANGER/0.4.0/package/scripts/params.py
index 9367496..78d6eeb 100644
--- a/ambari-server/src/main/resources/common-services/RANGER/0.4.0/package/scripts/params.py
+++ b/ambari-server/src/main/resources/common-services/RANGER/0.4.0/package/scripts/params.py
@@ -53,6 +53,8 @@ ambari_server_hostname = config['clusterHostInfo']['ambari_server_host'][0]
db_flavor = config['configurations']['admin-properties']['DB_FLAVOR']
+usersync_exturl = config['configurations']['admin-properties']['policymgr_external_url']
+
sql_command_invoker = config['configurations']['admin-properties']['SQL_COMMAND_INVOKER']
db_root_user = config['configurations']['admin-properties']['db_root_user']
db_root_password = unicode(config['configurations']['admin-properties']['db_root_password'])