http://git-wip-us.apache.org/repos/asf/ambari/blob/ed7c64ad/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 dce8a90..d473a43 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 @@ -19,13 +19,13 @@ */ --> <configuration supports_final="true" supports_adding_forbidden="true"> - <property> <name>xml_configurations_supported</name> <value>true</value> - <description></description> + <description/> + <on-ambari-upgrade add="false" change="true" delete="true"/> + <on-stack-upgrade add="true" change="true" delete="false"/> </property> - <property> <name>create_db_dbuser</name> <value>true</value> @@ -46,13 +46,15 @@ </entries> <selection-cardinality>1</selection-cardinality> </value-attributes> + <on-ambari-upgrade add="false" change="true" delete="true"/> + <on-stack-upgrade add="true" change="true" delete="false"/> </property> - <property> <name>oracle_home</name> <deleted>true</deleted> + <on-ambari-upgrade add="false" change="true" delete="true"/> + <on-stack-upgrade add="true" change="true" delete="false"/> </property> - <property> <name>ranger_privelege_user_jdbc_url</name> <display-name>JDBC connect string for root user</display-name> @@ -72,8 +74,9 @@ <name>db_host</name> </property> </depends-on> + <on-ambari-upgrade add="false" change="true" delete="true"/> + <on-stack-upgrade add="true" change="true" delete="false"/> </property> - <property> <name>ranger-yarn-plugin-enabled</name> <value>No</value> @@ -94,8 +97,9 @@ </entries> <selection-cardinality>1</selection-cardinality> </value-attributes> + <on-ambari-upgrade add="false" change="true" delete="true"/> + <on-stack-upgrade add="true" change="true" delete="false"/> </property> - <property> <name>ranger-kafka-plugin-enabled</name> <value>No</value> @@ -116,8 +120,9 @@ </entries> <selection-cardinality>1</selection-cardinality> </value-attributes> + <on-ambari-upgrade add="false" change="true" delete="true"/> + <on-stack-upgrade add="true" change="true" delete="false"/> </property> - <property> <name>xasecure.audit.destination.solr</name> <value>true</value> @@ -138,8 +143,9 @@ </entries> <selection-cardinality>1</selection-cardinality> </value-attributes> + <on-ambari-upgrade add="false" change="true" delete="true"/> + <on-stack-upgrade add="true" change="true" delete="false"/> </property> - <property> <name>is_solrCloud_enabled</name> <display-name>SolrCloud</display-name> @@ -161,8 +167,9 @@ <selection-cardinality>1</selection-cardinality> <empty-value-valid>true</empty-value-valid> </value-attributes> + <on-ambari-upgrade add="false" change="true" delete="true"/> + <on-stack-upgrade add="true" change="true" delete="false"/> </property> - <property> <name>xasecure.audit.destination.hdfs</name> <value>true</value> @@ -183,8 +190,9 @@ </entries> <selection-cardinality>1</selection-cardinality> </value-attributes> + <on-ambari-upgrade add="false" change="true" delete="true"/> + <on-stack-upgrade add="true" change="true" delete="false"/> </property> - <property> <name>xasecure.audit.destination.hdfs.dir</name> <value>hdfs://localhost:8020</value> @@ -197,8 +205,9 @@ <name>fs.defaultFS</name> </property> </depends-on> + <on-ambari-upgrade add="false" change="true" delete="true"/> + <on-stack-upgrade add="true" change="true" delete="false"/> </property> - <property> <name>xasecure.audit.destination.db</name> <value>false</value> @@ -219,6 +228,7 @@ </entries> <selection-cardinality>1</selection-cardinality> </value-attributes> + <on-ambari-upgrade add="false" change="true" delete="true"/> + <on-stack-upgrade add="true" change="true" delete="false"/> </property> - </configuration>
http://git-wip-us.apache.org/repos/asf/ambari/blob/ed7c64ad/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 e5a1f8f..03ee2f6 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 @@ -20,40 +20,46 @@ */ --> <configuration supports_final="false" supports_do_not_extend="true"> - <property> <name>http.service.port</name> <deleted>true</deleted> + <on-ambari-upgrade add="false" change="true" delete="true"/> + <on-stack-upgrade add="true" change="true" delete="false"/> </property> - <property> <name>https.service.port</name> <deleted>true</deleted> + <on-ambari-upgrade add="false" change="true" delete="true"/> + <on-stack-upgrade add="true" change="true" delete="false"/> </property> - <property> <name>https.attrib.keystoreFile</name> <deleted>true</deleted> + <on-ambari-upgrade add="false" change="true" delete="true"/> + <on-stack-upgrade add="true" change="true" delete="false"/> </property> - <property> <name>https.attrib.keystorePass</name> <deleted>true</deleted> + <on-ambari-upgrade add="false" change="true" delete="true"/> + <on-stack-upgrade add="true" change="true" delete="false"/> </property> - <property> <name>https.attrib.keyAlias</name> <deleted>true</deleted> + <on-ambari-upgrade add="false" change="true" delete="true"/> + <on-stack-upgrade add="true" change="true" delete="false"/> </property> - <property> <name>https.attrib.clientAuth</name> <deleted>true</deleted> + <on-ambari-upgrade add="false" change="true" delete="true"/> + <on-stack-upgrade add="true" change="true" delete="false"/> </property> - <property> <name>http.enabled</name> <deleted>true</deleted> + <on-ambari-upgrade add="false" change="true" delete="true"/> + <on-stack-upgrade add="true" change="true" delete="false"/> </property> - -</configuration> \ No newline at end of file +</configuration> http://git-wip-us.apache.org/repos/asf/ambari/blob/ed7c64ad/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 cc5d75f..05c4b23 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 @@ -15,27 +15,28 @@ See the License for the specific language governing permissions and limitations under the License. --> - <configuration supports_final="true"> - <property> <name>ranger.usersync.port</name> <value>5151</value> <description>Port for unix authentication service, run within usersync</description> + <on-ambari-upgrade add="false" change="true" delete="true"/> + <on-stack-upgrade add="true" change="true" delete="false"/> </property> - <property> <name>ranger.usersync.ssl</name> <value>true</value> <description>SSL enabled? (ranger admin -> usersync communication)</description> + <on-ambari-upgrade add="false" change="true" delete="true"/> + <on-stack-upgrade add="true" change="true" delete="false"/> </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="false" change="true" delete="true"/> + <on-stack-upgrade add="true" change="true" delete="false"/> </property> - <property> <name>ranger.usersync.keystore.password</name> <value>UnIx529p</value> @@ -44,14 +45,16 @@ <value-attributes> <type>password</type> </value-attributes> + <on-ambari-upgrade add="false" change="true" delete="true"/> + <on-stack-upgrade add="true" change="true" delete="false"/> </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="false" change="true" delete="true"/> + <on-stack-upgrade add="true" change="true" delete="false"/> </property> - <property> <name>ranger.usersync.truststore.password</name> <value>changeit</value> @@ -60,14 +63,16 @@ <value-attributes> <type>password</type> </value-attributes> + <on-ambari-upgrade add="false" change="true" delete="true"/> + <on-stack-upgrade add="true" change="true" delete="false"/> </property> - <property> <name>ranger.usersync.passwordvalidator.path</name> <value>./native/credValidator.uexe</value> <description>Native program for password validation</description> + <on-ambari-upgrade add="false" change="true" delete="true"/> + <on-stack-upgrade add="true" change="true" delete="false"/> </property> - <property> <name>ranger.usersync.enabled</name> <display-name>Enable User Sync</display-name> @@ -89,59 +94,68 @@ </entries> <selection-cardinality>1</selection-cardinality> </value-attributes> + <on-ambari-upgrade add="false" change="true" delete="true"/> + <on-stack-upgrade add="true" change="true" delete="false"/> </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="false" change="true" delete="true"/> + <on-stack-upgrade add="true" change="true" delete="false"/> </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="false" change="true" delete="true"/> + <on-stack-upgrade add="true" change="true" delete="false"/> </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="false" change="true" delete="true"/> + <on-stack-upgrade add="true" change="true" delete="false"/> </property> - <property> <name>ranger.usersync.policymanager.mockrun</name> <value>false</value> <description>Is user sync doing mock run?</description> + <on-ambari-upgrade add="false" change="true" delete="true"/> + <on-stack-upgrade add="true" change="true" delete="false"/> </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="false" change="true" delete="true"/> + <on-stack-upgrade add="true" change="true" delete="false"/> </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="false" change="true" delete="true"/> + <on-stack-upgrade add="true" change="true" delete="false"/> </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="false" change="true" delete="true"/> + <on-stack-upgrade add="true" change="true" delete="false"/> </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="false" change="true" delete="true"/> + <on-stack-upgrade add="true" change="true" delete="false"/> </property> - <property> <name>ranger.usersync.source.impl.class</name> <value>org.apache.ranger.unixusersync.process.UnixUserGroupBuilder</value> @@ -167,62 +181,70 @@ </entries> <selection-cardinality>1</selection-cardinality> </value-attributes> + <on-ambari-upgrade add="false" change="true" delete="true"/> + <on-stack-upgrade add="true" change="true" delete="false"/> </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="false" change="true" delete="true"/> + <on-stack-upgrade add="true" change="true" delete="false"/> </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="false" change="true" delete="true"/> + <on-stack-upgrade add="true" change="true" delete="false"/> </property> - <property> <name>ranger.usersync.ldap.url</name> <display-name>LDAP/AD URL</display-name> - <value></value> + <value/> <description>LDAP server URL. Example: value = ldap://localhost:389 or ldaps//localhost:636</description> + <on-ambari-upgrade add="false" change="true" delete="true"/> + <on-stack-upgrade add="true" change="true" delete="false"/> </property> - <property> <name>ranger.usersync.ldap.binddn</name> <display-name>âBind User</display-name> - <value></value> + <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="false" change="true" delete="true"/> + <on-stack-upgrade add="true" change="true" delete="false"/> </property> - <property> <name>ranger.usersync.ldap.ldapbindpassword</name> <display-name>Bind User Password</display-name> - <value></value> + <value/> <property-type>PASSWORD</property-type> <description>Password for the LDAP bind user used for searching users.</description> <value-attributes> <type>password</type> </value-attributes> + <on-ambari-upgrade add="false" change="true" delete="true"/> + <on-stack-upgrade add="true" change="true" delete="false"/> </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="false" change="true" delete="true"/> + <on-stack-upgrade add="true" change="true" delete="false"/> </property> - <property> <name>ranger.usersync.ldap.bindkeystore</name> - <value></value> + <value/> <description>Set same value as ranger.usersync.keystore.file property i.e default value /etc/ranger/usersync/conf/ugsync.jceks</description> <value-attributes> <empty-value-valid>true</empty-value-valid> </value-attributes> + <on-ambari-upgrade add="false" change="true" delete="true"/> + <on-stack-upgrade add="true" change="true" delete="false"/> </property> - <property> <name>ranger.usersync.ldap.searchBase</name> <value>dc=hadoop,dc=apache,dc=org</value> @@ -231,17 +253,19 @@ <value-attributes> <empty-value-valid>true</empty-value-valid> </value-attributes> + <on-ambari-upgrade add="false" change="true" delete="true"/> + <on-stack-upgrade add="true" change="true" delete="false"/> </property> - <property> <name>ranger.usersync.ldap.user.searchbase</name> <display-name>User Search Base</display-name> - <value></value> + <value/> <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="false" change="true" delete="true"/> + <on-stack-upgrade add="true" change="true" delete="false"/> </property> - <property> <name>ranger.usersync.ldap.user.searchscope</name> <display-name>User Search Scope</display-name> @@ -249,19 +273,21 @@ <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="false" change="true" delete="true"/> + <on-stack-upgrade add="true" change="true" delete="false"/> </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="false" change="true" delete="true"/> + <on-stack-upgrade add="true" change="true" delete="false"/> </property> - <property> <name>ranger.usersync.ldap.user.searchfilter</name> <display-name>âUser Search Filter</display-name> - <value></value> + <value/> <description>"optional additional filter constraining the users selected for syncing # a sample value would be (dept=eng) # please customize the value to suit your deployment @@ -269,15 +295,17 @@ <value-attributes> <empty-value-valid>true</empty-value-valid> </value-attributes> + <on-ambari-upgrade add="false" change="true" delete="true"/> + <on-stack-upgrade add="true" change="true" delete="false"/> </property> - <property> <name>ranger.usersync.ldap.user.nameattribute</name> <display-name>Username Attribute</display-name> - <value></value> + <value/> <description>LDAP user name attribute. Example: sAMAccountName in AD, uid or cn in OpenLDAP</description> + <on-ambari-upgrade add="false" change="true" delete="true"/> + <on-stack-upgrade add="true" change="true" delete="false"/> </property> - <property> <name>ranger.usersync.ldap.referral</name> <value>ignore</value> @@ -285,27 +313,31 @@ <value-attributes> <empty-value-valid>true</empty-value-valid> </value-attributes> + <on-ambari-upgrade add="false" change="true" delete="true"/> + <on-stack-upgrade add="true" change="true" delete="false"/> </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="false" change="true" delete="true"/> + <on-stack-upgrade add="true" change="true" delete="false"/> </property> - <property> <name>ranger.usersync.ldap.username.caseconversion</name> <value>none</value> <description>User name case conversion</description> + <on-ambari-upgrade add="false" change="true" delete="true"/> + <on-stack-upgrade add="true" change="true" delete="false"/> </property> - <property> <name>ranger.usersync.ldap.groupname.caseconversion</name> <value>none</value> <description>Group name case conversion</description> + <on-ambari-upgrade add="false" change="true" delete="true"/> + <on-stack-upgrade add="true" change="true" delete="false"/> </property> - <property> <name>ranger.usersync.logdir</name> <value>{{usersync_log_dir}}</value> @@ -314,8 +346,9 @@ <visible>false</visible> <overridable>false</overridable> </value-attributes> + <on-ambari-upgrade add="false" change="true" delete="true"/> + <on-stack-upgrade add="true" change="true" delete="false"/> </property> - <property> <name>ranger.usersync.group.searchenabled</name> <display-name>Enable Group Sync</display-name> @@ -340,8 +373,9 @@ </entries> <selection-cardinality>1</selection-cardinality> </value-attributes> + <on-ambari-upgrade add="false" change="true" delete="true"/> + <on-stack-upgrade add="true" change="true" delete="false"/> </property> - <property> <name>ranger.usersync.group.usermapsyncenabled</name> <value>true</value> @@ -363,61 +397,68 @@ </entries> <selection-cardinality>1</selection-cardinality> </value-attributes> + <on-ambari-upgrade add="false" change="true" delete="true"/> + <on-stack-upgrade add="true" change="true" delete="false"/> </property> - <property> <name>ranger.usersync.group.searchbase</name> <display-name>Group Search Base</display-name> - <value></value> + <value/> <description>"# search base for groups # sample value would be ou=groups,dc=hadoop,dc=apache,dc=org # 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="false" change="true" delete="true"/> + <on-stack-upgrade add="true" change="true" delete="false"/> </property> - <property> <name>ranger.usersync.group.searchscope</name> - <value></value> + <value/> <description>"# search scope for the groups, only base, one and sub are supported values # please customize the value to suit your deployment # default value: sub"</description> <value-attributes> <empty-value-valid>true</empty-value-valid> </value-attributes> + <on-ambari-upgrade add="false" change="true" delete="true"/> + <on-stack-upgrade add="true" change="true" delete="false"/> </property> - <property> <name>ranger.usersync.group.objectclass</name> <display-name>Group Object Class</display-name> - <value></value> + <value/> <description>LDAP Group object class. Example: group</description> + <on-ambari-upgrade add="false" change="true" delete="true"/> + <on-stack-upgrade add="true" change="true" delete="false"/> </property> - <property> <name>ranger.usersync.group.searchfilter</name> - <value></value> + <value/> <display-name>Group Search Filter</display-name> <description>"# optional additional filter constraining the groups selected for syncing # a sample value would be (dept=eng) # please customize the value to suit your deployment # default value is empty"</description> + <on-ambari-upgrade add="false" change="true" delete="true"/> + <on-stack-upgrade add="true" change="true" delete="false"/> </property> - <property> <name>ranger.usersync.group.nameattribute</name> <display-name>Group Name Attribute</display-name> - <value></value> + <value/> <description>LDAP group name attribute. Example: cn</description> + <on-ambari-upgrade add="false" change="true" delete="true"/> + <on-stack-upgrade add="true" change="true" delete="false"/> </property> - <property> <name>ranger.usersync.group.memberattributename</name> <display-name>Group Member Attribute</display-name> - <value></value> + <value/> <description>LDAP group member attribute name. Example: member</description> + <on-ambari-upgrade add="false" change="true" delete="true"/> + <on-stack-upgrade add="true" change="true" delete="false"/> </property> - <property> <name>ranger.usersync.pagedresultsenabled</name> <value>true</value> @@ -438,18 +479,21 @@ </entries> <selection-cardinality>1</selection-cardinality> </value-attributes> + <on-ambari-upgrade add="false" change="true" delete="true"/> + <on-stack-upgrade add="true" change="true" delete="false"/> </property> - <property> <name>ranger.usersync.pagedresultssize</name> <value>500</value> <description>Page size</description> + <on-ambari-upgrade add="false" change="true" delete="true"/> + <on-stack-upgrade add="true" change="true" delete="false"/> </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> - </property> - -</configuration> + <on-ambari-upgrade add="false" change="true" delete="true"/> + <on-stack-upgrade add="true" change="true" delete="false"/> + </property> +</configuration> http://git-wip-us.apache.org/repos/asf/ambari/blob/ed7c64ad/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 43e18c6..9524e1d 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,69 +23,103 @@ <property> <name>SYNC_SOURCE</name> <deleted>true</deleted> + <on-ambari-upgrade add="false" change="true" delete="true"/> + <on-stack-upgrade add="true" change="true" delete="false"/> </property> <property> <name>MIN_UNIX_USER_ID_TO_SYNC</name> <deleted>true</deleted> + <on-ambari-upgrade add="false" change="true" delete="true"/> + <on-stack-upgrade add="true" change="true" delete="false"/> </property> <property> <name>POLICY_MGR_URL</name> <deleted>true</deleted> + <on-ambari-upgrade add="false" change="true" delete="true"/> + <on-stack-upgrade add="true" change="true" delete="false"/> </property> <property> <name>SYNC_INTERVAL</name> <deleted>true</deleted> + <on-ambari-upgrade add="false" change="true" delete="true"/> + <on-stack-upgrade add="true" change="true" delete="false"/> </property> <property> <name>SYNC_LDAP_URL</name> <deleted>true</deleted> + <on-ambari-upgrade add="false" change="true" delete="true"/> + <on-stack-upgrade add="true" change="true" delete="false"/> </property> <property> <name>SYNC_LDAP_BIND_DN</name> <deleted>true</deleted> + <on-ambari-upgrade add="false" change="true" delete="true"/> + <on-stack-upgrade add="true" change="true" delete="false"/> </property> <property> <name>SYNC_LDAP_BIND_PASSWORD</name> <deleted>true</deleted> + <on-ambari-upgrade add="false" change="true" delete="true"/> + <on-stack-upgrade add="true" change="true" delete="false"/> </property> <property> <name>CRED_KEYSTORE_FILENAME</name> <deleted>true</deleted> + <on-ambari-upgrade add="false" change="true" delete="true"/> + <on-stack-upgrade add="true" change="true" delete="false"/> </property> <property> <name>SYNC_LDAP_USER_SEARCH_BASE</name> <deleted>true</deleted> + <on-ambari-upgrade add="false" change="true" delete="true"/> + <on-stack-upgrade add="true" change="true" delete="false"/> </property> <property> <name>SYNC_LDAP_USER_SEARCH_SCOPE</name> <deleted>true</deleted> + <on-ambari-upgrade add="false" change="true" delete="true"/> + <on-stack-upgrade add="true" change="true" delete="false"/> </property> <property> <name>SYNC_LDAP_USER_OBJECT_CLASS</name> <deleted>true</deleted> + <on-ambari-upgrade add="false" change="true" delete="true"/> + <on-stack-upgrade add="true" change="true" delete="false"/> </property> <property> <name>SYNC_LDAP_USER_SEARCH_FILTER</name> <deleted>true</deleted> + <on-ambari-upgrade add="false" change="true" delete="true"/> + <on-stack-upgrade add="true" change="true" delete="false"/> </property> <property> <name>SYNC_LDAP_USER_NAME_ATTRIBUTE</name> <deleted>true</deleted> + <on-ambari-upgrade add="false" change="true" delete="true"/> + <on-stack-upgrade add="true" change="true" delete="false"/> </property> <property> <name>SYNC_LDAP_USER_GROUP_NAME_ATTRIBUTE</name> <deleted>true</deleted> + <on-ambari-upgrade add="false" change="true" delete="true"/> + <on-stack-upgrade add="true" change="true" delete="false"/> </property> <property> <name>SYNC_LDAP_USERNAME_CASE_CONVERSION</name> <deleted>true</deleted> + <on-ambari-upgrade add="false" change="true" delete="true"/> + <on-stack-upgrade add="true" change="true" delete="false"/> </property> <property> <name>SYNC_LDAP_GROUPNAME_CASE_CONVERSION</name> <deleted>true</deleted> + <on-ambari-upgrade add="false" change="true" delete="true"/> + <on-stack-upgrade add="true" change="true" delete="false"/> </property> <property> <name>logdir</name> <deleted>true</deleted> + <on-ambari-upgrade add="false" change="true" delete="true"/> + <on-stack-upgrade add="true" change="true" delete="false"/> </property> -</configuration> \ No newline at end of file +</configuration> http://git-wip-us.apache.org/repos/asf/ambari/blob/ed7c64ad/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 715093b..2a15750 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 @@ -19,12 +19,11 @@ */ --> <configuration supports_adding_forbidden="true"> - - <property> - <name>content</name> - <display-name>admin-log4j template</display-name> - <description>admin-log4j.properties</description> - <value> + <property> + <name>content</name> + <display-name>admin-log4j template</display-name> + <description>admin-log4j.properties</description> + <value> # # Licensed to the Apache Software Foundation (ASF) under one # or more contributor license agreements. See the NOTICE file @@ -100,10 +99,11 @@ log4j.additivity.jdbc.resultset=false log4j.category.jdbc.connection=fatal,sql_appender log4j.additivity.jdbc.connection=false </value> - <value-attributes> - <type>content</type> - <show-property-name>false</show-property-name> - </value-attributes> - </property> - -</configuration> \ No newline at end of file + <value-attributes> + <type>content</type> + <show-property-name>false</show-property-name> + </value-attributes> + <on-ambari-upgrade add="false" change="true" delete="true"/> + <on-stack-upgrade add="true" change="true" delete="false"/> + </property> +</configuration> http://git-wip-us.apache.org/repos/asf/ambari/blob/ed7c64ad/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 c81d892..3e026ec 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 @@ -20,20 +20,22 @@ */ --> <configuration> - <property> <name>audit_db_name</name> <deleted>true</deleted> + <on-ambari-upgrade add="false" change="true" delete="true"/> + <on-stack-upgrade add="true" change="true" delete="false"/> </property> - <property> <name>audit_db_user</name> <deleted>true</deleted> + <on-ambari-upgrade add="false" change="true" delete="true"/> + <on-stack-upgrade add="true" change="true" delete="false"/> </property> - <property> <name>audit_db_password</name> <deleted>true</deleted> + <on-ambari-upgrade add="false" change="true" delete="true"/> + <on-stack-upgrade add="true" change="true" delete="false"/> </property> - -</configuration> \ No newline at end of file +</configuration> http://git-wip-us.apache.org/repos/asf/ambari/blob/ed7c64ad/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 e146c90..07170f3 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 @@ -15,128 +15,144 @@ See the License for the specific language governing permissions and limitations under the License. --> - <configuration> - <property> <name>ranger.jpa.audit.jdbc.driver</name> <deleted>true</deleted> + <on-ambari-upgrade add="false" change="true" delete="true"/> + <on-stack-upgrade add="true" change="true" delete="false"/> </property> - <property> <name>ranger.jpa.audit.jdbc.url</name> <deleted>true</deleted> + <on-ambari-upgrade add="false" change="true" delete="true"/> + <on-stack-upgrade add="true" change="true" delete="false"/> </property> - <property> <name>ranger.jpa.audit.jdbc.user</name> <deleted>true</deleted> + <on-ambari-upgrade add="false" change="true" delete="true"/> + <on-stack-upgrade add="true" change="true" delete="false"/> </property> - <property> <name>ranger.jpa.audit.jdbc.password</name> <deleted>true</deleted> + <on-ambari-upgrade add="false" change="true" delete="true"/> + <on-stack-upgrade add="true" change="true" delete="false"/> </property> - <property> <name>ranger.jpa.audit.jdbc.credential.alias</name> <deleted>true</deleted> + <on-ambari-upgrade add="false" change="true" delete="true"/> + <on-stack-upgrade add="true" change="true" delete="false"/> </property> - <property> <name>ranger.jpa.audit.jdbc.dialect</name> <deleted>true</deleted> + <on-ambari-upgrade add="false" change="true" delete="true"/> + <on-stack-upgrade add="true" change="true" delete="false"/> </property> - <property> <name>ranger.admin.kerberos.token.valid.seconds</name> <value>30</value> - <description></description> + <description/> + <on-ambari-upgrade add="false" change="true" delete="true"/> + <on-stack-upgrade add="true" change="true" delete="false"/> </property> - <property> <name>ranger.admin.kerberos.cookie.domain</name> - <value></value> - <description></description> + <value/> + <description/> <value-attributes> <empty-value-valid>true</empty-value-valid> </value-attributes> + <on-ambari-upgrade add="false" change="true" delete="true"/> + <on-stack-upgrade add="true" change="true" delete="false"/> </property> - <property> <name>ranger.admin.kerberos.cookie.path</name> <value>/</value> - <description></description> + <description/> + <on-ambari-upgrade add="false" change="true" delete="true"/> + <on-stack-upgrade add="true" change="true" delete="false"/> </property> - <property> <name>ranger.spnego.kerberos.principal</name> - <value></value> - <description></description> + <value/> + <description/> <value-attributes> <empty-value-valid>true</empty-value-valid> </value-attributes> + <on-ambari-upgrade add="false" change="true" delete="true"/> + <on-stack-upgrade add="true" change="true" delete="false"/> </property> - <property> <name>ranger.spnego.kerberos.keytab</name> - <value></value> - <description></description> + <value/> + <description/> <value-attributes> <empty-value-valid>true</empty-value-valid> </value-attributes> + <on-ambari-upgrade add="false" change="true" delete="true"/> + <on-stack-upgrade add="true" change="true" delete="false"/> </property> - <property> <name>ranger.admin.kerberos.principal</name> - <value></value> - <description></description> + <value/> + <description/> <value-attributes> <empty-value-valid>true</empty-value-valid> </value-attributes> + <on-ambari-upgrade add="false" change="true" delete="true"/> + <on-stack-upgrade add="true" change="true" delete="false"/> </property> - <property> <name>ranger.admin.kerberos.keytab</name> - <value></value> - <description></description> + <value/> + <description/> <value-attributes> <empty-value-valid>true</empty-value-valid> </value-attributes> + <on-ambari-upgrade add="false" change="true" delete="true"/> + <on-stack-upgrade add="true" change="true" delete="false"/> </property> - <property> <name>ranger.lookup.kerberos.principal</name> - <value></value> - <description></description> + <value/> + <description/> <value-attributes> <empty-value-valid>true</empty-value-valid> </value-attributes> + <on-ambari-upgrade add="false" change="true" delete="true"/> + <on-stack-upgrade add="true" change="true" delete="false"/> </property> - <property> <name>ranger.lookup.kerberos.keytab</name> - <value></value> - <description></description> + <value/> + <description/> <value-attributes> <empty-value-valid>true</empty-value-valid> </value-attributes> + <on-ambari-upgrade add="false" change="true" delete="true"/> + <on-stack-upgrade add="true" change="true" delete="false"/> </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="false" change="true" delete="true"/> + <on-stack-upgrade add="true" change="true" delete="false"/> </property> - <property> <name>ranger.truststore.password</name> <value>changeit</value> <property-type>PASSWORD</property-type> <display-name>ranger.truststore.password</display-name> <description>Ranger trust-store password</description> + <on-ambari-upgrade add="false" change="true" delete="true"/> + <on-stack-upgrade add="true" change="true" delete="false"/> </property> - <property> <name>ranger.audit.solr.zookeepers</name> <value>NONE</value> @@ -151,16 +167,22 @@ <name>is_solrCloud_enabled</name> </property> </depends-on> + <on-ambari-upgrade add="false" change="true" delete="true"/> + <on-stack-upgrade add="true" change="true" delete="false"/> </property> <property> <name>ranger.sso.cookiename</name> <deleted>true</deleted> + <on-ambari-upgrade add="true" change="false" delete="false"/> + <on-stack-upgrade add="true" change="false" delete="false"/> </property> <property> <name>ranger.sso.query.param.originalurl</name> <deleted>true</deleted> + <on-ambari-upgrade add="true" change="false" delete="false"/> + <on-stack-upgrade add="true" change="false" delete="false"/> </property> <property> @@ -170,6 +192,8 @@ <value-attributes> <overridable>false</overridable> </value-attributes> + <on-ambari-upgrade add="true" change="false" delete="false"/> + <on-stack-upgrade add="true" change="false" delete="false"/> </property> <property> @@ -180,6 +204,8 @@ <value-attributes> <overridable>false</overridable> </value-attributes> + <on-ambari-upgrade add="true" change="false" delete="false"/> + <on-stack-upgrade add="true" change="false" delete="false"/> </property> <property> @@ -195,6 +221,8 @@ <name>hdfs_user</name> </property> </depends-on> + <on-ambari-upgrade add="true" change="false" delete="false"/> + <on-stack-upgrade add="true" change="false" delete="false"/> </property> <property> @@ -210,5 +238,7 @@ <name>hive_user</name> </property> </depends-on> + <on-ambari-upgrade add="true" change="false" delete="false"/> + <on-stack-upgrade add="true" change="false" delete="false"/> </property> </configuration> http://git-wip-us.apache.org/repos/asf/ambari/blob/ed7c64ad/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 de7be59..4db7f45 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 @@ -20,25 +20,28 @@ */ --> <configuration> - <property> <name>xasecure.audit.destination.db</name> <deleted>true</deleted> + <on-ambari-upgrade add="false" change="true" delete="true"/> + <on-stack-upgrade add="true" change="true" delete="false"/> </property> - <property> - <name>ranger_solr_config_set</name> + <name>ranger_solr_config_set</name> <value>ranger_audits</value> + <on-ambari-upgrade add="false" change="true" delete="true"/> + <on-stack-upgrade add="true" change="true" delete="false"/> </property> - <property> <name>ranger_solr_collection_name</name> <value>ranger_audits</value> + <on-ambari-upgrade add="false" change="true" delete="true"/> + <on-stack-upgrade add="true" change="true" delete="false"/> </property> - <property> <name>ranger_solr_shards</name> <value>1</value> + <on-ambari-upgrade add="false" change="true" delete="true"/> + <on-stack-upgrade add="true" change="true" delete="false"/> </property> - -</configuration> \ No newline at end of file +</configuration> http://git-wip-us.apache.org/repos/asf/ambari/blob/ed7c64ad/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 220355f..848310d 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 @@ -18,9 +18,7 @@ * limitations under the License. */ --> - <configuration supports_final="true"> - <property> <name>ranger.tagsync.logdir</name> <value>/var/log/ranger/tagsync</value> @@ -30,8 +28,9 @@ <overridable>false</overridable> <editable-only-at-install>true</editable-only-at-install> </value-attributes> + <on-ambari-upgrade add="false" change="true" delete="true"/> + <on-stack-upgrade add="true" change="true" delete="false"/> </property> - <property> <name>ranger.tagsync.dest.ranger.endpoint</name> <value>{{ranger_external_url}}</value> @@ -39,13 +38,14 @@ <value-attributes> <empty-value-valid>true</empty-value-valid> </value-attributes> + <on-ambari-upgrade add="false" change="true" delete="true"/> + <on-stack-upgrade add="true" change="true" delete="false"/> </property> - <property> <name>ranger.tagsync.source.atlas</name> <display-name>Enable Atlas Tag Source</display-name> <value>false</value> - <description></description> + <description/> <value-attributes> <type>boolean</type> </value-attributes> @@ -55,63 +55,70 @@ <name>atlas.server.bind.address</name> </property> </depends-on> + <on-ambari-upgrade add="false" change="true" delete="true"/> + <on-stack-upgrade add="true" change="true" delete="false"/> </property> - <property> <name>ranger.tagsync.source.atlasrest</name> <display-name>Enable AtlasRest Tag Source</display-name> <value>false</value> - <description></description> + <description/> <value-attributes> <type>boolean</type> </value-attributes> + <on-ambari-upgrade add="false" change="true" delete="true"/> + <on-stack-upgrade add="true" change="true" delete="false"/> </property> - <property> <name>ranger.tagsync.source.file</name> <display-name>Enable File Tag Source</display-name> <value>false</value> - <description></description> + <description/> <value-attributes> <type>boolean</type> </value-attributes> + <on-ambari-upgrade add="false" change="true" delete="true"/> + <on-stack-upgrade add="true" change="true" delete="false"/> </property> - <property> <name>ranger.tagsync.source.file.check.interval.millis</name> <display-name>File Source: File update polling interval</display-name> - <value></value> - <description></description> + <value/> + <description/> <value-attributes> <empty-value-valid>true</empty-value-valid> </value-attributes> + <on-ambari-upgrade add="false" change="true" delete="true"/> + <on-stack-upgrade add="true" change="true" delete="false"/> </property> - <property> <name>ranger.tagsync.source.atlasrest.download.interval.millis</name> <display-name>AtlasREST Source: Atlas source download interval</display-name> - <value></value> + <value/> <value-attributes> <empty-value-valid>true</empty-value-valid> </value-attributes> + <on-ambari-upgrade add="false" change="true" delete="true"/> + <on-stack-upgrade add="true" change="true" delete="false"/> </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="false" change="true" delete="true"/> + <on-stack-upgrade add="true" change="true" delete="false"/> </property> - <property> <name>ranger.tagsync.source.file.filename</name> <display-name>File Source: Filename</display-name> - <value></value> + <value/> <description>File Source Filename</description> <value-attributes> <empty-value-valid>true</empty-value-valid> </value-attributes> + <on-ambari-upgrade add="false" change="true" delete="true"/> + <on-stack-upgrade add="true" change="true" delete="false"/> </property> - <property> <name>ranger.tagsync.keystore.filename</name> <value>/etc/ranger/tagsync/conf/rangertagsync.jceks</value> @@ -119,58 +126,65 @@ <value-attributes> <empty-value-valid>true</empty-value-valid> </value-attributes> + <on-ambari-upgrade add="false" change="true" delete="true"/> + <on-stack-upgrade add="true" change="true" delete="false"/> </property> - <property> <name>ranger.tagsync.atlas.to.ranger.service.mapping</name> - <value></value> + <value/> <description>Service Mapping</description> <value-attributes> <empty-value-valid>true</empty-value-valid> </value-attributes> + <on-ambari-upgrade add="false" change="true" delete="true"/> + <on-stack-upgrade add="true" change="true" delete="false"/> </property> - <property> <name>ranger.tagsync.source.atlasrest.endpoint</name> <display-name>AtlasREST Source: Atlas endpoint</display-name> - <value></value> - <description></description> + <value/> + <description/> <value-attributes> <empty-value-valid>true</empty-value-valid> </value-attributes> + <on-ambari-upgrade add="false" change="true" delete="true"/> + <on-stack-upgrade add="true" change="true" delete="false"/> </property> - <property> <name>ranger.tagsync.atlas.custom.resource.mappers</name> - <value></value> - <description></description> + <value/> + <description/> <value-attributes> <empty-value-valid>true</empty-value-valid> </value-attributes> + <on-ambari-upgrade add="false" change="true" delete="true"/> + <on-stack-upgrade add="true" change="true" delete="false"/> </property> - <property> <name>ranger.tagsync.kerberos.principal</name> - <value></value> - <description></description> + <value/> + <description/> <value-attributes> <empty-value-valid>true</empty-value-valid> </value-attributes> + <on-ambari-upgrade add="false" change="true" delete="true"/> + <on-stack-upgrade add="true" change="true" delete="false"/> </property> - <property> <name>ranger.tagsync.kerberos.keytab</name> - <value></value> - <description></description> + <value/> + <description/> <value-attributes> <empty-value-valid>true</empty-value-valid> </value-attributes> + <on-ambari-upgrade add="false" change="true" delete="true"/> + <on-stack-upgrade add="true" change="true" delete="false"/> </property> - <property> <name>ranger.tagsync.dest.ranger.username</name> <value>rangertagsync</value> - <description></description> + <description/> + <on-ambari-upgrade add="false" change="true" delete="true"/> + <on-stack-upgrade add="true" change="true" delete="false"/> </property> - </configuration> http://git-wip-us.apache.org/repos/asf/ambari/blob/ed7c64ad/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 9e5b8ee..8d20455 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 @@ -15,50 +15,53 @@ See the License for the specific language governing permissions and limitations under the License. --> - <configuration> - <property> <name>ranger.usersync.kerberos.principal</name> - <value></value> - <description></description> + <value/> + <description/> <value-attributes> <empty-value-valid>true</empty-value-valid> </value-attributes> + <on-ambari-upgrade add="false" change="true" delete="true"/> + <on-stack-upgrade add="true" change="true" delete="false"/> </property> - <property> <name>ranger.usersync.kerberos.keytab</name> - <value></value> - <description></description> + <value/> + <description/> <value-attributes> <empty-value-valid>true</empty-value-valid> </value-attributes> + <on-ambari-upgrade add="false" change="true" delete="true"/> + <on-stack-upgrade add="true" change="true" delete="false"/> </property> - <property> <name>ranger.usersync.policymgr.username</name> <value>rangerusersync</value> - <description></description> + <description/> + <on-ambari-upgrade add="false" change="true" delete="true"/> + <on-stack-upgrade add="true" change="true" delete="false"/> </property> - <property> <name>ranger.usersync.policymgr.alias</name> <value>ranger.usersync.policymgr.password</value> - <description></description> + <description/> + <on-ambari-upgrade add="false" change="true" delete="true"/> + <on-stack-upgrade add="true" change="true" delete="false"/> </property> - <property> <name>ranger.usersync.policymgr.keystore</name> <value>/etc/ranger/usersync/conf/ugsync.jceks</value> - <description></description> + <description/> + <on-ambari-upgrade add="false" change="true" delete="true"/> + <on-stack-upgrade add="true" change="true" delete="false"/> </property> - <property> <name>ranger.usersync.group.search.first.enabled</name> <display-name>Enable Group Search First</display-name> <value>false</value> - <description></description> + <description/> <value-attributes> <type>value-list</type> <overridable>false</overridable> @@ -74,13 +77,14 @@ </entries> <selection-cardinality>1</selection-cardinality> </value-attributes> + <on-ambari-upgrade add="false" change="true" delete="true"/> + <on-stack-upgrade add="true" change="true" delete="false"/> </property> - <property> <name>ranger.usersync.user.searchenabled</name> <display-name>Enable User Search</display-name> <value>false</value> - <description></description> + <description/> <value-attributes> <type>value-list</type> <overridable>false</overridable> @@ -93,9 +97,10 @@ <value>false</value> <label>No</label> </entry> - </entries> + </entries> <selection-cardinality>1</selection-cardinality> </value-attributes> + <on-ambari-upgrade add="false" change="true" delete="true"/> + <on-stack-upgrade add="true" change="true" delete="false"/> </property> - -</configuration> \ No newline at end of file +</configuration> http://git-wip-us.apache.org/repos/asf/ambari/blob/ed7c64ad/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 66151d9..3f3cf97 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 @@ -1,3 +1,4 @@ +<?xml version="1.0"?> <?xml-stylesheet type="text/xsl" href="configuration.xsl"?> <!-- /** @@ -18,21 +19,20 @@ * limitations under the License. */ --> - <configuration> - <property> <name>atlas.kafka.entities.group.id</name> <display-name>Atlas Source: Kafka consumer group</display-name> <value>ranger_entities_consumer</value> - <description></description> + <description/> + <on-ambari-upgrade add="false" change="true" delete="true"/> + <on-stack-upgrade add="true" change="true" delete="false"/> </property> - <property> <name>atlas.kafka.bootstrap.servers</name> <display-name>Atlas Source: Kafka endpoint</display-name> <value>localhost:6667</value> - <description></description> + <description/> <depends-on> <property> <type>kafka-broker</type> @@ -42,13 +42,14 @@ <value-attributes> <empty-value-valid>true</empty-value-valid> </value-attributes> + <on-ambari-upgrade add="false" change="true" delete="true"/> + <on-stack-upgrade add="true" change="true" delete="false"/> </property> - <property> <name>atlas.kafka.zookeeper.connect</name> <display-name>Atlas Source: Zookeeper endpoint</display-name> <value>localhost:2181</value> - <description></description> + <description/> <depends-on> <property> <type>zoo.cfg</type> @@ -58,6 +59,7 @@ <value-attributes> <empty-value-valid>true</empty-value-valid> </value-attributes> + <on-ambari-upgrade add="false" change="true" delete="true"/> + <on-stack-upgrade add="true" change="true" delete="false"/> </property> - -</configuration> \ No newline at end of file +</configuration> http://git-wip-us.apache.org/repos/asf/ambari/blob/ed7c64ad/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 bf21045..e0d56a3 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 @@ -19,12 +19,11 @@ */ --> <configuration supports_adding_forbidden="true"> - - <property> - <name>content</name> - <display-name>tagsync-log4j template</display-name> - <description>tagsync-log4j.properties</description> - <value> + <property> + <name>content</name> + <display-name>tagsync-log4j template</display-name> + <description>tagsync-log4j.properties</description> + <value> # # Licensed to the Apache Software Foundation (ASF) under one # or more contributor license agreements. See the NOTICE file @@ -59,10 +58,11 @@ log4j.appender.console.Target=System.out log4j.appender.console.layout=org.apache.log4j.PatternLayout log4j.appender.console.layout.ConversionPattern=%d{dd MMM yyyy HH:mm:ss} %5p %c{1} [%t] - %L %m%n </value> - <value-attributes> - <type>content</type> - <show-property-name>false</show-property-name> - </value-attributes> - </property> - -</configuration> \ No newline at end of file + <value-attributes> + <type>content</type> + <show-property-name>false</show-property-name> + </value-attributes> + <on-ambari-upgrade add="false" change="true" delete="true"/> + <on-stack-upgrade add="true" change="true" delete="false"/> + </property> +</configuration> http://git-wip-us.apache.org/repos/asf/ambari/blob/ed7c64ad/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 f83fa63..7c6a984 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 @@ -19,12 +19,11 @@ */ --> <configuration supports_adding_forbidden="true"> - - <property> - <name>content</name> - <display-name>usersync-log4j template</display-name> - <description>usersync-log4j.properties</description> - <value> + <property> + <name>content</name> + <display-name>usersync-log4j template</display-name> + <description>usersync-log4j.properties</description> + <value> # # Licensed to the Apache Software Foundation (ASF) under one # or more contributor license agreements. See the NOTICE file @@ -58,10 +57,11 @@ log4j.appender.console.Target=System.out log4j.appender.console.layout=org.apache.log4j.PatternLayout log4j.appender.console.layout.ConversionPattern=%d{dd MMM yyyy HH:mm:ss} %5p %c{1} [%t] - %m%n </value> - <value-attributes> - <type>content</type> - <show-property-name>false</show-property-name> - </value-attributes> - </property> - -</configuration> \ No newline at end of file + <value-attributes> + <type>content</type> + <show-property-name>false</show-property-name> + </value-attributes> + <on-ambari-upgrade add="false" change="true" delete="true"/> + <on-stack-upgrade add="true" change="true" delete="false"/> + </property> +</configuration> http://git-wip-us.apache.org/repos/asf/ambari/blob/ed7c64ad/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 076f0b7..a41cb2f 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 @@ -18,25 +18,25 @@ * limitations under the License. */ --> - <configuration> - <property> <name>hadoop.kms.blacklist.DECRYPT_EEK</name> <value>hdfs</value> <description>Blacklist for decrypt EncryptedKey CryptoExtension operations</description> + <on-ambari-upgrade add="false" change="true" delete="true"/> + <on-stack-upgrade add="true" change="true" delete="false"/> </property> - <property> - <name>ranger.db.encrypt.key.password</name> + <name>ranger.db.encrypt.key.password</name> <value>_</value> <property-type>PASSWORD</property-type> <value-attributes> <type>password</type> </value-attributes> <description>Password used for encrypting Master Key</description> + <on-ambari-upgrade add="false" change="true" delete="true"/> + <on-stack-upgrade add="true" change="true" delete="false"/> </property> - <property> <name>ranger.ks.jpa.jdbc.url</name> <display-name>JDBC connect string</display-name> @@ -59,14 +59,16 @@ <name>db_name</name> </property> </depends-on> + <on-ambari-upgrade add="false" change="true" delete="true"/> + <on-stack-upgrade add="true" change="true" delete="false"/> </property> - <property> <name>ranger.ks.jpa.jdbc.user</name> <value>{{db_user}}</value> <description>Database username used for operation</description> + <on-ambari-upgrade add="false" change="true" delete="true"/> + <on-stack-upgrade add="true" change="true" delete="false"/> </property> - <property> <name>ranger.ks.jpa.jdbc.password</name> <value>_</value> @@ -75,32 +77,37 @@ <type>password</type> </value-attributes> <description>Database user's password</description> + <on-ambari-upgrade add="false" change="true" delete="true"/> + <on-stack-upgrade add="true" change="true" delete="false"/> </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="false" change="true" delete="true"/> + <on-stack-upgrade add="true" change="true" delete="false"/> </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="false" change="true" delete="true"/> + <on-stack-upgrade add="true" change="true" delete="false"/> </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="false" change="true" delete="true"/> + <on-stack-upgrade add="true" change="true" delete="false"/> </property> - <property> <name>ranger.ks.jpa.jdbc.dialect</name> <value>{{jdbc_dialect}}</value> - <description>Dialect used for database</description> + <description>Dialect used for database</description> + <on-ambari-upgrade add="false" change="true" delete="true"/> + <on-stack-upgrade add="true" change="true" delete="false"/> </property> - <property> <name>ranger.ks.jpa.jdbc.driver</name> <display-name>Driver class name for a JDBC Ranger KMS database</display-name> @@ -115,12 +122,14 @@ <name>DB_FLAVOR</name> </property> </depends-on> + <on-ambari-upgrade add="false" change="true" delete="true"/> + <on-stack-upgrade add="true" change="true" delete="false"/> </property> - <property> <name>ranger.ks.jdbc.sqlconnectorjar</name> <value>{{ews_lib_jar_path}}</value> <description>Driver used for database</description> - </property> - + <on-ambari-upgrade add="false" change="true" delete="true"/> + <on-stack-upgrade add="true" change="true" delete="false"/> + </property> </configuration> http://git-wip-us.apache.org/repos/asf/ambari/blob/ed7c64ad/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 f62c529..c0365bc 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 @@ -19,7 +19,6 @@ */ --> <configuration supports_adding_forbidden="true"> - <property> <name>kms_user</name> <display-name>Kms User</display-name> @@ -30,8 +29,9 @@ <type>user</type> <overridable>false</overridable> </value-attributes> + <on-ambari-upgrade add="false" change="true" delete="true"/> + <on-stack-upgrade add="true" change="true" delete="false"/> </property> - <property> <name>kms_group</name> <display-name>Kms group</display-name> @@ -41,25 +41,28 @@ <value-attributes> <type>user</type> </value-attributes> + <on-ambari-upgrade add="false" change="true" delete="true"/> + <on-stack-upgrade add="true" change="true" delete="false"/> </property> - <property> <name>kms_log_dir</name> <value>/var/log/ranger/kms</value> - <description></description> + <description/> <value-attributes> <type>directory</type> <overridable>false</overridable> <editable-only-at-install>true</editable-only-at-install> </value-attributes> + <on-ambari-upgrade add="false" change="true" delete="true"/> + <on-stack-upgrade add="true" change="true" delete="false"/> </property> - <property> <name>kms_port</name> <value>9292</value> - <description></description> + <description/> + <on-ambari-upgrade add="false" change="true" delete="true"/> + <on-stack-upgrade add="true" change="true" delete="false"/> </property> - <property> <name>create_db_user</name> <display-name>Setup Database and Database User</display-name> @@ -80,6 +83,7 @@ </entries> <selection-cardinality>1</selection-cardinality> </value-attributes> + <on-ambari-upgrade add="false" change="true" delete="true"/> + <on-stack-upgrade add="true" change="true" delete="false"/> </property> - -</configuration> +</configuration> http://git-wip-us.apache.org/repos/asf/ambari/blob/ed7c64ad/ambari-server/src/main/resources/common-services/RANGER_KMS/0.5.0.2.3/configuration/kms-log4j.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/common-services/RANGER_KMS/0.5.0.2.3/configuration/kms-log4j.xml b/ambari-server/src/main/resources/common-services/RANGER_KMS/0.5.0.2.3/configuration/kms-log4j.xml index ee9b5df..f9e5505 100644 --- a/ambari-server/src/main/resources/common-services/RANGER_KMS/0.5.0.2.3/configuration/kms-log4j.xml +++ b/ambari-server/src/main/resources/common-services/RANGER_KMS/0.5.0.2.3/configuration/kms-log4j.xml @@ -19,7 +19,6 @@ */ --> <configuration supports_adding_forbidden="true"> - <property> <name>content</name> <display-name>kms-log4j template</display-name> @@ -68,6 +67,7 @@ log4j.logger.com.sun.jersey.server.wadl.generators.WadlGeneratorJAXBGrammarGener <type>content</type> <show-property-name>false</show-property-name> </value-attributes> - </property> - -</configuration> \ No newline at end of file + <on-ambari-upgrade add="false" change="true" delete="true"/> + <on-stack-upgrade add="true" change="true" delete="false"/> + </property> +</configuration> http://git-wip-us.apache.org/repos/asf/ambari/blob/ed7c64ad/ambari-server/src/main/resources/common-services/RANGER_KMS/0.5.0.2.3/configuration/kms-properties.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/common-services/RANGER_KMS/0.5.0.2.3/configuration/kms-properties.xml b/ambari-server/src/main/resources/common-services/RANGER_KMS/0.5.0.2.3/configuration/kms-properties.xml index 0da8d89..d1ec672 100644 --- a/ambari-server/src/main/resources/common-services/RANGER_KMS/0.5.0.2.3/configuration/kms-properties.xml +++ b/ambari-server/src/main/resources/common-services/RANGER_KMS/0.5.0.2.3/configuration/kms-properties.xml @@ -19,25 +19,26 @@ */ --> <configuration> - <property> <name>REPOSITORY_CONFIG_USERNAME</name> <display-name>Repository config username</display-name> <value>keyadmin</value> - <description></description> + <description/> + <on-ambari-upgrade add="false" change="true" delete="true"/> + <on-stack-upgrade add="true" change="true" delete="false"/> </property> - <property> <name>REPOSITORY_CONFIG_PASSWORD</name> <display-name>Repository config password</display-name> <value>keyadmin</value> <property-type>PASSWORD</property-type> - <description></description> + <description/> <value-attributes> <type>password</type> </value-attributes> - </property> - + <on-ambari-upgrade add="false" change="true" delete="true"/> + <on-stack-upgrade add="true" change="true" delete="false"/> + </property> <property> <name>DB_FLAVOR</name> <display-name>DB FLAVOR</display-name> @@ -70,8 +71,9 @@ </entries> <selection-cardinality>1</selection-cardinality> </value-attributes> + <on-ambari-upgrade add="false" change="true" delete="true"/> + <on-stack-upgrade add="true" change="true" delete="false"/> </property> - <property> <name>SQL_CONNECTOR_JAR</name> <display-name>SQL connector jar</display-name> @@ -86,8 +88,9 @@ <name>DB_FLAVOR</name> </property> </depends-on> + <on-ambari-upgrade add="false" change="true" delete="true"/> + <on-stack-upgrade add="true" change="true" delete="false"/> </property> - <property> <name>db_root_user</name> <display-name>Database Administrator (DBA) username</display-name> @@ -96,30 +99,33 @@ <value-attributes> <overridable>false</overridable> </value-attributes> + <on-ambari-upgrade add="false" change="true" delete="true"/> + <on-stack-upgrade add="true" change="true" delete="false"/> </property> - <property> <name>db_root_password</name> <display-name>Database Administrator (DBA) password</display-name> - <value></value> + <value/> <property-type>PASSWORD</property-type> <description>Database password for the database admin username</description> <value-attributes> <type>password</type> <overridable>false</overridable> </value-attributes> + <on-ambari-upgrade add="false" change="true" delete="true"/> + <on-stack-upgrade add="true" change="true" delete="false"/> </property> - <property> <name>db_host</name> <display-name>Ranger KMS DB host</display-name> - <value></value> + <value/> <description>Database host</description> <value-attributes> <overridable>false</overridable> </value-attributes> + <on-ambari-upgrade add="false" change="true" delete="true"/> + <on-stack-upgrade add="true" change="true" delete="false"/> </property> - <property> <name>db_name</name> <display-name>Ranger KMS DB name</display-name> @@ -128,8 +134,9 @@ <value-attributes> <overridable>false</overridable> </value-attributes> + <on-ambari-upgrade add="false" change="true" delete="true"/> + <on-stack-upgrade add="true" change="true" delete="false"/> </property> - <property> <name>db_user</name> <display-name>Ranger KMS DB username</display-name> @@ -138,30 +145,33 @@ <value-attributes> <overridable>false</overridable> </value-attributes> + <on-ambari-upgrade add="false" change="true" delete="true"/> + <on-stack-upgrade add="true" change="true" delete="false"/> </property> - <property> <name>db_password</name> <display-name>Ranger KMS DB password</display-name> - <value></value> + <value/> <property-type>PASSWORD</property-type> <description>Database password for the Ranger KMS schema</description> <value-attributes> <type>password</type> <overridable>false</overridable> </value-attributes> + <on-ambari-upgrade add="false" change="true" delete="true"/> + <on-stack-upgrade add="true" change="true" delete="false"/> </property> - <property> <name>KMS_MASTER_KEY_PASSWD</name> <display-name>KMS master key password</display-name> - <value></value> + <value/> <property-type>PASSWORD</property-type> - <description></description> + <description/> <value-attributes> <type>password</type> <overridable>false</overridable> </value-attributes> + <on-ambari-upgrade add="false" change="true" delete="true"/> + <on-stack-upgrade add="true" change="true" delete="false"/> </property> - -</configuration> +</configuration> http://git-wip-us.apache.org/repos/asf/ambari/blob/ed7c64ad/ambari-server/src/main/resources/common-services/RANGER_KMS/0.5.0.2.3/configuration/kms-site.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/common-services/RANGER_KMS/0.5.0.2.3/configuration/kms-site.xml b/ambari-server/src/main/resources/common-services/RANGER_KMS/0.5.0.2.3/configuration/kms-site.xml index 86d242e..ac3fa46 100644 --- a/ambari-server/src/main/resources/common-services/RANGER_KMS/0.5.0.2.3/configuration/kms-site.xml +++ b/ambari-server/src/main/resources/common-services/RANGER_KMS/0.5.0.2.3/configuration/kms-site.xml @@ -19,65 +19,73 @@ */ --> <configuration> - <property> <name>hadoop.kms.key.provider.uri</name> <value>dbks://http@localhost:9292/kms</value> <property-type>DONT_ADD_ON_UPGRADE</property-type> <description>URI of the backing KeyProvider for the KMS.</description> + <on-ambari-upgrade add="false" change="true" delete="true"/> + <on-stack-upgrade add="true" change="true" delete="false"/> </property> - <property> <name>hadoop.security.keystore.JavaKeyStoreProvider.password</name> <value>none</value> <description>If using the JavaKeyStoreProvider, the password for the keystore file.</description> + <on-ambari-upgrade add="false" change="true" delete="true"/> + <on-stack-upgrade add="true" change="true" delete="false"/> </property> - <property> <name>hadoop.kms.cache.enable</name> <value>true</value> <description>Whether the KMS will act as a cache for the backing KeyProvider. When the cache is enabled, operations like getKeyVersion, getMetadata, and getCurrentKey will sometimes return cached data without consulting the backing KeyProvider. Cached values are flushed when keys are deleted or modified. </description> + <on-ambari-upgrade add="false" change="true" delete="true"/> + <on-stack-upgrade add="true" change="true" delete="false"/> </property> - <property> <name>hadoop.kms.cache.timeout.ms</name> <value>600000</value> <description>Expiry time for the KMS key version and key metadata cache, in milliseconds. This affects getKeyVersion and getMetadata. </description> + <on-ambari-upgrade add="false" change="true" delete="true"/> + <on-stack-upgrade add="true" change="true" delete="false"/> </property> - <property> <name>hadoop.kms.current.key.cache.timeout.ms</name> <value>30000</value> <description>Expiry time for the KMS current key cache, in milliseconds. This affects getCurrentKey operations.</description> + <on-ambari-upgrade add="false" change="true" delete="true"/> + <on-stack-upgrade add="true" change="true" delete="false"/> </property> - <property> <name>hadoop.kms.audit.aggregation.window.ms</name> <value>10000</value> <description>Duplicate audit log events within the aggregation window (specified in ms) are quashed to reduce log traffic. A single message for aggregated events is printed at the end of the window, along with a count of the number of aggregated events.</description> + <on-ambari-upgrade add="false" change="true" delete="true"/> + <on-stack-upgrade add="true" change="true" delete="false"/> </property> - <property> <name>hadoop.kms.authentication.type</name> <value>simple</value> - <description>Authentication type for the KMS. Can be either "simple" or "kerberos". + <description>Authentication type for the KMS. Can be either "simple" or "kerberos". </description> + <on-ambari-upgrade add="false" change="true" delete="true"/> + <on-stack-upgrade add="true" change="true" delete="false"/> </property> - <property> <name>hadoop.kms.authentication.kerberos.keytab</name> <value>${user.home}/kms.keytab</value> <description>Path to the keytab with credentials for the configured Kerberos principal.</description> + <on-ambari-upgrade add="false" change="true" delete="true"/> + <on-stack-upgrade add="true" change="true" delete="false"/> </property> - <property> <name>hadoop.kms.authentication.kerberos.principal</name> <value>HTTP/localhost</value> <description>The Kerberos principal to use for the HTTP endpoint. The principal must start with 'HTTP/' as per the Kerberos HTTP SPNEGO specification.</description> + <on-ambari-upgrade add="false" change="true" delete="true"/> + <on-stack-upgrade add="true" change="true" delete="false"/> </property> - <property> <name>hadoop.kms.authentication.kerberos.name.rules</name> <value>DEFAULT</value> @@ -85,49 +93,57 @@ <value-attributes> <type>multiLine</type> </value-attributes> + <on-ambari-upgrade add="false" change="true" delete="true"/> + <on-stack-upgrade add="true" change="true" delete="false"/> </property> - <property> <name>hadoop.kms.authentication.signer.secret.provider</name> <value>random</value> <description>Indicates how the secret to sign the authentication cookies will be stored. Options are 'random' (default), 'string' and 'zookeeper'. If using a setup with multiple KMS instances, 'zookeeper' should be used. </description> + <on-ambari-upgrade add="false" change="true" delete="true"/> + <on-stack-upgrade add="true" change="true" delete="false"/> </property> - <property> <name>hadoop.kms.authentication.signer.secret.provider.zookeeper.path</name> <value>/hadoop-kms/hadoop-auth-signature-secret</value> <description>The Zookeeper ZNode path where the KMS instances will store and retrieve the secret from.</description> + <on-ambari-upgrade add="false" change="true" delete="true"/> + <on-stack-upgrade add="true" change="true" delete="false"/> </property> - <property> <name>hadoop.kms.authentication.signer.secret.provider.zookeeper.connection.string</name> <value>#HOSTNAME#:#PORT#,...</value> <description>The Zookeeper connection string, a list of hostnames and port comma separated.</description> + <on-ambari-upgrade add="false" change="true" delete="true"/> + <on-stack-upgrade add="true" change="true" delete="false"/> </property> - <property> <name>hadoop.kms.authentication.signer.secret.provider.zookeeper.auth.type</name> <value>kerberos</value> <description>The Zookeeper authentication type, 'none' or 'sasl' (Kerberos).</description> + <on-ambari-upgrade add="false" change="true" delete="true"/> + <on-stack-upgrade add="true" change="true" delete="false"/> </property> - <property> <name>hadoop.kms.authentication.signer.secret.provider.zookeeper.kerberos.keytab</name> <value>/etc/hadoop/conf/kms.keytab</value> <description>The absolute path for the Kerberos keytab with the credentials to connect to Zookeeper.</description> + <on-ambari-upgrade add="false" change="true" delete="true"/> + <on-stack-upgrade add="true" change="true" delete="false"/> </property> - <property> <name>hadoop.kms.authentication.signer.secret.provider.zookeeper.kerberos.principal</name> <value>kms/#HOSTNAME#</value> <description>The Kerberos service principal used to connect to Zookeeper.</description> + <on-ambari-upgrade add="false" change="true" delete="true"/> + <on-stack-upgrade add="true" change="true" delete="false"/> </property> - <property> <name>hadoop.kms.security.authorization.manager</name> <value>org.apache.ranger.authorization.kms.authorizer.RangerKmsAuthorizer</value> - <description></description> + <description/> + <on-ambari-upgrade add="false" change="true" delete="true"/> + <on-stack-upgrade add="true" change="true" delete="false"/> </property> - </configuration>
