http://git-wip-us.apache.org/repos/asf/ambari/blob/1d31dcfc/ambari-server/src/main/resources/common-services/RANGER/0.4.0/configuration/ranger-env.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/common-services/RANGER/0.4.0/configuration/ranger-env.xml b/ambari-server/src/main/resources/common-services/RANGER/0.4.0/configuration/ranger-env.xml index 3e1c358..5082277 100644 --- a/ambari-server/src/main/resources/common-services/RANGER/0.4.0/configuration/ranger-env.xml +++ b/ambari-server/src/main/resources/common-services/RANGER/0.4.0/configuration/ranger-env.xml @@ -29,7 +29,7 @@ <type>user</type> <overridable>false</overridable> </value-attributes> - <on-ambari-upgrade add="true" update="false" delete="false"/> + <on-ambari-upgrade add="true"/> </property> <property> <name>ranger_group</name> @@ -41,7 +41,7 @@ <type>user</type> <overridable>false</overridable> </value-attributes> - <on-ambari-upgrade add="true" update="false" delete="false"/> + <on-ambari-upgrade add="true"/> </property> <property> <name>ranger_admin_log_dir</name> @@ -52,7 +52,7 @@ <overridable>false</overridable> <editable-only-at-install>true</editable-only-at-install> </value-attributes> - <on-ambari-upgrade add="true" update="false" delete="false"/> + <on-ambari-upgrade add="true"/> </property> <property> <name>ranger_usersync_log_dir</name> @@ -63,7 +63,7 @@ <overridable>false</overridable> <editable-only-at-install>true</editable-only-at-install> </value-attributes> - <on-ambari-upgrade add="true" update="false" delete="false"/> + <on-ambari-upgrade add="true"/> </property> <property> <name>ranger_admin_username</name> @@ -71,7 +71,7 @@ <property-type>TEXT</property-type> <display-name>Ranger Admin username for Ambari</display-name> <description>This is the ambari user created for creating repositories and policies in Ranger Admin for each plugin</description> - <on-ambari-upgrade add="true" update="false" delete="false"/> + <on-ambari-upgrade add="true"/> </property> <property> <name>ranger_admin_password</name> @@ -83,13 +83,13 @@ <type>password</type> <overridable>false</overridable> </value-attributes> - <on-ambari-upgrade add="true" update="false" delete="false"/> + <on-ambari-upgrade add="true"/> </property> <property> <name>admin_username</name> <value>admin</value> <description>This is the username for default admin user that is used for creating ambari user in Ranger Admin</description> - <on-ambari-upgrade add="true" update="false" delete="false"/> + <on-ambari-upgrade add="true"/> </property> <property> <name>admin_password</name> @@ -99,26 +99,26 @@ <value-attributes> <type>password</type> </value-attributes> - <on-ambari-upgrade add="true" update="false" delete="false"/> + <on-ambari-upgrade add="true"/> </property> <property> <name>oracle_home</name> <value>-</value> <property-type>TEXT</property-type> <description>Oracle Home needs to be set to path where oracle is installed, this will help install Ranger Admin when used with Oracle as database.</description> - <on-ambari-upgrade add="true" update="false" delete="false"/> + <on-ambari-upgrade add="true"/> </property> <property> <name>xml_configurations_supported</name> <value>false</value> <description/> - <on-ambari-upgrade add="true" update="false" delete="false"/> + <on-ambari-upgrade add="true"/> </property> <property> <name>ranger_pid_dir</name> <value>/var/run/ranger</value> <description/> - <on-ambari-upgrade add="true" update="false" delete="false"/> + <on-ambari-upgrade add="true"/> </property> <property> <name>ranger-hdfs-plugin-enabled</name> @@ -140,7 +140,7 @@ </entries> <selection-cardinality>1</selection-cardinality> </value-attributes> - <on-ambari-upgrade add="true" update="false" delete="false"/> + <on-ambari-upgrade add="true"/> </property> <property> <name>ranger-hive-plugin-enabled</name> @@ -162,7 +162,7 @@ </entries> <selection-cardinality>1</selection-cardinality> </value-attributes> - <on-ambari-upgrade add="true" update="false" delete="false"/> + <on-ambari-upgrade add="true"/> </property> <property> <name>ranger-hbase-plugin-enabled</name> @@ -184,7 +184,7 @@ </entries> <selection-cardinality>1</selection-cardinality> </value-attributes> - <on-ambari-upgrade add="true" update="false" delete="false"/> + <on-ambari-upgrade add="true"/> </property> <property> <name>ranger-storm-plugin-enabled</name> @@ -206,7 +206,7 @@ </entries> <selection-cardinality>1</selection-cardinality> </value-attributes> - <on-ambari-upgrade add="true" update="false" delete="false"/> + <on-ambari-upgrade add="true"/> </property> <property> <name>ranger-knox-plugin-enabled</name> @@ -228,7 +228,7 @@ </entries> <selection-cardinality>1</selection-cardinality> </value-attributes> - <on-ambari-upgrade add="true" update="false" delete="false"/> + <on-ambari-upgrade add="true"/> </property> <property> <name>bind_anonymous</name> @@ -250,7 +250,7 @@ <selection-cardinality>1</selection-cardinality> <empty-value-valid>true</empty-value-valid> </value-attributes> - <on-ambari-upgrade add="true" update="false" delete="false"/> + <on-ambari-upgrade add="true"/> </property> <property> <name>xasecure.audit.destination.hdfs</name> @@ -272,7 +272,7 @@ </entries> <selection-cardinality>1</selection-cardinality> </value-attributes> - <on-ambari-upgrade add="true" update="false" delete="false"/> + <on-ambari-upgrade add="true"/> </property> <property> <name>xasecure.audit.destination.hdfs.dir</name> @@ -286,7 +286,7 @@ <name>fs.defaultFS</name> </property> </depends-on> - <on-ambari-upgrade add="true" update="false" delete="false"/> + <on-ambari-upgrade add="true"/> </property> <property> <name>xasecure.audit.destination.db</name> @@ -308,6 +308,6 @@ </entries> <selection-cardinality>1</selection-cardinality> </value-attributes> - <on-ambari-upgrade add="true" update="false" delete="false"/> + <on-ambari-upgrade add="true"/> </property> </configuration>
http://git-wip-us.apache.org/repos/asf/ambari/blob/1d31dcfc/ambari-server/src/main/resources/common-services/RANGER/0.4.0/configuration/ranger-site.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/common-services/RANGER/0.4.0/configuration/ranger-site.xml b/ambari-server/src/main/resources/common-services/RANGER/0.4.0/configuration/ranger-site.xml index 2d8a95d..b42bdd0 100644 --- a/ambari-server/src/main/resources/common-services/RANGER/0.4.0/configuration/ranger-site.xml +++ b/ambari-server/src/main/resources/common-services/RANGER/0.4.0/configuration/ranger-site.xml @@ -24,19 +24,19 @@ <name>http.service.port</name> <value>6080</value> <description>The http port to be used</description> - <on-ambari-upgrade add="true" update="false" delete="false"/> + <on-ambari-upgrade add="true"/> </property> <property> <name>https.service.port</name> <value>6182</value> <description>The secured https port to be used</description> - <on-ambari-upgrade add="true" update="false" delete="false"/> + <on-ambari-upgrade add="true"/> </property> <property> <name>https.attrib.keystoreFile</name> <value>/etc/ranger/admin/keys/server.jks</value> <description>The keystore file location</description> - <on-ambari-upgrade add="true" update="false" delete="false"/> + <on-ambari-upgrade add="true"/> </property> <property> <name>https.attrib.keystorePass</name> @@ -46,24 +46,24 @@ <value-attributes> <type>password</type> </value-attributes> - <on-ambari-upgrade add="true" update="false" delete="false"/> + <on-ambari-upgrade add="true"/> </property> <property> <name>https.attrib.keyAlias</name> <value>myKey</value> <description>The key alias to be used </description> - <on-ambari-upgrade add="true" update="false" delete="false"/> + <on-ambari-upgrade add="true"/> </property> <property> <name>https.attrib.clientAuth</name> <value>want</value> <description>The client auth to be used </description> - <on-ambari-upgrade add="true" update="false" delete="false"/> + <on-ambari-upgrade add="true"/> </property> <property> <name>http.enabled</name> <value>true</value> <description>http enabled or https enabled </description> - <on-ambari-upgrade add="true" update="false" delete="false"/> + <on-ambari-upgrade add="true"/> </property> </configuration> http://git-wip-us.apache.org/repos/asf/ambari/blob/1d31dcfc/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 9550292..6987585 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 @@ -40,40 +40,40 @@ </entries> <selection-cardinality>1</selection-cardinality> </value-attributes> - <on-ambari-upgrade add="true" update="false" delete="false"/> + <on-ambari-upgrade add="true"/> </property> <property> <name>MIN_UNIX_USER_ID_TO_SYNC</name> <display-name>Minimum User ID</display-name> <value>1000</value> <description/> - <on-ambari-upgrade add="true" update="false" delete="false"/> + <on-ambari-upgrade add="true"/> </property> <property> <name>POLICY_MGR_URL</name> <value>{{usersync_exturl}}</value> <description>Policy Manager external url</description> - <on-ambari-upgrade add="true" update="false" delete="false"/> + <on-ambari-upgrade add="true"/> </property> <property> <name>SYNC_INTERVAL</name> <value>1</value> <description/> - <on-ambari-upgrade add="true" update="false" delete="false"/> + <on-ambari-upgrade add="true"/> </property> <property> <name>SYNC_LDAP_URL</name> <display-name>LDAP (AD) URL</display-name> <value/> <description>LDAP server URL. Example value = ldap://localhost:389</description> - <on-ambari-upgrade add="true" update="false" delete="false"/> + <on-ambari-upgrade add="true"/> </property> <property> <name>SYNC_LDAP_BIND_DN</name> <display-name>âBind User</display-name> <value/> <description>Full distinguished name (DN), including common name (CN), of an LDAP user account that has privileges to search for users. Example: cn=admin,ou=users,dc=hadoop,dc=apache,dc-org</description> - <on-ambari-upgrade add="true" update="false" delete="false"/> + <on-ambari-upgrade add="true"/> </property> <property> <name>SYNC_LDAP_BIND_PASSWORD</name> @@ -84,34 +84,34 @@ <value-attributes> <type>password</type> </value-attributes> - <on-ambari-upgrade add="true" update="false" delete="false"/> + <on-ambari-upgrade add="true"/> </property> <property> <name>CRED_KEYSTORE_FILENAME</name> <value>/usr/lib/xausersync/.jceks/xausersync.jceks</value> <description/> - <on-ambari-upgrade add="true" update="false" delete="false"/> + <on-ambari-upgrade add="true"/> </property> <property> <name>SYNC_LDAP_USER_SEARCH_BASE</name> <display-name>User Search Base</display-name> <value/> <description>sample value would be ou=users,dc=hadoop,dc=apache,dc=org</description> - <on-ambari-upgrade add="true" update="false" delete="false"/> + <on-ambari-upgrade add="true"/> </property> <property> <name>SYNC_LDAP_USER_SEARCH_SCOPE</name> <display-name>User Search Scope</display-name> <value>sub</value> <description>default value: sub</description> - <on-ambari-upgrade add="true" update="false" delete="false"/> + <on-ambari-upgrade add="true"/> </property> <property> <name>SYNC_LDAP_USER_OBJECT_CLASS</name> <display-name>User Object Classâ</display-name> <value>person</value> <description>default value: person</description> - <on-ambari-upgrade add="true" update="false" delete="false"/> + <on-ambari-upgrade add="true"/> </property> <property> <name>SYNC_LDAP_USER_SEARCH_FILTER</name> @@ -121,38 +121,38 @@ <value-attributes> <empty-value-valid>true</empty-value-valid> </value-attributes> - <on-ambari-upgrade add="true" update="false" delete="false"/> + <on-ambari-upgrade add="true"/> </property> <property> <name>SYNC_LDAP_USER_NAME_ATTRIBUTE</name> <display-name>Username Attribute</display-name> <value>cn</value> <description>default value: cn</description> - <on-ambari-upgrade add="true" update="false" delete="false"/> + <on-ambari-upgrade add="true"/> </property> <property> <name>SYNC_LDAP_USER_GROUP_NAME_ATTRIBUTE</name> <display-name>User Group Name Attribute</display-name> <value>memberof,ismemberof</value> <description/> - <on-ambari-upgrade add="true" update="false" delete="false"/> + <on-ambari-upgrade add="true"/> </property> <property> <name>SYNC_LDAP_USERNAME_CASE_CONVERSION</name> <value>none</value> <description>possible values: none, lower, upper</description> - <on-ambari-upgrade add="true" update="false" delete="false"/> + <on-ambari-upgrade add="true"/> </property> <property> <name>SYNC_LDAP_GROUPNAME_CASE_CONVERSION</name> <value>none</value> <description>possible values: none, lower, upper</description> - <on-ambari-upgrade add="true" update="false" delete="false"/> + <on-ambari-upgrade add="true"/> </property> <property> <name>logdir</name> <value>logs</value> <description>user sync log path</description> - <on-ambari-upgrade add="true" update="false" delete="false"/> + <on-ambari-upgrade add="true"/> </property> </configuration> http://git-wip-us.apache.org/repos/asf/ambari/blob/1d31dcfc/ambari-server/src/main/resources/common-services/RANGER/0.5.0/configuration/admin-properties.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/common-services/RANGER/0.5.0/configuration/admin-properties.xml b/ambari-server/src/main/resources/common-services/RANGER/0.5.0/configuration/admin-properties.xml index 2539d1b..121a797 100644 --- a/ambari-server/src/main/resources/common-services/RANGER/0.5.0/configuration/admin-properties.xml +++ b/ambari-server/src/main/resources/common-services/RANGER/0.5.0/configuration/admin-properties.xml @@ -52,7 +52,7 @@ </entries> <selection-cardinality>1</selection-cardinality> </value-attributes> - <on-ambari-upgrade add="true" update="false" delete="false"/> + <on-ambari-upgrade add="true"/> </property> <property> <name>policymgr_external_url</name> @@ -76,71 +76,71 @@ <name>ranger.service.https.port</name> </property> </depends-on> - <on-ambari-upgrade add="true" update="false" delete="false"/> + <on-ambari-upgrade add="true"/> </property> <property> <name>policymgr_http_enabled</name> <deleted>true</deleted> - <on-ambari-upgrade add="true" update="false" delete="false"/> + <on-ambari-upgrade add="true"/> </property> <property> <name>authentication_method</name> <deleted>true</deleted> - <on-ambari-upgrade add="true" update="false" delete="false"/> + <on-ambari-upgrade add="true"/> </property> <property> <name>remoteLoginEnabled</name> <deleted>true</deleted> - <on-ambari-upgrade add="true" update="false" delete="false"/> + <on-ambari-upgrade add="true"/> </property> <property> <name>authServiceHostName</name> <deleted>true</deleted> - <on-ambari-upgrade add="true" update="false" delete="false"/> + <on-ambari-upgrade add="true"/> </property> <property> <name>authServicePort</name> <deleted>true</deleted> - <on-ambari-upgrade add="true" update="false" delete="false"/> + <on-ambari-upgrade add="true"/> </property> <property> <name>xa_ldap_url</name> <deleted>true</deleted> - <on-ambari-upgrade add="true" update="false" delete="false"/> + <on-ambari-upgrade add="true"/> </property> <property> <name>xa_ldap_userDNpattern</name> <deleted>true</deleted> - <on-ambari-upgrade add="true" update="false" delete="false"/> + <on-ambari-upgrade add="true"/> </property> <property> <name>xa_ldap_groupSearchBase</name> <deleted>true</deleted> - <on-ambari-upgrade add="true" update="false" delete="false"/> + <on-ambari-upgrade add="true"/> </property> <property> <name>xa_ldap_groupSearchFilter</name> <deleted>true</deleted> - <on-ambari-upgrade add="true" update="false" delete="false"/> + <on-ambari-upgrade add="true"/> </property> <property> <name>xa_ldap_groupRoleAttribute</name> <deleted>true</deleted> - <on-ambari-upgrade add="true" update="false" delete="false"/> + <on-ambari-upgrade add="true"/> </property> <property> <name>xa_ldap_ad_domain</name> <deleted>true</deleted> - <on-ambari-upgrade add="true" update="false" delete="false"/> + <on-ambari-upgrade add="true"/> </property> <property> <name>xa_ldap_ad_url</name> <deleted>true</deleted> - <on-ambari-upgrade add="true" update="false" delete="false"/> + <on-ambari-upgrade add="true"/> </property> <property> <name>SQL_COMMAND_INVOKER</name> <deleted>true</deleted> - <on-ambari-upgrade add="true" update="false" delete="false"/> + <on-ambari-upgrade add="true"/> </property> </configuration> http://git-wip-us.apache.org/repos/asf/ambari/blob/1d31dcfc/ambari-server/src/main/resources/common-services/RANGER/0.5.0/configuration/ranger-admin-site.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/common-services/RANGER/0.5.0/configuration/ranger-admin-site.xml b/ambari-server/src/main/resources/common-services/RANGER/0.5.0/configuration/ranger-admin-site.xml index b038dc0..5606ce6 100644 --- a/ambari-server/src/main/resources/common-services/RANGER/0.5.0/configuration/ranger-admin-site.xml +++ b/ambari-server/src/main/resources/common-services/RANGER/0.5.0/configuration/ranger-admin-site.xml @@ -20,7 +20,7 @@ <name>ranger.service.host</name> <value>{{ranger_host}}</value> <description>Host where ranger service to be installed</description> - <on-ambari-upgrade add="true" update="false" delete="false"/> + <on-ambari-upgrade add="true"/> </property> <property> <name>ranger.service.http.enabled</name> @@ -31,37 +31,37 @@ <overridable>false</overridable> <type>boolean</type> </value-attributes> - <on-ambari-upgrade add="true" update="false" delete="false"/> + <on-ambari-upgrade add="true"/> </property> <property> <name>ranger.service.http.port</name> <value>6080</value> <description>HTTP port</description> - <on-ambari-upgrade add="true" update="false" delete="false"/> + <on-ambari-upgrade add="true"/> </property> <property> <name>ranger.service.https.port</name> <value>6182</value> <description>HTTPS port (if SSL is enabled)</description> - <on-ambari-upgrade add="true" update="false" delete="false"/> + <on-ambari-upgrade add="true"/> </property> <property> <name>ranger.service.https.attrib.ssl.enabled</name> <value>false</value> <description>true/false, set to true if using SSL</description> - <on-ambari-upgrade add="true" update="false" delete="false"/> + <on-ambari-upgrade add="true"/> </property> <property> <name>ranger.service.https.attrib.clientAuth</name> <value>want</value> <description>Needs to be set to want for two way SSL</description> - <on-ambari-upgrade add="true" update="false" delete="false"/> + <on-ambari-upgrade add="true"/> </property> <property> <name>ranger.service.https.attrib.keystore.keyalias</name> <value>rangeradmin</value> <description>Alias for Ranger Admin key in keystore</description> - <on-ambari-upgrade add="true" update="false" delete="false"/> + <on-ambari-upgrade add="true"/> </property> <property> <name>ranger.service.https.attrib.keystore.pass</name> @@ -71,13 +71,13 @@ <value-attributes> <type>password</type> </value-attributes> - <on-ambari-upgrade add="true" update="false" delete="false"/> + <on-ambari-upgrade add="true"/> </property> <property> <name>ranger.https.attrib.keystore.file</name> <value>/etc/ranger/admin/conf/ranger-admin-keystore.jks</value> <description>Ranger admin keystore (specify full path)</description> - <on-ambari-upgrade add="true" update="false" delete="false"/> + <on-ambari-upgrade add="true"/> </property> <property> <name>ranger.externalurl</name> @@ -88,7 +88,7 @@ <visible>false</visible> <overridable>false</overridable> </value-attributes> - <on-ambari-upgrade add="true" update="false" delete="false"/> + <on-ambari-upgrade add="true"/> </property> <property> <name>ranger.jpa.jdbc.driver</name> @@ -104,7 +104,7 @@ <name>DB_FLAVOR</name> </property> </depends-on> - <on-ambari-upgrade add="true" update="false" delete="false"/> + <on-ambari-upgrade add="true"/> </property> <property> <name>ranger.jpa.jdbc.url</name> @@ -128,13 +128,13 @@ <name>db_name</name> </property> </depends-on> - <on-ambari-upgrade add="true" update="false" delete="false"/> + <on-ambari-upgrade add="true"/> </property> <property> <name>ranger.jpa.jdbc.user</name> <value>{{ranger_db_user}}</value> <description>JDBC user</description> - <on-ambari-upgrade add="true" update="false" delete="false"/> + <on-ambari-upgrade add="true"/> </property> <property> <name>ranger.jpa.jdbc.password</name> @@ -144,19 +144,19 @@ <value-attributes> <type>password</type> </value-attributes> - <on-ambari-upgrade add="true" update="false" delete="false"/> + <on-ambari-upgrade add="true"/> </property> <property> <name>ranger.jpa.jdbc.credential.alias</name> <value>rangeradmin</value> <description>Alias name for storing JDBC password</description> - <on-ambari-upgrade add="true" update="false" delete="false"/> + <on-ambari-upgrade add="true"/> </property> <property> <name>ranger.credential.provider.path</name> <value>/etc/ranger/admin/rangeradmin.jceks</value> <description>File for credential store, provide full file path</description> - <on-ambari-upgrade add="true" update="false" delete="false"/> + <on-ambari-upgrade add="true"/> </property> <property> <name>ranger.audit.source.type</name> @@ -172,13 +172,13 @@ <name>xasecure.audit.destination.db</name> </property> </depends-on> - <on-ambari-upgrade add="true" update="false" delete="false"/> + <on-ambari-upgrade add="true"/> </property> <property> <name>ranger.audit.solr.urls</name> <value/> <description>Solr url for audit. Example: http://solr_host:6083/solr/ranger_audits</description> - <on-ambari-upgrade add="true" update="false" delete="false"/> + <on-ambari-upgrade add="true"/> </property> <property> <name>ranger.authentication.method</name> @@ -194,7 +194,7 @@ <name>ranger.usersync.source.impl.class</name> </property> </depends-on> - <on-ambari-upgrade add="true" update="false" delete="false"/> + <on-ambari-upgrade add="true"/> </property> <property> <name>ranger.ldap.url</name> @@ -204,7 +204,7 @@ <value-attributes> <overridable>false</overridable> </value-attributes> - <on-ambari-upgrade add="true" update="false" delete="false"/> + <on-ambari-upgrade add="true"/> </property> <property> <name>ranger.ldap.user.dnpattern</name> @@ -213,21 +213,21 @@ <value-attributes> <overridable>false</overridable> </value-attributes> - <on-ambari-upgrade add="true" update="false" delete="false"/> + <on-ambari-upgrade add="true"/> </property> <property> <name>ranger.ldap.group.searchbase</name> <display-name>Group Search Base</display-name> <value>{{ranger_ug_ldap_group_searchbase}}</value> <description>LDAP group searchbase, only used if Authentication method is LDAP</description> - <on-ambari-upgrade add="true" update="false" delete="false"/> + <on-ambari-upgrade add="true"/> </property> <property> <name>ranger.ldap.group.searchfilter</name> <display-name>Group Search Filter</display-name> <value>{{ranger_ug_ldap_group_searchfilter}}</value> <description>LDAP group search filter, only used if Authentication method is LDAP</description> - <on-ambari-upgrade add="true" update="false" delete="false"/> + <on-ambari-upgrade add="true"/> </property> <property> <name>ranger.ldap.user.searchfilter</name> @@ -237,7 +237,7 @@ <value-attributes> <overridable>false</overridable> </value-attributes> - <on-ambari-upgrade add="true" update="false" delete="false"/> + <on-ambari-upgrade add="true"/> </property> <property> <name>ranger.ldap.group.roleattribute</name> @@ -246,7 +246,7 @@ <value-attributes> <overridable>false</overridable> </value-attributes> - <on-ambari-upgrade add="true" update="false" delete="false"/> + <on-ambari-upgrade add="true"/> </property> <property> <name>ranger.ldap.base.dn</name> @@ -255,7 +255,7 @@ <value-attributes> <overridable>false</overridable> </value-attributes> - <on-ambari-upgrade add="true" update="false" delete="false"/> + <on-ambari-upgrade add="true"/> </property> <property> <name>ranger.ldap.bind.dn</name> @@ -265,7 +265,7 @@ <value-attributes> <overridable>false</overridable> </value-attributes> - <on-ambari-upgrade add="true" update="false" delete="false"/> + <on-ambari-upgrade add="true"/> </property> <property> <name>ranger.ldap.bind.password</name> @@ -277,7 +277,7 @@ <type>password</type> <overridable>false</overridable> </value-attributes> - <on-ambari-upgrade add="true" update="false" delete="false"/> + <on-ambari-upgrade add="true"/> </property> <property> <name>ranger.ldap.referral</name> @@ -286,7 +286,7 @@ <value-attributes> <overridable>false</overridable> </value-attributes> - <on-ambari-upgrade add="true" update="false" delete="false"/> + <on-ambari-upgrade add="true"/> </property> <property> <name>ranger.ldap.ad.domain</name> @@ -296,7 +296,7 @@ <value-attributes> <overridable>false</overridable> </value-attributes> - <on-ambari-upgrade add="true" update="false" delete="false"/> + <on-ambari-upgrade add="true"/> </property> <property> <name>ranger.ldap.ad.url</name> @@ -305,7 +305,7 @@ <value-attributes> <overridable>false</overridable> </value-attributes> - <on-ambari-upgrade add="true" update="false" delete="false"/> + <on-ambari-upgrade add="true"/> </property> <property> <name>ranger.ldap.ad.base.dn</name> @@ -314,7 +314,7 @@ <value-attributes> <overridable>false</overridable> </value-attributes> - <on-ambari-upgrade add="true" update="false" delete="false"/> + <on-ambari-upgrade add="true"/> </property> <property> <name>ranger.ldap.ad.bind.dn</name> @@ -323,7 +323,7 @@ <value-attributes> <overridable>false</overridable> </value-attributes> - <on-ambari-upgrade add="true" update="false" delete="false"/> + <on-ambari-upgrade add="true"/> </property> <property> <name>ranger.ldap.ad.bind.password</name> @@ -334,7 +334,7 @@ <type>password</type> <overridable>false</overridable> </value-attributes> - <on-ambari-upgrade add="true" update="false" delete="false"/> + <on-ambari-upgrade add="true"/> </property> <property> <name>ranger.ldap.ad.user.searchfilter</name> @@ -343,7 +343,7 @@ <value-attributes> <overridable>false</overridable> </value-attributes> - <on-ambari-upgrade add="true" update="false" delete="false"/> + <on-ambari-upgrade add="true"/> </property> <property> <name>ranger.ldap.ad.referral</name> @@ -352,25 +352,25 @@ <value-attributes> <overridable>false</overridable> </value-attributes> - <on-ambari-upgrade add="true" update="false" delete="false"/> + <on-ambari-upgrade add="true"/> </property> <property> <name>ranger.jpa.audit.jdbc.driver</name> <value>{{ranger_jdbc_driver}}</value> <description>JDBC driver class name - for audit DB</description> - <on-ambari-upgrade add="true" update="false" delete="false"/> + <on-ambari-upgrade add="true"/> </property> <property> <name>ranger.jpa.audit.jdbc.url</name> <value>{{audit_jdbc_url}}</value> <description>JDBC connect string - auto populated based on other values</description> - <on-ambari-upgrade add="true" update="false" delete="false"/> + <on-ambari-upgrade add="true"/> </property> <property> <name>ranger.jpa.audit.jdbc.user</name> <value>{{ranger_audit_db_user}}</value> <description>JDBC user - audit</description> - <on-ambari-upgrade add="true" update="false" delete="false"/> + <on-ambari-upgrade add="true"/> </property> <property> <name>ranger.jpa.audit.jdbc.password</name> @@ -380,13 +380,13 @@ <value-attributes> <type>password</type> </value-attributes> - <on-ambari-upgrade add="true" update="false" delete="false"/> + <on-ambari-upgrade add="true"/> </property> <property> <name>ranger.jpa.audit.jdbc.credential.alias</name> <value>rangeraudit</value> <description>Alias name for storing JDBC password - for audit user</description> - <on-ambari-upgrade add="true" update="false" delete="false"/> + <on-ambari-upgrade add="true"/> </property> <property> <name>ranger.unixauth.remote.login.enabled</name> @@ -409,7 +409,7 @@ </entries> <selection-cardinality>1</selection-cardinality> </value-attributes> - <on-ambari-upgrade add="true" update="false" delete="false"/> + <on-ambari-upgrade add="true"/> </property> <property> <name>ranger.unixauth.service.hostname</name> @@ -418,7 +418,7 @@ <value-attributes> <overridable>false</overridable> </value-attributes> - <on-ambari-upgrade add="true" update="false" delete="false"/> + <on-ambari-upgrade add="true"/> </property> <property> <name>ranger.unixauth.service.port</name> @@ -428,19 +428,19 @@ <type>int</type> <overridable>false</overridable> </value-attributes> - <on-ambari-upgrade add="true" update="false" delete="false"/> + <on-ambari-upgrade add="true"/> </property> <property> <name>ranger.jpa.jdbc.dialect</name> <value>{{jdbc_dialect}}</value> <description>JDBC dialect used for policy DB</description> - <on-ambari-upgrade add="true" update="false" delete="false"/> + <on-ambari-upgrade add="true"/> </property> <property> <name>ranger.jpa.audit.jdbc.dialect</name> <value>{{jdbc_dialect}}</value> <description>JDBC dialect used for audit DB</description> - <on-ambari-upgrade add="true" update="false" delete="false"/> + <on-ambari-upgrade add="true"/> </property> <property> <name>ranger.audit.solr.zookeepers</name> @@ -456,13 +456,13 @@ <name>is_solrCloud_enabled</name> </property> </depends-on> - <on-ambari-upgrade add="true" update="false" delete="false"/> + <on-ambari-upgrade add="true"/> </property> <property> <name>ranger.audit.solr.username</name> <value>ranger_solr</value> <description>Solr username</description> - <on-ambari-upgrade add="true" update="false" delete="false"/> + <on-ambari-upgrade add="true"/> </property> <property> <name>ranger.audit.solr.password</name> @@ -472,7 +472,7 @@ <value-attributes> <type>password</type> </value-attributes> - <on-ambari-upgrade add="true" update="false" delete="false"/> + <on-ambari-upgrade add="true"/> </property> <property> <name>ranger.sso.providerurl</name> @@ -482,7 +482,7 @@ <value-attributes> <empty-value-valid>true</empty-value-valid> </value-attributes> - <on-ambari-upgrade add="true" update="false" delete="false"/> + <on-ambari-upgrade add="true"/> </property> <property> <name>ranger.sso.publicKey</name> @@ -493,7 +493,7 @@ <type>multiLine</type> <empty-value-valid>true</empty-value-valid> </value-attributes> - <on-ambari-upgrade add="true" update="false" delete="false"/> + <on-ambari-upgrade add="true"/> </property> <property> <name>ranger.sso.cookiename</name> @@ -503,7 +503,7 @@ <value-attributes> <empty-value-valid>true</empty-value-valid> </value-attributes> - <on-ambari-upgrade add="true" update="false" delete="false"/> + <on-ambari-upgrade add="true"/> </property> <property> <name>ranger.sso.enabled</name> @@ -514,7 +514,7 @@ <overridable>false</overridable> <type>boolean</type> </value-attributes> - <on-ambari-upgrade add="true" update="false" delete="false"/> + <on-ambari-upgrade add="true"/> </property> <property> <name>ranger.sso.query.param.originalurl</name> @@ -524,7 +524,7 @@ <value-attributes> <empty-value-valid>true</empty-value-valid> </value-attributes> - <on-ambari-upgrade add="true" update="false" delete="false"/> + <on-ambari-upgrade add="true"/> </property> <property> <name>ranger.sso.browser.useragent</name> @@ -534,6 +534,6 @@ <value-attributes> <empty-value-valid>true</empty-value-valid> </value-attributes> - <on-ambari-upgrade add="true" update="false" delete="false"/> + <on-ambari-upgrade add="true"/> </property> </configuration> http://git-wip-us.apache.org/repos/asf/ambari/blob/1d31dcfc/ambari-server/src/main/resources/common-services/RANGER/0.5.0/configuration/ranger-env.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/common-services/RANGER/0.5.0/configuration/ranger-env.xml b/ambari-server/src/main/resources/common-services/RANGER/0.5.0/configuration/ranger-env.xml index 68ca38a..ae56f8b 100644 --- a/ambari-server/src/main/resources/common-services/RANGER/0.5.0/configuration/ranger-env.xml +++ b/ambari-server/src/main/resources/common-services/RANGER/0.5.0/configuration/ranger-env.xml @@ -23,7 +23,7 @@ <name>xml_configurations_supported</name> <value>true</value> <description/> - <on-ambari-upgrade add="true" update="false" delete="false"/> + <on-ambari-upgrade add="true"/> </property> <property> <name>create_db_dbuser</name> @@ -45,12 +45,12 @@ </entries> <selection-cardinality>1</selection-cardinality> </value-attributes> - <on-ambari-upgrade add="true" update="false" delete="false"/> + <on-ambari-upgrade add="true"/> </property> <property> <name>oracle_home</name> <deleted>true</deleted> - <on-ambari-upgrade add="true" update="false" delete="false"/> + <on-ambari-upgrade add="true"/> </property> <property> <name>ranger_privelege_user_jdbc_url</name> @@ -71,7 +71,7 @@ <name>db_host</name> </property> </depends-on> - <on-ambari-upgrade add="true" update="false" delete="false"/> + <on-ambari-upgrade add="true"/> </property> <property> <name>ranger-yarn-plugin-enabled</name> @@ -93,7 +93,7 @@ </entries> <selection-cardinality>1</selection-cardinality> </value-attributes> - <on-ambari-upgrade add="true" update="false" delete="false"/> + <on-ambari-upgrade add="true"/> </property> <property> <name>ranger-kafka-plugin-enabled</name> @@ -115,7 +115,7 @@ </entries> <selection-cardinality>1</selection-cardinality> </value-attributes> - <on-ambari-upgrade add="true" update="false" delete="false"/> + <on-ambari-upgrade add="true"/> </property> <property> <name>xasecure.audit.destination.solr</name> @@ -137,7 +137,7 @@ </entries> <selection-cardinality>1</selection-cardinality> </value-attributes> - <on-ambari-upgrade add="true" update="false" delete="false"/> + <on-ambari-upgrade add="true"/> </property> <property> <name>is_solrCloud_enabled</name> @@ -160,7 +160,7 @@ <selection-cardinality>1</selection-cardinality> <empty-value-valid>true</empty-value-valid> </value-attributes> - <on-ambari-upgrade add="true" update="false" delete="false"/> + <on-ambari-upgrade add="true"/> </property> <property> <name>xasecure.audit.destination.hdfs</name> @@ -182,7 +182,7 @@ </entries> <selection-cardinality>1</selection-cardinality> </value-attributes> - <on-ambari-upgrade add="true" update="false" delete="false"/> + <on-ambari-upgrade add="true"/> </property> <property> <name>xasecure.audit.destination.hdfs.dir</name> @@ -196,7 +196,7 @@ <name>fs.defaultFS</name> </property> </depends-on> - <on-ambari-upgrade add="true" update="false" delete="false"/> + <on-ambari-upgrade add="true"/> </property> <property> <name>xasecure.audit.destination.db</name> @@ -218,6 +218,6 @@ </entries> <selection-cardinality>1</selection-cardinality> </value-attributes> - <on-ambari-upgrade add="true" update="false" delete="false"/> + <on-ambari-upgrade add="true"/> </property> </configuration> http://git-wip-us.apache.org/repos/asf/ambari/blob/1d31dcfc/ambari-server/src/main/resources/common-services/RANGER/0.5.0/configuration/ranger-site.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/common-services/RANGER/0.5.0/configuration/ranger-site.xml b/ambari-server/src/main/resources/common-services/RANGER/0.5.0/configuration/ranger-site.xml index dc816e7..4317cfa 100644 --- a/ambari-server/src/main/resources/common-services/RANGER/0.5.0/configuration/ranger-site.xml +++ b/ambari-server/src/main/resources/common-services/RANGER/0.5.0/configuration/ranger-site.xml @@ -23,36 +23,36 @@ <property> <name>http.service.port</name> <deleted>true</deleted> - <on-ambari-upgrade add="true" update="false" delete="false"/> + <on-ambari-upgrade add="true"/> </property> <property> <name>https.service.port</name> <deleted>true</deleted> - <on-ambari-upgrade add="true" update="false" delete="false"/> + <on-ambari-upgrade add="true"/> </property> <property> <name>https.attrib.keystoreFile</name> <deleted>true</deleted> - <on-ambari-upgrade add="true" update="false" delete="false"/> + <on-ambari-upgrade add="true"/> </property> <property> <name>https.attrib.keystorePass</name> <deleted>true</deleted> - <on-ambari-upgrade add="true" update="false" delete="false"/> + <on-ambari-upgrade add="true"/> </property> <property> <name>https.attrib.keyAlias</name> <deleted>true</deleted> - <on-ambari-upgrade add="true" update="false" delete="false"/> + <on-ambari-upgrade add="true"/> </property> <property> <name>https.attrib.clientAuth</name> <deleted>true</deleted> - <on-ambari-upgrade add="true" update="false" delete="false"/> + <on-ambari-upgrade add="true"/> </property> <property> <name>http.enabled</name> <deleted>true</deleted> - <on-ambari-upgrade add="true" update="false" delete="false"/> + <on-ambari-upgrade add="true"/> </property> </configuration> http://git-wip-us.apache.org/repos/asf/ambari/blob/1d31dcfc/ambari-server/src/main/resources/common-services/RANGER/0.5.0/configuration/ranger-ugsync-site.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/common-services/RANGER/0.5.0/configuration/ranger-ugsync-site.xml b/ambari-server/src/main/resources/common-services/RANGER/0.5.0/configuration/ranger-ugsync-site.xml index 7f3296e..e51ab7e 100644 --- a/ambari-server/src/main/resources/common-services/RANGER/0.5.0/configuration/ranger-ugsync-site.xml +++ b/ambari-server/src/main/resources/common-services/RANGER/0.5.0/configuration/ranger-ugsync-site.xml @@ -20,19 +20,19 @@ <name>ranger.usersync.port</name> <value>5151</value> <description>Port for unix authentication service, run within usersync</description> - <on-ambari-upgrade add="true" update="false" delete="false"/> + <on-ambari-upgrade add="true"/> </property> <property> <name>ranger.usersync.ssl</name> <value>true</value> <description>SSL enabled? (ranger admin -> usersync communication)</description> - <on-ambari-upgrade add="true" update="false" delete="false"/> + <on-ambari-upgrade add="true"/> </property> <property> <name>ranger.usersync.keystore.file</name> <value>/etc/ranger/usersync/conf/unixauthservice.jks</value> <description>Keystore file used for usersync</description> - <on-ambari-upgrade add="true" update="false" delete="false"/> + <on-ambari-upgrade add="true"/> </property> <property> <name>ranger.usersync.keystore.password</name> @@ -42,13 +42,13 @@ <value-attributes> <type>password</type> </value-attributes> - <on-ambari-upgrade add="true" update="false" delete="false"/> + <on-ambari-upgrade add="true"/> </property> <property> <name>ranger.usersync.truststore.file</name> <value>/etc/ranger/usersync/conf/mytruststore.jks</value> <description>Truststore used for usersync, required if usersync -> ranger admin communication is SSL enabled</description> - <on-ambari-upgrade add="true" update="false" delete="false"/> + <on-ambari-upgrade add="true"/> </property> <property> <name>ranger.usersync.truststore.password</name> @@ -58,13 +58,13 @@ <value-attributes> <type>password</type> </value-attributes> - <on-ambari-upgrade add="true" update="false" delete="false"/> + <on-ambari-upgrade add="true"/> </property> <property> <name>ranger.usersync.passwordvalidator.path</name> <value>./native/credValidator.uexe</value> <description>Native program for password validation</description> - <on-ambari-upgrade add="true" update="false" delete="false"/> + <on-ambari-upgrade add="true"/> </property> <property> <name>ranger.usersync.enabled</name> @@ -87,58 +87,58 @@ </entries> <selection-cardinality>1</selection-cardinality> </value-attributes> - <on-ambari-upgrade add="true" update="false" delete="false"/> + <on-ambari-upgrade add="true"/> </property> <property> <name>ranger.usersync.sink.impl.class</name> <value>org.apache.ranger.unixusersync.process.PolicyMgrUserGroupBuilder</value> <description>Class to be used as sink (to sync users into ranger admin)</description> - <on-ambari-upgrade add="true" update="false" delete="false"/> + <on-ambari-upgrade add="true"/> </property> <property> <name>ranger.usersync.policymanager.baseURL</name> <value>{{ranger_external_url}}</value> <description>URL to be used by clients to access ranger admin, use FQDN</description> - <on-ambari-upgrade add="true" update="false" delete="false"/> + <on-ambari-upgrade add="true"/> </property> <property> <name>ranger.usersync.policymanager.maxrecordsperapicall</name> <value>1000</value> <description>How many records to be returned per API call</description> - <on-ambari-upgrade add="true" update="false" delete="false"/> + <on-ambari-upgrade add="true"/> </property> <property> <name>ranger.usersync.policymanager.mockrun</name> <value>false</value> <description>Is user sync doing mock run?</description> - <on-ambari-upgrade add="true" update="false" delete="false"/> + <on-ambari-upgrade add="true"/> </property> <property> <name>ranger.usersync.unix.minUserId</name> <display-name>Minimum User ID</display-name> <value>500</value> <description>Only sync users above this user id (applicable for UNIX)</description> - <on-ambari-upgrade add="true" update="false" delete="false"/> + <on-ambari-upgrade add="true"/> </property> <property> <name>ranger.usersync.unix.group.file</name> <display-name>Group File</display-name> <value>/etc/group</value> <description>Location of the groups file on the linux server</description> - <on-ambari-upgrade add="true" update="false" delete="false"/> + <on-ambari-upgrade add="true"/> </property> <property> <name>ranger.usersync.unix.password.file</name> <display-name>Password File</display-name> <value>/etc/passwd</value> <description>Location of the password file on the linux server</description> - <on-ambari-upgrade add="true" update="false" delete="false"/> + <on-ambari-upgrade add="true"/> </property> <property> <name>ranger.usersync.sleeptimeinmillisbetweensynccycle</name> <value>60000</value> <description>Sleeptime interval in milliseconds, if < 6000 then default to 1 min</description> - <on-ambari-upgrade add="true" update="false" delete="false"/> + <on-ambari-upgrade add="true"/> </property> <property> <name>ranger.usersync.source.impl.class</name> @@ -165,35 +165,35 @@ </entries> <selection-cardinality>1</selection-cardinality> </value-attributes> - <on-ambari-upgrade add="true" update="false" delete="false"/> + <on-ambari-upgrade add="true"/> </property> <property> <name>ranger.usersync.filesource.file</name> <display-name>File Name</display-name> <value>/tmp/usergroup.txt</value> <description>Path to the file with the users and groups information. Example: /tmp/usergroup.json or /tmp/usergroup.csv or /tmp/usergroup.txt</description> - <on-ambari-upgrade add="true" update="false" delete="false"/> + <on-ambari-upgrade add="true"/> </property> <property> <name>ranger.usersync.filesource.text.delimiter</name> <display-name>Delimiter</display-name> <value>,</value> <description>Delimiter used in file, if File based user sync is used</description> - <on-ambari-upgrade add="true" update="false" delete="false"/> + <on-ambari-upgrade add="true"/> </property> <property> <name>ranger.usersync.ldap.url</name> <display-name>LDAP/AD URL</display-name> <value/> <description>LDAP server URL. Example: value = ldap://localhost:389 or ldaps//localhost:636</description> - <on-ambari-upgrade add="true" update="false" delete="false"/> + <on-ambari-upgrade add="true"/> </property> <property> <name>ranger.usersync.ldap.binddn</name> <display-name>âBind User</display-name> <value/> <description>Full distinguished name (DN), including common name (CN), of an LDAP user account that has privileges to search for users. This user is used for searching the users. This could be read-only LDAP user. Example: cn=admin,dc=example,dc=com</description> - <on-ambari-upgrade add="true" update="false" delete="false"/> + <on-ambari-upgrade add="true"/> </property> <property> <name>ranger.usersync.ldap.ldapbindpassword</name> @@ -204,13 +204,13 @@ <value-attributes> <type>password</type> </value-attributes> - <on-ambari-upgrade add="true" update="false" delete="false"/> + <on-ambari-upgrade add="true"/> </property> <property> <name>ranger.usersync.ldap.bindalias</name> <value>testldapalias</value> <description>Set as ranger.usersync.ldap.bindalias (string as is)</description> - <on-ambari-upgrade add="true" update="false" delete="false"/> + <on-ambari-upgrade add="true"/> </property> <property> <name>ranger.usersync.ldap.bindkeystore</name> @@ -219,7 +219,7 @@ <value-attributes> <empty-value-valid>true</empty-value-valid> </value-attributes> - <on-ambari-upgrade add="true" update="false" delete="false"/> + <on-ambari-upgrade add="true"/> </property> <property> <name>ranger.usersync.ldap.searchBase</name> @@ -229,7 +229,7 @@ <value-attributes> <empty-value-valid>true</empty-value-valid> </value-attributes> - <on-ambari-upgrade add="true" update="false" delete="false"/> + <on-ambari-upgrade add="true"/> </property> <property> <name>ranger.usersync.ldap.user.searchbase</name> @@ -238,7 +238,7 @@ <description>"# search base for users # sample value would be ou=users,dc=hadoop,dc=apache,dc=org # overrides value specified in ranger.usersync.ldap.searchBase"</description> - <on-ambari-upgrade add="true" update="false" delete="false"/> + <on-ambari-upgrade add="true"/> </property> <property> <name>ranger.usersync.ldap.user.searchscope</name> @@ -247,14 +247,14 @@ <description>"# search scope for the users, only base, one and sub are supported values # please customize the value to suit your deployment # default value: sub"</description> - <on-ambari-upgrade add="true" update="false" delete="false"/> + <on-ambari-upgrade add="true"/> </property> <property> <name>ranger.usersync.ldap.user.objectclass</name> <display-name>User Object Classâ</display-name> <value>person</value> <description>LDAP User Object Class. Example: person or user</description> - <on-ambari-upgrade add="true" update="false" delete="false"/> + <on-ambari-upgrade add="true"/> </property> <property> <name>ranger.usersync.ldap.user.searchfilter</name> @@ -267,14 +267,14 @@ <value-attributes> <empty-value-valid>true</empty-value-valid> </value-attributes> - <on-ambari-upgrade add="true" update="false" delete="false"/> + <on-ambari-upgrade add="true"/> </property> <property> <name>ranger.usersync.ldap.user.nameattribute</name> <display-name>Username Attribute</display-name> <value/> <description>LDAP user name attribute. Example: sAMAccountName in AD, uid or cn in OpenLDAP</description> - <on-ambari-upgrade add="true" update="false" delete="false"/> + <on-ambari-upgrade add="true"/> </property> <property> <name>ranger.usersync.ldap.referral</name> @@ -283,26 +283,26 @@ <value-attributes> <empty-value-valid>true</empty-value-valid> </value-attributes> - <on-ambari-upgrade add="true" update="false" delete="false"/> + <on-ambari-upgrade add="true"/> </property> <property> <name>ranger.usersync.ldap.user.groupnameattribute</name> <display-name>User Group Name Attribute</display-name> <value>memberof, ismemberof</value> <description>LDAP user group name attribute. Generally it is the same as username attribute. Example: sAMAccountName in AD, uid or cn in OpenLDAP</description> - <on-ambari-upgrade add="true" update="false" delete="false"/> + <on-ambari-upgrade add="true"/> </property> <property> <name>ranger.usersync.ldap.username.caseconversion</name> <value>none</value> <description>User name case conversion</description> - <on-ambari-upgrade add="true" update="false" delete="false"/> + <on-ambari-upgrade add="true"/> </property> <property> <name>ranger.usersync.ldap.groupname.caseconversion</name> <value>none</value> <description>Group name case conversion</description> - <on-ambari-upgrade add="true" update="false" delete="false"/> + <on-ambari-upgrade add="true"/> </property> <property> <name>ranger.usersync.logdir</name> @@ -312,7 +312,7 @@ <visible>false</visible> <overridable>false</overridable> </value-attributes> - <on-ambari-upgrade add="true" update="false" delete="false"/> + <on-ambari-upgrade add="true"/> </property> <property> <name>ranger.usersync.group.searchenabled</name> @@ -338,7 +338,7 @@ </entries> <selection-cardinality>1</selection-cardinality> </value-attributes> - <on-ambari-upgrade add="true" update="false" delete="false"/> + <on-ambari-upgrade add="true"/> </property> <property> <name>ranger.usersync.group.usermapsyncenabled</name> @@ -361,7 +361,7 @@ </entries> <selection-cardinality>1</selection-cardinality> </value-attributes> - <on-ambari-upgrade add="true" update="false" delete="false"/> + <on-ambari-upgrade add="true"/> </property> <property> <name>ranger.usersync.group.searchbase</name> @@ -372,7 +372,7 @@ # overrides value specified in ranger.usersync.ldap.searchBase, ranger.usersync.ldap.user.searchbase # if a value is not specified, takes the value of ranger.usersync.ldap.searchBase # if ranger.usersync.ldap.searchBase is also not specified, takes the value of ranger.usersync.ldap.user.searchbase"</description> - <on-ambari-upgrade add="true" update="false" delete="false"/> + <on-ambari-upgrade add="true"/> </property> <property> <name>ranger.usersync.group.searchscope</name> @@ -383,14 +383,14 @@ <value-attributes> <empty-value-valid>true</empty-value-valid> </value-attributes> - <on-ambari-upgrade add="true" update="false" delete="false"/> + <on-ambari-upgrade add="true"/> </property> <property> <name>ranger.usersync.group.objectclass</name> <display-name>Group Object Class</display-name> <value/> <description>LDAP Group object class. Example: group</description> - <on-ambari-upgrade add="true" update="false" delete="false"/> + <on-ambari-upgrade add="true"/> </property> <property> <name>ranger.usersync.group.searchfilter</name> @@ -400,21 +400,21 @@ # a sample value would be (dept=eng) # please customize the value to suit your deployment # default value is empty"</description> - <on-ambari-upgrade add="true" update="false" delete="false"/> + <on-ambari-upgrade add="true"/> </property> <property> <name>ranger.usersync.group.nameattribute</name> <display-name>Group Name Attribute</display-name> <value/> <description>LDAP group name attribute. Example: cn</description> - <on-ambari-upgrade add="true" update="false" delete="false"/> + <on-ambari-upgrade add="true"/> </property> <property> <name>ranger.usersync.group.memberattributename</name> <display-name>Group Member Attribute</display-name> <value/> <description>LDAP group member attribute name. Example: member</description> - <on-ambari-upgrade add="true" update="false" delete="false"/> + <on-ambari-upgrade add="true"/> </property> <property> <name>ranger.usersync.pagedresultsenabled</name> @@ -436,18 +436,18 @@ </entries> <selection-cardinality>1</selection-cardinality> </value-attributes> - <on-ambari-upgrade add="true" update="false" delete="false"/> + <on-ambari-upgrade add="true"/> </property> <property> <name>ranger.usersync.pagedresultssize</name> <value>500</value> <description>Page size</description> - <on-ambari-upgrade add="true" update="false" delete="false"/> + <on-ambari-upgrade add="true"/> </property> <property> <name>ranger.usersync.credstore.filename</name> <value>/etc/ranger/usersync/conf/ugsync.jceks</value> <description>Credential store file name for user sync, specify full path</description> - <on-ambari-upgrade add="true" update="false" delete="false"/> + <on-ambari-upgrade add="true"/> </property> </configuration> http://git-wip-us.apache.org/repos/asf/ambari/blob/1d31dcfc/ambari-server/src/main/resources/common-services/RANGER/0.5.0/configuration/usersync-properties.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/common-services/RANGER/0.5.0/configuration/usersync-properties.xml b/ambari-server/src/main/resources/common-services/RANGER/0.5.0/configuration/usersync-properties.xml index bc26d8e..7eb78e5 100644 --- a/ambari-server/src/main/resources/common-services/RANGER/0.5.0/configuration/usersync-properties.xml +++ b/ambari-server/src/main/resources/common-services/RANGER/0.5.0/configuration/usersync-properties.xml @@ -23,86 +23,86 @@ <property> <name>SYNC_SOURCE</name> <deleted>true</deleted> - <on-ambari-upgrade add="true" update="false" delete="false"/> + <on-ambari-upgrade add="true"/> </property> <property> <name>MIN_UNIX_USER_ID_TO_SYNC</name> <deleted>true</deleted> - <on-ambari-upgrade add="true" update="false" delete="false"/> + <on-ambari-upgrade add="true"/> </property> <property> <name>POLICY_MGR_URL</name> <deleted>true</deleted> - <on-ambari-upgrade add="true" update="false" delete="false"/> + <on-ambari-upgrade add="true"/> </property> <property> <name>SYNC_INTERVAL</name> <deleted>true</deleted> - <on-ambari-upgrade add="true" update="false" delete="false"/> + <on-ambari-upgrade add="true"/> </property> <property> <name>SYNC_LDAP_URL</name> <deleted>true</deleted> - <on-ambari-upgrade add="true" update="false" delete="false"/> + <on-ambari-upgrade add="true"/> </property> <property> <name>SYNC_LDAP_BIND_DN</name> <deleted>true</deleted> - <on-ambari-upgrade add="true" update="false" delete="false"/> + <on-ambari-upgrade add="true"/> </property> <property> <name>SYNC_LDAP_BIND_PASSWORD</name> <deleted>true</deleted> - <on-ambari-upgrade add="true" update="false" delete="false"/> + <on-ambari-upgrade add="true"/> </property> <property> <name>CRED_KEYSTORE_FILENAME</name> <deleted>true</deleted> - <on-ambari-upgrade add="true" update="false" delete="false"/> + <on-ambari-upgrade add="true"/> </property> <property> <name>SYNC_LDAP_USER_SEARCH_BASE</name> <deleted>true</deleted> - <on-ambari-upgrade add="true" update="false" delete="false"/> + <on-ambari-upgrade add="true"/> </property> <property> <name>SYNC_LDAP_USER_SEARCH_SCOPE</name> <deleted>true</deleted> - <on-ambari-upgrade add="true" update="false" delete="false"/> + <on-ambari-upgrade add="true"/> </property> <property> <name>SYNC_LDAP_USER_OBJECT_CLASS</name> <deleted>true</deleted> - <on-ambari-upgrade add="true" update="false" delete="false"/> + <on-ambari-upgrade add="true"/> </property> <property> <name>SYNC_LDAP_USER_SEARCH_FILTER</name> <deleted>true</deleted> - <on-ambari-upgrade add="true" update="false" delete="false"/> + <on-ambari-upgrade add="true"/> </property> <property> <name>SYNC_LDAP_USER_NAME_ATTRIBUTE</name> <deleted>true</deleted> - <on-ambari-upgrade add="true" update="false" delete="false"/> + <on-ambari-upgrade add="true"/> </property> <property> <name>SYNC_LDAP_USER_GROUP_NAME_ATTRIBUTE</name> <deleted>true</deleted> - <on-ambari-upgrade add="true" update="false" delete="false"/> + <on-ambari-upgrade add="true"/> </property> <property> <name>SYNC_LDAP_USERNAME_CASE_CONVERSION</name> <deleted>true</deleted> - <on-ambari-upgrade add="true" update="false" delete="false"/> + <on-ambari-upgrade add="true"/> </property> <property> <name>SYNC_LDAP_GROUPNAME_CASE_CONVERSION</name> <deleted>true</deleted> - <on-ambari-upgrade add="true" update="false" delete="false"/> + <on-ambari-upgrade add="true"/> </property> <property> <name>logdir</name> <deleted>true</deleted> - <on-ambari-upgrade add="true" update="false" delete="false"/> + <on-ambari-upgrade add="true"/> </property> </configuration> http://git-wip-us.apache.org/repos/asf/ambari/blob/1d31dcfc/ambari-server/src/main/resources/common-services/RANGER/0.6.0/configuration/admin-log4j.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/common-services/RANGER/0.6.0/configuration/admin-log4j.xml b/ambari-server/src/main/resources/common-services/RANGER/0.6.0/configuration/admin-log4j.xml index 7bf4294..9f0cdbf 100644 --- a/ambari-server/src/main/resources/common-services/RANGER/0.6.0/configuration/admin-log4j.xml +++ b/ambari-server/src/main/resources/common-services/RANGER/0.6.0/configuration/admin-log4j.xml @@ -103,6 +103,6 @@ log4j.additivity.jdbc.connection=false <type>content</type> <show-property-name>false</show-property-name> </value-attributes> - <on-ambari-upgrade add="true" update="false" delete="false"/> + <on-ambari-upgrade add="true"/> </property> </configuration> http://git-wip-us.apache.org/repos/asf/ambari/blob/1d31dcfc/ambari-server/src/main/resources/common-services/RANGER/0.6.0/configuration/admin-properties.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/common-services/RANGER/0.6.0/configuration/admin-properties.xml b/ambari-server/src/main/resources/common-services/RANGER/0.6.0/configuration/admin-properties.xml index 60be81f..a747dde 100644 --- a/ambari-server/src/main/resources/common-services/RANGER/0.6.0/configuration/admin-properties.xml +++ b/ambari-server/src/main/resources/common-services/RANGER/0.6.0/configuration/admin-properties.xml @@ -23,16 +23,16 @@ <property> <name>audit_db_name</name> <deleted>true</deleted> - <on-ambari-upgrade add="true" update="false" delete="false"/> + <on-ambari-upgrade add="true"/> </property> <property> <name>audit_db_user</name> <deleted>true</deleted> - <on-ambari-upgrade add="true" update="false" delete="false"/> + <on-ambari-upgrade add="true"/> </property> <property> <name>audit_db_password</name> <deleted>true</deleted> - <on-ambari-upgrade add="true" update="false" delete="false"/> + <on-ambari-upgrade add="true"/> </property> </configuration> http://git-wip-us.apache.org/repos/asf/ambari/blob/1d31dcfc/ambari-server/src/main/resources/common-services/RANGER/0.6.0/configuration/ranger-admin-site.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/common-services/RANGER/0.6.0/configuration/ranger-admin-site.xml b/ambari-server/src/main/resources/common-services/RANGER/0.6.0/configuration/ranger-admin-site.xml index cdbbb12..35910ee 100644 --- a/ambari-server/src/main/resources/common-services/RANGER/0.6.0/configuration/ranger-admin-site.xml +++ b/ambari-server/src/main/resources/common-services/RANGER/0.6.0/configuration/ranger-admin-site.xml @@ -19,38 +19,38 @@ <property> <name>ranger.jpa.audit.jdbc.driver</name> <deleted>true</deleted> - <on-ambari-upgrade add="true" update="false" delete="false"/> + <on-ambari-upgrade add="true"/> </property> <property> <name>ranger.jpa.audit.jdbc.url</name> <deleted>true</deleted> - <on-ambari-upgrade add="true" update="false" delete="false"/> + <on-ambari-upgrade add="true"/> </property> <property> <name>ranger.jpa.audit.jdbc.user</name> <deleted>true</deleted> - <on-ambari-upgrade add="true" update="false" delete="false"/> + <on-ambari-upgrade add="true"/> </property> <property> <name>ranger.jpa.audit.jdbc.password</name> <deleted>true</deleted> - <on-ambari-upgrade add="true" update="false" delete="false"/> + <on-ambari-upgrade add="true"/> </property> <property> <name>ranger.jpa.audit.jdbc.credential.alias</name> <deleted>true</deleted> - <on-ambari-upgrade add="true" update="false" delete="false"/> + <on-ambari-upgrade add="true"/> </property> <property> <name>ranger.jpa.audit.jdbc.dialect</name> <deleted>true</deleted> - <on-ambari-upgrade add="true" update="false" delete="false"/> + <on-ambari-upgrade add="true"/> </property> <property> <name>ranger.admin.kerberos.token.valid.seconds</name> <value>30</value> <description/> - <on-ambari-upgrade add="true" update="false" delete="false"/> + <on-ambari-upgrade add="true"/> </property> <property> <name>ranger.admin.kerberos.cookie.domain</name> @@ -59,13 +59,13 @@ <value-attributes> <empty-value-valid>true</empty-value-valid> </value-attributes> - <on-ambari-upgrade add="true" update="false" delete="false"/> + <on-ambari-upgrade add="true"/> </property> <property> <name>ranger.admin.kerberos.cookie.path</name> <value>/</value> <description/> - <on-ambari-upgrade add="true" update="false" delete="false"/> + <on-ambari-upgrade add="true"/> </property> <property> <name>ranger.spnego.kerberos.principal</name> @@ -74,7 +74,7 @@ <value-attributes> <empty-value-valid>true</empty-value-valid> </value-attributes> - <on-ambari-upgrade add="true" update="false" delete="false"/> + <on-ambari-upgrade add="true"/> </property> <property> <name>ranger.spnego.kerberos.keytab</name> @@ -83,7 +83,7 @@ <value-attributes> <empty-value-valid>true</empty-value-valid> </value-attributes> - <on-ambari-upgrade add="true" update="false" delete="false"/> + <on-ambari-upgrade add="true"/> </property> <property> <name>ranger.admin.kerberos.principal</name> @@ -92,7 +92,7 @@ <value-attributes> <empty-value-valid>true</empty-value-valid> </value-attributes> - <on-ambari-upgrade add="true" update="false" delete="false"/> + <on-ambari-upgrade add="true"/> </property> <property> <name>ranger.admin.kerberos.keytab</name> @@ -101,7 +101,7 @@ <value-attributes> <empty-value-valid>true</empty-value-valid> </value-attributes> - <on-ambari-upgrade add="true" update="false" delete="false"/> + <on-ambari-upgrade add="true"/> </property> <property> <name>ranger.lookup.kerberos.principal</name> @@ -110,7 +110,7 @@ <value-attributes> <empty-value-valid>true</empty-value-valid> </value-attributes> - <on-ambari-upgrade add="true" update="false" delete="false"/> + <on-ambari-upgrade add="true"/> </property> <property> <name>ranger.lookup.kerberos.keytab</name> @@ -119,14 +119,14 @@ <value-attributes> <empty-value-valid>true</empty-value-valid> </value-attributes> - <on-ambari-upgrade add="true" update="false" delete="false"/> + <on-ambari-upgrade add="true"/> </property> <property> <name>ranger.truststore.file</name> <value>/etc/ranger/admin/conf/ranger-admin-keystore.jks</value> <display-name>ranger.truststore.file</display-name> <description>Ranger trust-store file-path</description> - <on-ambari-upgrade add="true" update="false" delete="false"/> + <on-ambari-upgrade add="true"/> </property> <property> <name>ranger.truststore.password</name> @@ -134,7 +134,7 @@ <property-type>PASSWORD</property-type> <display-name>ranger.truststore.password</display-name> <description>Ranger trust-store password</description> - <on-ambari-upgrade add="true" update="false" delete="false"/> + <on-ambari-upgrade add="true"/> </property> <property> <name>ranger.audit.solr.zookeepers</name> @@ -150,17 +150,17 @@ <name>is_solrCloud_enabled</name> </property> </depends-on> - <on-ambari-upgrade add="true" update="false" delete="false"/> + <on-ambari-upgrade add="true"/> </property> <property> <name>ranger.sso.cookiename</name> <deleted>true</deleted> - <on-ambari-upgrade add="true" update="false" delete="false"/> + <on-ambari-upgrade add="true"/> </property> <property> <name>ranger.sso.query.param.originalurl</name> <deleted>true</deleted> - <on-ambari-upgrade add="true" update="false" delete="false"/> + <on-ambari-upgrade add="true"/> </property> <property> <name>ranger.ldap.ad.user.searchfilter</name> @@ -169,7 +169,7 @@ <value-attributes> <overridable>false</overridable> </value-attributes> - <on-ambari-upgrade add="true" update="false" delete="false"/> + <on-ambari-upgrade add="true"/> </property> <property> <name>ranger.ldap.user.searchfilter</name> @@ -179,7 +179,7 @@ <value-attributes> <overridable>false</overridable> </value-attributes> - <on-ambari-upgrade add="true" update="false" delete="false"/> + <on-ambari-upgrade add="true"/> </property> <property> <name>ranger.kms.service.user.hdfs</name> @@ -194,7 +194,7 @@ <name>hdfs_user</name> </property> </depends-on> - <on-ambari-upgrade add="true" update="false" delete="false"/> + <on-ambari-upgrade add="true"/> </property> <property> <name>ranger.kms.service.user.hive</name> @@ -209,6 +209,6 @@ <name>hive_user</name> </property> </depends-on> - <on-ambari-upgrade add="true" update="false" delete="false"/> + <on-ambari-upgrade add="true"/> </property> </configuration> http://git-wip-us.apache.org/repos/asf/ambari/blob/1d31dcfc/ambari-server/src/main/resources/common-services/RANGER/0.6.0/configuration/ranger-env.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/common-services/RANGER/0.6.0/configuration/ranger-env.xml b/ambari-server/src/main/resources/common-services/RANGER/0.6.0/configuration/ranger-env.xml index 5e7cd30..6eb312f 100644 --- a/ambari-server/src/main/resources/common-services/RANGER/0.6.0/configuration/ranger-env.xml +++ b/ambari-server/src/main/resources/common-services/RANGER/0.6.0/configuration/ranger-env.xml @@ -23,21 +23,21 @@ <property> <name>xasecure.audit.destination.db</name> <deleted>true</deleted> - <on-ambari-upgrade add="true" update="false" delete="false"/> + <on-ambari-upgrade add="true"/> </property> <property> <name>ranger_solr_config_set</name> <value>ranger_audits</value> - <on-ambari-upgrade add="true" update="false" delete="false"/> + <on-ambari-upgrade add="true"/> </property> <property> <name>ranger_solr_collection_name</name> <value>ranger_audits</value> - <on-ambari-upgrade add="true" update="false" delete="false"/> + <on-ambari-upgrade add="true"/> </property> <property> <name>ranger_solr_shards</name> <value>1</value> - <on-ambari-upgrade add="true" update="false" delete="false"/> + <on-ambari-upgrade add="true"/> </property> </configuration> http://git-wip-us.apache.org/repos/asf/ambari/blob/1d31dcfc/ambari-server/src/main/resources/common-services/RANGER/0.6.0/configuration/ranger-tagsync-site.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/common-services/RANGER/0.6.0/configuration/ranger-tagsync-site.xml b/ambari-server/src/main/resources/common-services/RANGER/0.6.0/configuration/ranger-tagsync-site.xml index d98c712..c5a575d 100644 --- a/ambari-server/src/main/resources/common-services/RANGER/0.6.0/configuration/ranger-tagsync-site.xml +++ b/ambari-server/src/main/resources/common-services/RANGER/0.6.0/configuration/ranger-tagsync-site.xml @@ -28,7 +28,7 @@ <overridable>false</overridable> <editable-only-at-install>true</editable-only-at-install> </value-attributes> - <on-ambari-upgrade add="true" update="false" delete="false"/> + <on-ambari-upgrade add="true"/> </property> <property> <name>ranger.tagsync.dest.ranger.endpoint</name> @@ -37,7 +37,7 @@ <value-attributes> <empty-value-valid>true</empty-value-valid> </value-attributes> - <on-ambari-upgrade add="true" update="false" delete="false"/> + <on-ambari-upgrade add="true"/> </property> <property> <name>ranger.tagsync.source.atlas</name> @@ -53,7 +53,7 @@ <name>atlas.server.bind.address</name> </property> </depends-on> - <on-ambari-upgrade add="true" update="false" delete="false"/> + <on-ambari-upgrade add="true"/> </property> <property> <name>ranger.tagsync.source.atlasrest</name> @@ -63,7 +63,7 @@ <value-attributes> <type>boolean</type> </value-attributes> - <on-ambari-upgrade add="true" update="false" delete="false"/> + <on-ambari-upgrade add="true"/> </property> <property> <name>ranger.tagsync.source.file</name> @@ -73,7 +73,7 @@ <value-attributes> <type>boolean</type> </value-attributes> - <on-ambari-upgrade add="true" update="false" delete="false"/> + <on-ambari-upgrade add="true"/> </property> <property> <name>ranger.tagsync.source.file.check.interval.millis</name> @@ -83,7 +83,7 @@ <value-attributes> <empty-value-valid>true</empty-value-valid> </value-attributes> - <on-ambari-upgrade add="true" update="false" delete="false"/> + <on-ambari-upgrade add="true"/> </property> <property> <name>ranger.tagsync.source.atlasrest.download.interval.millis</name> @@ -92,13 +92,13 @@ <value-attributes> <empty-value-valid>true</empty-value-valid> </value-attributes> - <on-ambari-upgrade add="true" update="false" delete="false"/> + <on-ambari-upgrade add="true"/> </property> <property> <name>ranger.tagsync.dest.ranger.ssl.config.filename</name> <value>/etc/ranger/tagsync/conf/mytruststore.jks</value> <description>Truststore used for tagsync, required if tagsync -> ranger admin communication is SSL enabled</description> - <on-ambari-upgrade add="true" update="false" delete="false"/> + <on-ambari-upgrade add="true"/> </property> <property> <name>ranger.tagsync.source.file.filename</name> @@ -108,7 +108,7 @@ <value-attributes> <empty-value-valid>true</empty-value-valid> </value-attributes> - <on-ambari-upgrade add="true" update="false" delete="false"/> + <on-ambari-upgrade add="true"/> </property> <property> <name>ranger.tagsync.keystore.filename</name> @@ -117,7 +117,7 @@ <value-attributes> <empty-value-valid>true</empty-value-valid> </value-attributes> - <on-ambari-upgrade add="true" update="false" delete="false"/> + <on-ambari-upgrade add="true"/> </property> <property> <name>ranger.tagsync.atlas.to.ranger.service.mapping</name> @@ -126,7 +126,7 @@ <value-attributes> <empty-value-valid>true</empty-value-valid> </value-attributes> - <on-ambari-upgrade add="true" update="false" delete="false"/> + <on-ambari-upgrade add="true"/> </property> <property> <name>ranger.tagsync.source.atlasrest.endpoint</name> @@ -136,7 +136,7 @@ <value-attributes> <empty-value-valid>true</empty-value-valid> </value-attributes> - <on-ambari-upgrade add="true" update="false" delete="false"/> + <on-ambari-upgrade add="true"/> </property> <property> <name>ranger.tagsync.atlas.custom.resource.mappers</name> @@ -145,7 +145,7 @@ <value-attributes> <empty-value-valid>true</empty-value-valid> </value-attributes> - <on-ambari-upgrade add="true" update="false" delete="false"/> + <on-ambari-upgrade add="true"/> </property> <property> <name>ranger.tagsync.kerberos.principal</name> @@ -154,7 +154,7 @@ <value-attributes> <empty-value-valid>true</empty-value-valid> </value-attributes> - <on-ambari-upgrade add="true" update="false" delete="false"/> + <on-ambari-upgrade add="true"/> </property> <property> <name>ranger.tagsync.kerberos.keytab</name> @@ -163,12 +163,12 @@ <value-attributes> <empty-value-valid>true</empty-value-valid> </value-attributes> - <on-ambari-upgrade add="true" update="false" delete="false"/> + <on-ambari-upgrade add="true"/> </property> <property> <name>ranger.tagsync.dest.ranger.username</name> <value>rangertagsync</value> <description/> - <on-ambari-upgrade add="true" update="false" delete="false"/> + <on-ambari-upgrade add="true"/> </property> </configuration> http://git-wip-us.apache.org/repos/asf/ambari/blob/1d31dcfc/ambari-server/src/main/resources/common-services/RANGER/0.6.0/configuration/ranger-ugsync-site.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/common-services/RANGER/0.6.0/configuration/ranger-ugsync-site.xml b/ambari-server/src/main/resources/common-services/RANGER/0.6.0/configuration/ranger-ugsync-site.xml index 52dbf46..d267b75 100644 --- a/ambari-server/src/main/resources/common-services/RANGER/0.6.0/configuration/ranger-ugsync-site.xml +++ b/ambari-server/src/main/resources/common-services/RANGER/0.6.0/configuration/ranger-ugsync-site.xml @@ -23,7 +23,7 @@ <value-attributes> <empty-value-valid>true</empty-value-valid> </value-attributes> - <on-ambari-upgrade add="true" update="false" delete="false"/> + <on-ambari-upgrade add="true"/> </property> <property> <name>ranger.usersync.kerberos.keytab</name> @@ -32,25 +32,25 @@ <value-attributes> <empty-value-valid>true</empty-value-valid> </value-attributes> - <on-ambari-upgrade add="true" update="false" delete="false"/> + <on-ambari-upgrade add="true"/> </property> <property> <name>ranger.usersync.policymgr.username</name> <value>rangerusersync</value> <description/> - <on-ambari-upgrade add="true" update="false" delete="false"/> + <on-ambari-upgrade add="true"/> </property> <property> <name>ranger.usersync.policymgr.alias</name> <value>ranger.usersync.policymgr.password</value> <description/> - <on-ambari-upgrade add="true" update="false" delete="false"/> + <on-ambari-upgrade add="true"/> </property> <property> <name>ranger.usersync.policymgr.keystore</name> <value>/etc/ranger/usersync/conf/ugsync.jceks</value> <description/> - <on-ambari-upgrade add="true" update="false" delete="false"/> + <on-ambari-upgrade add="true"/> </property> <property> <name>ranger.usersync.group.search.first.enabled</name> @@ -72,7 +72,7 @@ </entries> <selection-cardinality>1</selection-cardinality> </value-attributes> - <on-ambari-upgrade add="true" update="false" delete="false"/> + <on-ambari-upgrade add="true"/> </property> <property> <name>ranger.usersync.user.searchenabled</name> @@ -94,6 +94,6 @@ </entries> <selection-cardinality>1</selection-cardinality> </value-attributes> - <on-ambari-upgrade add="true" update="false" delete="false"/> + <on-ambari-upgrade add="true"/> </property> </configuration> http://git-wip-us.apache.org/repos/asf/ambari/blob/1d31dcfc/ambari-server/src/main/resources/common-services/RANGER/0.6.0/configuration/tagsync-application-properties.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/common-services/RANGER/0.6.0/configuration/tagsync-application-properties.xml b/ambari-server/src/main/resources/common-services/RANGER/0.6.0/configuration/tagsync-application-properties.xml index fa83afe..3bf9c87 100644 --- a/ambari-server/src/main/resources/common-services/RANGER/0.6.0/configuration/tagsync-application-properties.xml +++ b/ambari-server/src/main/resources/common-services/RANGER/0.6.0/configuration/tagsync-application-properties.xml @@ -25,7 +25,7 @@ <display-name>Atlas Source: Kafka consumer group</display-name> <value>ranger_entities_consumer</value> <description/> - <on-ambari-upgrade add="true" update="false" delete="false"/> + <on-ambari-upgrade add="true"/> </property> <property> <name>atlas.kafka.bootstrap.servers</name> @@ -41,7 +41,7 @@ <value-attributes> <empty-value-valid>true</empty-value-valid> </value-attributes> - <on-ambari-upgrade add="true" update="false" delete="false"/> + <on-ambari-upgrade add="true"/> </property> <property> <name>atlas.kafka.zookeeper.connect</name> @@ -57,6 +57,6 @@ <value-attributes> <empty-value-valid>true</empty-value-valid> </value-attributes> - <on-ambari-upgrade add="true" update="false" delete="false"/> + <on-ambari-upgrade add="true"/> </property> </configuration> http://git-wip-us.apache.org/repos/asf/ambari/blob/1d31dcfc/ambari-server/src/main/resources/common-services/RANGER/0.6.0/configuration/tagsync-log4j.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/common-services/RANGER/0.6.0/configuration/tagsync-log4j.xml b/ambari-server/src/main/resources/common-services/RANGER/0.6.0/configuration/tagsync-log4j.xml index 445b094..afeb422 100644 --- a/ambari-server/src/main/resources/common-services/RANGER/0.6.0/configuration/tagsync-log4j.xml +++ b/ambari-server/src/main/resources/common-services/RANGER/0.6.0/configuration/tagsync-log4j.xml @@ -62,6 +62,6 @@ log4j.appender.console.layout.ConversionPattern=%d{dd MMM yyyy HH:mm:ss} %5p %c{ <type>content</type> <show-property-name>false</show-property-name> </value-attributes> - <on-ambari-upgrade add="true" update="false" delete="false"/> + <on-ambari-upgrade add="true"/> </property> </configuration> http://git-wip-us.apache.org/repos/asf/ambari/blob/1d31dcfc/ambari-server/src/main/resources/common-services/RANGER/0.6.0/configuration/usersync-log4j.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/common-services/RANGER/0.6.0/configuration/usersync-log4j.xml b/ambari-server/src/main/resources/common-services/RANGER/0.6.0/configuration/usersync-log4j.xml index c4d2d99..768c153 100644 --- a/ambari-server/src/main/resources/common-services/RANGER/0.6.0/configuration/usersync-log4j.xml +++ b/ambari-server/src/main/resources/common-services/RANGER/0.6.0/configuration/usersync-log4j.xml @@ -61,6 +61,6 @@ log4j.appender.console.layout.ConversionPattern=%d{dd MMM yyyy HH:mm:ss} %5p %c{ <type>content</type> <show-property-name>false</show-property-name> </value-attributes> - <on-ambari-upgrade add="true" update="false" delete="false"/> + <on-ambari-upgrade add="true"/> </property> </configuration> http://git-wip-us.apache.org/repos/asf/ambari/blob/1d31dcfc/ambari-server/src/main/resources/common-services/RANGER_KMS/0.5.0.2.3/configuration/dbks-site.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/common-services/RANGER_KMS/0.5.0.2.3/configuration/dbks-site.xml b/ambari-server/src/main/resources/common-services/RANGER_KMS/0.5.0.2.3/configuration/dbks-site.xml index edce14b..04fd32f 100644 --- a/ambari-server/src/main/resources/common-services/RANGER_KMS/0.5.0.2.3/configuration/dbks-site.xml +++ b/ambari-server/src/main/resources/common-services/RANGER_KMS/0.5.0.2.3/configuration/dbks-site.xml @@ -23,7 +23,7 @@ <name>hadoop.kms.blacklist.DECRYPT_EEK</name> <value>hdfs</value> <description>Blacklist for decrypt EncryptedKey CryptoExtension operations</description> - <on-ambari-upgrade add="true" update="false" delete="false"/> + <on-ambari-upgrade add="true"/> </property> <property> <name>ranger.db.encrypt.key.password</name> @@ -33,7 +33,7 @@ <type>password</type> </value-attributes> <description>Password used for encrypting Master Key</description> - <on-ambari-upgrade add="true" update="false" delete="false"/> + <on-ambari-upgrade add="true"/> </property> <property> <name>ranger.ks.jpa.jdbc.url</name> @@ -57,13 +57,13 @@ <name>db_name</name> </property> </depends-on> - <on-ambari-upgrade add="true" update="false" delete="false"/> + <on-ambari-upgrade add="true"/> </property> <property> <name>ranger.ks.jpa.jdbc.user</name> <value>{{db_user}}</value> <description>Database username used for operation</description> - <on-ambari-upgrade add="true" update="false" delete="false"/> + <on-ambari-upgrade add="true"/> </property> <property> <name>ranger.ks.jpa.jdbc.password</name> @@ -73,31 +73,31 @@ <type>password</type> </value-attributes> <description>Database user's password</description> - <on-ambari-upgrade add="true" update="false" delete="false"/> + <on-ambari-upgrade add="true"/> </property> <property> <name>ranger.ks.jpa.jdbc.credential.provider.path</name> <value>/etc/ranger/kms/rangerkms.jceks</value> <description>Credential provider path</description> - <on-ambari-upgrade add="true" update="false" delete="false"/> + <on-ambari-upgrade add="true"/> </property> <property> <name>ranger.ks.jpa.jdbc.credential.alias</name> <value>ranger.ks.jdbc.password</value> <description>Credential alias used for password</description> - <on-ambari-upgrade add="true" update="false" delete="false"/> + <on-ambari-upgrade add="true"/> </property> <property> <name>ranger.ks.masterkey.credential.alias</name> <value>ranger.ks.masterkey.password</value> <description>Credential alias used for masterkey</description> - <on-ambari-upgrade add="true" update="false" delete="false"/> + <on-ambari-upgrade add="true"/> </property> <property> <name>ranger.ks.jpa.jdbc.dialect</name> <value>{{jdbc_dialect}}</value> <description>Dialect used for database</description> - <on-ambari-upgrade add="true" update="false" delete="false"/> + <on-ambari-upgrade add="true"/> </property> <property> <name>ranger.ks.jpa.jdbc.driver</name> @@ -113,12 +113,12 @@ <name>DB_FLAVOR</name> </property> </depends-on> - <on-ambari-upgrade add="true" update="false" delete="false"/> + <on-ambari-upgrade add="true"/> </property> <property> <name>ranger.ks.jdbc.sqlconnectorjar</name> <value>{{ews_lib_jar_path}}</value> <description>Driver used for database</description> - <on-ambari-upgrade add="true" update="false" delete="false"/> + <on-ambari-upgrade add="true"/> </property> </configuration> http://git-wip-us.apache.org/repos/asf/ambari/blob/1d31dcfc/ambari-server/src/main/resources/common-services/RANGER_KMS/0.5.0.2.3/configuration/kms-env.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/common-services/RANGER_KMS/0.5.0.2.3/configuration/kms-env.xml b/ambari-server/src/main/resources/common-services/RANGER_KMS/0.5.0.2.3/configuration/kms-env.xml index fa55547..7dea07f 100644 --- a/ambari-server/src/main/resources/common-services/RANGER_KMS/0.5.0.2.3/configuration/kms-env.xml +++ b/ambari-server/src/main/resources/common-services/RANGER_KMS/0.5.0.2.3/configuration/kms-env.xml @@ -29,7 +29,7 @@ <type>user</type> <overridable>false</overridable> </value-attributes> - <on-ambari-upgrade add="true" update="false" delete="false"/> + <on-ambari-upgrade add="true"/> </property> <property> <name>kms_group</name> @@ -40,7 +40,7 @@ <value-attributes> <type>user</type> </value-attributes> - <on-ambari-upgrade add="true" update="false" delete="false"/> + <on-ambari-upgrade add="true"/> </property> <property> <name>kms_log_dir</name> @@ -51,13 +51,13 @@ <overridable>false</overridable> <editable-only-at-install>true</editable-only-at-install> </value-attributes> - <on-ambari-upgrade add="true" update="false" delete="false"/> + <on-ambari-upgrade add="true"/> </property> <property> <name>kms_port</name> <value>9292</value> <description/> - <on-ambari-upgrade add="true" update="false" delete="false"/> + <on-ambari-upgrade add="true"/> </property> <property> <name>create_db_user</name> @@ -79,6 +79,6 @@ </entries> <selection-cardinality>1</selection-cardinality> </value-attributes> - <on-ambari-upgrade add="true" update="false" delete="false"/> + <on-ambari-upgrade add="true"/> </property> </configuration>
