Repository: ambari Updated Branches: refs/heads/branch-2.5 511fcf956 -> 2eb193a36
AMBARI-20779 ADDENDUM Create Ranger KMS HDFS audit folder as part of install (mugdha) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/2eb193a3 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/2eb193a3 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/2eb193a3 Branch: refs/heads/branch-2.5 Commit: 2eb193a3628d31392fdf94383cf4887b5c2b10a0 Parents: 511fcf9 Author: Mugdha Varadkar <mug...@apache.org> Authored: Fri May 5 17:05:30 2017 +0530 Committer: Mugdha Varadkar <mug...@apache.org> Committed: Mon May 8 10:27:47 2017 +0530 ---------------------------------------------------------------------- .../HDP/2.3/upgrades/nonrolling-upgrade-2.3.xml | 68 ++++++++++---------- .../HDP/2.3/upgrades/nonrolling-upgrade-2.4.xml | 68 ++++++++++---------- .../HDP/2.3/upgrades/nonrolling-upgrade-2.5.xml | 67 ++++++++++--------- .../HDP/2.3/upgrades/nonrolling-upgrade-2.6.xml | 67 ++++++++++--------- .../HDP/2.4/upgrades/nonrolling-upgrade-2.4.xml | 68 ++++++++++---------- .../HDP/2.4/upgrades/nonrolling-upgrade-2.5.xml | 68 ++++++++++---------- .../HDP/2.4/upgrades/nonrolling-upgrade-2.6.xml | 68 ++++++++++---------- .../HDP/2.5/upgrades/host-upgrade-2.5.xml | 50 +++++++------- .../HDP/2.5/upgrades/nonrolling-upgrade-2.5.xml | 68 ++++++++++---------- .../HDP/2.5/upgrades/nonrolling-upgrade-2.6.xml | 68 ++++++++++---------- .../HDP/2.6/upgrades/host-upgrade-2.6.xml | 48 +++++++------- .../HDP/2.6/upgrades/nonrolling-upgrade-2.6.xml | 68 ++++++++++---------- 12 files changed, 387 insertions(+), 389 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/2eb193a3/ambari-server/src/main/resources/stacks/HDP/2.3/upgrades/nonrolling-upgrade-2.3.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/HDP/2.3/upgrades/nonrolling-upgrade-2.3.xml b/ambari-server/src/main/resources/stacks/HDP/2.3/upgrades/nonrolling-upgrade-2.3.xml index b9d8b88..ebdae5f 100644 --- a/ambari-server/src/main/resources/stacks/HDP/2.3/upgrades/nonrolling-upgrade-2.3.xml +++ b/ambari-server/src/main/resources/stacks/HDP/2.3/upgrades/nonrolling-upgrade-2.3.xml @@ -339,16 +339,6 @@ </service> </group> - <group xsi:type="restart" name="RANGER_KMS" title="Ranger KMS"> - <service-check>false</service-check> - <skippable>true</skippable> - <supports-auto-skip-failure>false</supports-auto-skip-failure> - <parallel-scheduler/> - <service name="RANGER_KMS"> - <component>RANGER_KMS_SERVER</component> - </service> - </group> - <group xsi:type="restart" name="HDFS" title="HDFS"> <service-check>false</service-check> <skippable>true</skippable> @@ -387,6 +377,16 @@ </execute-stage> </group> + <group xsi:type="restart" name="RANGER_KMS" title="Ranger KMS"> + <service-check>false</service-check> + <skippable>true</skippable> + <supports-auto-skip-failure>false</supports-auto-skip-failure> + <parallel-scheduler/> + <service name="RANGER_KMS"> + <component>RANGER_KMS_SERVER</component> + </service> + </group> + <group xsi:type="restart" name="KAFKA" title="Kafka"> <service-check>false</service-check> <skippable>true</skippable> @@ -753,30 +753,6 @@ </component> </service> - <service name="RANGER_KMS"> - <component name="RANGER_KMS_SERVER"> - <pre-upgrade> - <task xsi:type="execute" hosts="any" sequential="true"> - <summary>Upgrading Ranger KMS database schema</summary> - <script>scripts/kms_server.py</script> - <function>setup_ranger_kms_database</function> - </task> - </pre-upgrade> - - <pre-downgrade> - <task xsi:type="execute" hosts="any" sequential="true"> - <summary>Downgrading Ranger KMS database schema</summary> - <script>scripts/kms_server.py</script> - <function>setup_ranger_kms_database</function> - </task> - </pre-downgrade> - - <upgrade> - <task xsi:type="restart-task"/> - </upgrade> - </component> - </service> - <service name="HDFS"> <component name="NAMENODE"> <upgrade> @@ -821,6 +797,30 @@ </component> </service> + <service name="RANGER_KMS"> + <component name="RANGER_KMS_SERVER"> + <pre-upgrade> + <task xsi:type="execute" hosts="any" sequential="true"> + <summary>Upgrading Ranger KMS database schema</summary> + <script>scripts/kms_server.py</script> + <function>setup_ranger_kms_database</function> + </task> + </pre-upgrade> + + <pre-downgrade> + <task xsi:type="execute" hosts="any" sequential="true"> + <summary>Downgrading Ranger KMS database schema</summary> + <script>scripts/kms_server.py</script> + <function>setup_ranger_kms_database</function> + </task> + </pre-downgrade> + + <upgrade> + <task xsi:type="restart-task"/> + </upgrade> + </component> + </service> + <service name="MAPREDUCE2"> <component name="HISTORYSERVER"> <upgrade> http://git-wip-us.apache.org/repos/asf/ambari/blob/2eb193a3/ambari-server/src/main/resources/stacks/HDP/2.3/upgrades/nonrolling-upgrade-2.4.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/HDP/2.3/upgrades/nonrolling-upgrade-2.4.xml b/ambari-server/src/main/resources/stacks/HDP/2.3/upgrades/nonrolling-upgrade-2.4.xml index 8fe58fb..981c7d5 100644 --- a/ambari-server/src/main/resources/stacks/HDP/2.3/upgrades/nonrolling-upgrade-2.4.xml +++ b/ambari-server/src/main/resources/stacks/HDP/2.3/upgrades/nonrolling-upgrade-2.4.xml @@ -484,16 +484,6 @@ </service> </group> - <group xsi:type="restart" name="RANGER_KMS" title="Ranger KMS"> - <service-check>false</service-check> - <skippable>true</skippable> - <supports-auto-skip-failure>false</supports-auto-skip-failure> - <parallel-scheduler/> - <service name="RANGER_KMS"> - <component>RANGER_KMS_SERVER</component> - </service> - </group> - <group xsi:type="restart" name="HDFS" title="HDFS"> <service-check>false</service-check> <skippable>true</skippable> @@ -532,6 +522,16 @@ </execute-stage> </group> + <group xsi:type="restart" name="RANGER_KMS" title="Ranger KMS"> + <service-check>false</service-check> + <skippable>true</skippable> + <supports-auto-skip-failure>false</supports-auto-skip-failure> + <parallel-scheduler/> + <service name="RANGER_KMS"> + <component>RANGER_KMS_SERVER</component> + </service> + </group> + <group xsi:type="restart" name="KAFKA" title="Kafka"> <service-check>false</service-check> <skippable>true</skippable> @@ -900,30 +900,6 @@ </component> </service> - <service name="RANGER_KMS"> - <component name="RANGER_KMS_SERVER"> - <pre-upgrade> - <task xsi:type="execute" hosts="any" sequential="true"> - <summary>Upgrading Ranger KMS database schema</summary> - <script>scripts/kms_server.py</script> - <function>setup_ranger_kms_database</function> - </task> - </pre-upgrade> - - <pre-downgrade> - <task xsi:type="execute" hosts="any" sequential="true"> - <summary>Downgrading Ranger KMS database schema</summary> - <script>scripts/kms_server.py</script> - <function>setup_ranger_kms_database</function> - </task> - </pre-downgrade> - - <upgrade> - <task xsi:type="restart-task"/> - </upgrade> - </component> - </service> - <service name="HDFS"> <component name="NAMENODE"> <upgrade> @@ -968,6 +944,30 @@ </component> </service> + <service name="RANGER_KMS"> + <component name="RANGER_KMS_SERVER"> + <pre-upgrade> + <task xsi:type="execute" hosts="any" sequential="true"> + <summary>Upgrading Ranger KMS database schema</summary> + <script>scripts/kms_server.py</script> + <function>setup_ranger_kms_database</function> + </task> + </pre-upgrade> + + <pre-downgrade> + <task xsi:type="execute" hosts="any" sequential="true"> + <summary>Downgrading Ranger KMS database schema</summary> + <script>scripts/kms_server.py</script> + <function>setup_ranger_kms_database</function> + </task> + </pre-downgrade> + + <upgrade> + <task xsi:type="restart-task"/> + </upgrade> + </component> + </service> + <service name="MAPREDUCE2"> <component name="HISTORYSERVER"> <upgrade> http://git-wip-us.apache.org/repos/asf/ambari/blob/2eb193a3/ambari-server/src/main/resources/stacks/HDP/2.3/upgrades/nonrolling-upgrade-2.5.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/HDP/2.3/upgrades/nonrolling-upgrade-2.5.xml b/ambari-server/src/main/resources/stacks/HDP/2.3/upgrades/nonrolling-upgrade-2.5.xml index ce2a86b..00af91e 100644 --- a/ambari-server/src/main/resources/stacks/HDP/2.3/upgrades/nonrolling-upgrade-2.5.xml +++ b/ambari-server/src/main/resources/stacks/HDP/2.3/upgrades/nonrolling-upgrade-2.5.xml @@ -644,16 +644,6 @@ </service> </group> - <group xsi:type="restart" name="RANGER_KMS" title="Ranger KMS"> - <service-check>false</service-check> - <skippable>true</skippable> - <supports-auto-skip-failure>false</supports-auto-skip-failure> - <parallel-scheduler/> - <service name="RANGER_KMS"> - <component>RANGER_KMS_SERVER</component> - </service> - </group> - <group xsi:type="restart" name="HDFS" title="HDFS"> <service-check>false</service-check> <skippable>true</skippable> @@ -692,6 +682,15 @@ </execute-stage> </group> + <group xsi:type="restart" name="RANGER_KMS" title="Ranger KMS"> + <service-check>false</service-check> + <skippable>true</skippable> + <supports-auto-skip-failure>false</supports-auto-skip-failure> + <parallel-scheduler/> + <service name="RANGER_KMS"> + <component>RANGER_KMS_SERVER</component> + </service> + </group> <group xsi:type="restart" name="KAFKA" title="Kafka"> <service-check>false</service-check> @@ -1051,30 +1050,6 @@ </component> </service> - <service name="RANGER_KMS"> - <component name="RANGER_KMS_SERVER"> - <pre-upgrade> - <task xsi:type="execute" hosts="any" sequential="true"> - <summary>Upgrading Ranger KMS database schema</summary> - <script>scripts/kms_server.py</script> - <function>setup_ranger_kms_database</function> - </task> - </pre-upgrade> - - <pre-downgrade> - <task xsi:type="execute" hosts="any" sequential="true"> - <summary>Downgrading Ranger KMS database schema</summary> - <script>scripts/kms_server.py</script> - <function>setup_ranger_kms_database</function> - </task> - </pre-downgrade> - - <upgrade> - <task xsi:type="restart-task"/> - </upgrade> - </component> - </service> - <service name="HDFS"> <component name="NAMENODE"> <upgrade> @@ -1119,6 +1094,30 @@ </component> </service> + <service name="RANGER_KMS"> + <component name="RANGER_KMS_SERVER"> + <pre-upgrade> + <task xsi:type="execute" hosts="any" sequential="true"> + <summary>Upgrading Ranger KMS database schema</summary> + <script>scripts/kms_server.py</script> + <function>setup_ranger_kms_database</function> + </task> + </pre-upgrade> + + <pre-downgrade> + <task xsi:type="execute" hosts="any" sequential="true"> + <summary>Downgrading Ranger KMS database schema</summary> + <script>scripts/kms_server.py</script> + <function>setup_ranger_kms_database</function> + </task> + </pre-downgrade> + + <upgrade> + <task xsi:type="restart-task"/> + </upgrade> + </component> + </service> + <service name="KAFKA"> <component name="KAFKA_BROKER"> <upgrade> http://git-wip-us.apache.org/repos/asf/ambari/blob/2eb193a3/ambari-server/src/main/resources/stacks/HDP/2.3/upgrades/nonrolling-upgrade-2.6.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/HDP/2.3/upgrades/nonrolling-upgrade-2.6.xml b/ambari-server/src/main/resources/stacks/HDP/2.3/upgrades/nonrolling-upgrade-2.6.xml index 00bf399..ca3c193 100644 --- a/ambari-server/src/main/resources/stacks/HDP/2.3/upgrades/nonrolling-upgrade-2.6.xml +++ b/ambari-server/src/main/resources/stacks/HDP/2.3/upgrades/nonrolling-upgrade-2.6.xml @@ -737,16 +737,6 @@ </service> </group> - <group xsi:type="restart" name="RANGER_KMS" title="Ranger KMS"> - <service-check>false</service-check> - <skippable>true</skippable> - <supports-auto-skip-failure>false</supports-auto-skip-failure> - <parallel-scheduler/> - <service name="RANGER_KMS"> - <component>RANGER_KMS_SERVER</component> - </service> - </group> - <group xsi:type="restart" name="HDFS" title="HDFS"> <service-check>false</service-check> <skippable>true</skippable> @@ -785,6 +775,15 @@ </execute-stage> </group> + <group xsi:type="restart" name="RANGER_KMS" title="Ranger KMS"> + <service-check>false</service-check> + <skippable>true</skippable> + <supports-auto-skip-failure>false</supports-auto-skip-failure> + <parallel-scheduler/> + <service name="RANGER_KMS"> + <component>RANGER_KMS_SERVER</component> + </service> + </group> <group xsi:type="restart" name="KAFKA" title="Kafka"> <service-check>false</service-check> @@ -1144,30 +1143,6 @@ </component> </service> - <service name="RANGER_KMS"> - <component name="RANGER_KMS_SERVER"> - <pre-upgrade> - <task xsi:type="execute" hosts="any" sequential="true"> - <summary>Upgrading Ranger KMS database schema</summary> - <script>scripts/kms_server.py</script> - <function>setup_ranger_kms_database</function> - </task> - </pre-upgrade> - - <pre-downgrade> - <task xsi:type="execute" hosts="any" sequential="true"> - <summary>Downgrading Ranger KMS database schema</summary> - <script>scripts/kms_server.py</script> - <function>setup_ranger_kms_database</function> - </task> - </pre-downgrade> - - <upgrade> - <task xsi:type="restart-task"/> - </upgrade> - </component> - </service> - <service name="HDFS"> <component name="NAMENODE"> <upgrade> @@ -1212,6 +1187,30 @@ </component> </service> + <service name="RANGER_KMS"> + <component name="RANGER_KMS_SERVER"> + <pre-upgrade> + <task xsi:type="execute" hosts="any" sequential="true"> + <summary>Upgrading Ranger KMS database schema</summary> + <script>scripts/kms_server.py</script> + <function>setup_ranger_kms_database</function> + </task> + </pre-upgrade> + + <pre-downgrade> + <task xsi:type="execute" hosts="any" sequential="true"> + <summary>Downgrading Ranger KMS database schema</summary> + <script>scripts/kms_server.py</script> + <function>setup_ranger_kms_database</function> + </task> + </pre-downgrade> + + <upgrade> + <task xsi:type="restart-task"/> + </upgrade> + </component> + </service> + <service name="KAFKA"> <component name="KAFKA_BROKER"> <upgrade> http://git-wip-us.apache.org/repos/asf/ambari/blob/2eb193a3/ambari-server/src/main/resources/stacks/HDP/2.4/upgrades/nonrolling-upgrade-2.4.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/HDP/2.4/upgrades/nonrolling-upgrade-2.4.xml b/ambari-server/src/main/resources/stacks/HDP/2.4/upgrades/nonrolling-upgrade-2.4.xml index dac387d..e42b8b2 100644 --- a/ambari-server/src/main/resources/stacks/HDP/2.4/upgrades/nonrolling-upgrade-2.4.xml +++ b/ambari-server/src/main/resources/stacks/HDP/2.4/upgrades/nonrolling-upgrade-2.4.xml @@ -330,16 +330,6 @@ </service> </group> - <group xsi:type="restart" name="RANGER_KMS" title="Ranger KMS"> - <service-check>false</service-check> - <skippable>true</skippable> - <supports-auto-skip-failure>false</supports-auto-skip-failure> - <parallel-scheduler/> - <service name="RANGER_KMS"> - <component>RANGER_KMS_SERVER</component> - </service> - </group> - <group xsi:type="restart" name="HDFS" title="HDFS"> <service-check>false</service-check> <skippable>true</skippable> @@ -378,6 +368,16 @@ </execute-stage> </group> + <group xsi:type="restart" name="RANGER_KMS" title="Ranger KMS"> + <service-check>false</service-check> + <skippable>true</skippable> + <supports-auto-skip-failure>false</supports-auto-skip-failure> + <parallel-scheduler/> + <service name="RANGER_KMS"> + <component>RANGER_KMS_SERVER</component> + </service> + </group> + <group xsi:type="restart" name="KAFKA" title="Kafka"> <service-check>false</service-check> <skippable>true</skippable> @@ -736,30 +736,6 @@ </component> </service> - <service name="RANGER_KMS"> - <component name="RANGER_KMS_SERVER"> - <pre-upgrade> - <task xsi:type="execute" hosts="any" sequential="true"> - <summary>Upgrading Ranger KMS database schema</summary> - <script>scripts/kms_server.py</script> - <function>setup_ranger_kms_database</function> - </task> - </pre-upgrade> - - <pre-downgrade> - <task xsi:type="execute" hosts="any" sequential="true"> - <summary>Downgrading Ranger KMS database schema</summary> - <script>scripts/kms_server.py</script> - <function>setup_ranger_kms_database</function> - </task> - </pre-downgrade> - - <upgrade> - <task xsi:type="restart-task"/> - </upgrade> - </component> - </service> - <service name="HDFS"> <component name="NAMENODE"> <upgrade> @@ -804,6 +780,30 @@ </component> </service> + <service name="RANGER_KMS"> + <component name="RANGER_KMS_SERVER"> + <pre-upgrade> + <task xsi:type="execute" hosts="any" sequential="true"> + <summary>Upgrading Ranger KMS database schema</summary> + <script>scripts/kms_server.py</script> + <function>setup_ranger_kms_database</function> + </task> + </pre-upgrade> + + <pre-downgrade> + <task xsi:type="execute" hosts="any" sequential="true"> + <summary>Downgrading Ranger KMS database schema</summary> + <script>scripts/kms_server.py</script> + <function>setup_ranger_kms_database</function> + </task> + </pre-downgrade> + + <upgrade> + <task xsi:type="restart-task"/> + </upgrade> + </component> + </service> + <service name="KAFKA"> <component name="KAFKA_BROKER"> <upgrade> http://git-wip-us.apache.org/repos/asf/ambari/blob/2eb193a3/ambari-server/src/main/resources/stacks/HDP/2.4/upgrades/nonrolling-upgrade-2.5.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/HDP/2.4/upgrades/nonrolling-upgrade-2.5.xml b/ambari-server/src/main/resources/stacks/HDP/2.4/upgrades/nonrolling-upgrade-2.5.xml index 1e35c52..a5d6368 100644 --- a/ambari-server/src/main/resources/stacks/HDP/2.4/upgrades/nonrolling-upgrade-2.5.xml +++ b/ambari-server/src/main/resources/stacks/HDP/2.4/upgrades/nonrolling-upgrade-2.5.xml @@ -614,16 +614,6 @@ </service> </group> - <group xsi:type="restart" name="RANGER_KMS" title="Ranger KMS"> - <service-check>false</service-check> - <skippable>true</skippable> - <supports-auto-skip-failure>false</supports-auto-skip-failure> - <parallel-scheduler/> - <service name="RANGER_KMS"> - <component>RANGER_KMS_SERVER</component> - </service> - </group> - <group xsi:type="restart" name="HDFS" title="HDFS"> <service-check>false</service-check> <skippable>true</skippable> @@ -662,6 +652,16 @@ </execute-stage> </group> + <group xsi:type="restart" name="RANGER_KMS" title="Ranger KMS"> + <service-check>false</service-check> + <skippable>true</skippable> + <supports-auto-skip-failure>false</supports-auto-skip-failure> + <parallel-scheduler/> + <service name="RANGER_KMS"> + <component>RANGER_KMS_SERVER</component> + </service> + </group> + <group xsi:type="restart" name="KAFKA" title="Kafka"> <service-check>false</service-check> <skippable>true</skippable> @@ -1020,30 +1020,6 @@ </component> </service> - <service name="RANGER_KMS"> - <component name="RANGER_KMS_SERVER"> - <pre-upgrade> - <task xsi:type="execute" hosts="any" sequential="true"> - <summary>Upgrading Ranger KMS database schema</summary> - <script>scripts/kms_server.py</script> - <function>setup_ranger_kms_database</function> - </task> - </pre-upgrade> - - <pre-downgrade> - <task xsi:type="execute" hosts="any" sequential="true"> - <summary>Downgrading Ranger KMS database schema</summary> - <script>scripts/kms_server.py</script> - <function>setup_ranger_kms_database</function> - </task> - </pre-downgrade> - - <upgrade> - <task xsi:type="restart-task"/> - </upgrade> - </component> - </service> - <service name="HDFS"> <component name="NAMENODE"> <upgrade> @@ -1088,6 +1064,30 @@ </component> </service> + <service name="RANGER_KMS"> + <component name="RANGER_KMS_SERVER"> + <pre-upgrade> + <task xsi:type="execute" hosts="any" sequential="true"> + <summary>Upgrading Ranger KMS database schema</summary> + <script>scripts/kms_server.py</script> + <function>setup_ranger_kms_database</function> + </task> + </pre-upgrade> + + <pre-downgrade> + <task xsi:type="execute" hosts="any" sequential="true"> + <summary>Downgrading Ranger KMS database schema</summary> + <script>scripts/kms_server.py</script> + <function>setup_ranger_kms_database</function> + </task> + </pre-downgrade> + + <upgrade> + <task xsi:type="restart-task"/> + </upgrade> + </component> + </service> + <service name="KAFKA"> <component name="KAFKA_BROKER"> <upgrade> http://git-wip-us.apache.org/repos/asf/ambari/blob/2eb193a3/ambari-server/src/main/resources/stacks/HDP/2.4/upgrades/nonrolling-upgrade-2.6.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/HDP/2.4/upgrades/nonrolling-upgrade-2.6.xml b/ambari-server/src/main/resources/stacks/HDP/2.4/upgrades/nonrolling-upgrade-2.6.xml index b66eee2..6e899ee 100644 --- a/ambari-server/src/main/resources/stacks/HDP/2.4/upgrades/nonrolling-upgrade-2.6.xml +++ b/ambari-server/src/main/resources/stacks/HDP/2.4/upgrades/nonrolling-upgrade-2.6.xml @@ -693,16 +693,6 @@ </service> </group> - <group xsi:type="restart" name="RANGER_KMS" title="Ranger KMS"> - <service-check>false</service-check> - <skippable>true</skippable> - <supports-auto-skip-failure>false</supports-auto-skip-failure> - <parallel-scheduler/> - <service name="RANGER_KMS"> - <component>RANGER_KMS_SERVER</component> - </service> - </group> - <group xsi:type="restart" name="HDFS" title="HDFS"> <service-check>false</service-check> <skippable>true</skippable> @@ -741,6 +731,16 @@ </execute-stage> </group> + <group xsi:type="restart" name="RANGER_KMS" title="Ranger KMS"> + <service-check>false</service-check> + <skippable>true</skippable> + <supports-auto-skip-failure>false</supports-auto-skip-failure> + <parallel-scheduler/> + <service name="RANGER_KMS"> + <component>RANGER_KMS_SERVER</component> + </service> + </group> + <group xsi:type="restart" name="KAFKA" title="Kafka"> <service-check>false</service-check> <skippable>true</skippable> @@ -1099,30 +1099,6 @@ </component> </service> - <service name="RANGER_KMS"> - <component name="RANGER_KMS_SERVER"> - <pre-upgrade> - <task xsi:type="execute" hosts="any" sequential="true"> - <summary>Upgrading Ranger KMS database schema</summary> - <script>scripts/kms_server.py</script> - <function>setup_ranger_kms_database</function> - </task> - </pre-upgrade> - - <pre-downgrade> - <task xsi:type="execute" hosts="any" sequential="true"> - <summary>Downgrading Ranger KMS database schema</summary> - <script>scripts/kms_server.py</script> - <function>setup_ranger_kms_database</function> - </task> - </pre-downgrade> - - <upgrade> - <task xsi:type="restart-task"/> - </upgrade> - </component> - </service> - <service name="HDFS"> <component name="NAMENODE"> <upgrade> @@ -1167,6 +1143,30 @@ </component> </service> + <service name="RANGER_KMS"> + <component name="RANGER_KMS_SERVER"> + <pre-upgrade> + <task xsi:type="execute" hosts="any" sequential="true"> + <summary>Upgrading Ranger KMS database schema</summary> + <script>scripts/kms_server.py</script> + <function>setup_ranger_kms_database</function> + </task> + </pre-upgrade> + + <pre-downgrade> + <task xsi:type="execute" hosts="any" sequential="true"> + <summary>Downgrading Ranger KMS database schema</summary> + <script>scripts/kms_server.py</script> + <function>setup_ranger_kms_database</function> + </task> + </pre-downgrade> + + <upgrade> + <task xsi:type="restart-task"/> + </upgrade> + </component> + </service> + <service name="KAFKA"> <component name="KAFKA_BROKER"> <upgrade> http://git-wip-us.apache.org/repos/asf/ambari/blob/2eb193a3/ambari-server/src/main/resources/stacks/HDP/2.5/upgrades/host-upgrade-2.5.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/HDP/2.5/upgrades/host-upgrade-2.5.xml b/ambari-server/src/main/resources/stacks/HDP/2.5/upgrades/host-upgrade-2.5.xml index c180b61..a16ef69 100644 --- a/ambari-server/src/main/resources/stacks/HDP/2.5/upgrades/host-upgrade-2.5.xml +++ b/ambari-server/src/main/resources/stacks/HDP/2.5/upgrades/host-upgrade-2.5.xml @@ -179,30 +179,6 @@ </component> </service> - <service name="RANGER_KMS"> - <component name="RANGER_KMS_SERVER"> - <pre-upgrade> - <task xsi:type="execute" hosts="any" sequential="true"> - <summary>Upgrading Ranger KMS database schema</summary> - <script>scripts/kms_server.py</script> - <function>setup_ranger_kms_database</function> - </task> - </pre-upgrade> - - <pre-downgrade> - <task xsi:type="execute" hosts="any" sequential="true"> - <summary>Downgrading Ranger KMS database schema</summary> - <script>scripts/kms_server.py</script> - <function>setup_ranger_kms_database</function> - </task> - </pre-downgrade> - - <upgrade> - <task xsi:type="restart-task" /> - </upgrade> - </component> - </service> - <service name="KAFKA"> <component name="KAFKA_BROKER"> <upgrade> @@ -248,7 +224,31 @@ </upgrade> </component> </service> - + + <service name="RANGER_KMS"> + <component name="RANGER_KMS_SERVER"> + <pre-upgrade> + <task xsi:type="execute" hosts="any" sequential="true"> + <summary>Upgrading Ranger KMS database schema</summary> + <script>scripts/kms_server.py</script> + <function>setup_ranger_kms_database</function> + </task> + </pre-upgrade> + + <pre-downgrade> + <task xsi:type="execute" hosts="any" sequential="true"> + <summary>Downgrading Ranger KMS database schema</summary> + <script>scripts/kms_server.py</script> + <function>setup_ranger_kms_database</function> + </task> + </pre-downgrade> + + <upgrade> + <task xsi:type="restart-task" /> + </upgrade> + </component> + </service> + <service name="SLIDER"> <component name="SLIDER"> <upgrade> http://git-wip-us.apache.org/repos/asf/ambari/blob/2eb193a3/ambari-server/src/main/resources/stacks/HDP/2.5/upgrades/nonrolling-upgrade-2.5.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/HDP/2.5/upgrades/nonrolling-upgrade-2.5.xml b/ambari-server/src/main/resources/stacks/HDP/2.5/upgrades/nonrolling-upgrade-2.5.xml index 2e55948..d1774ae 100644 --- a/ambari-server/src/main/resources/stacks/HDP/2.5/upgrades/nonrolling-upgrade-2.5.xml +++ b/ambari-server/src/main/resources/stacks/HDP/2.5/upgrades/nonrolling-upgrade-2.5.xml @@ -383,16 +383,6 @@ </service> </group> - <group xsi:type="restart" name="RANGER_KMS" title="Ranger KMS"> - <service-check>false</service-check> - <skippable>true</skippable> - <supports-auto-skip-failure>false</supports-auto-skip-failure> - <parallel-scheduler/> - <service name="RANGER_KMS"> - <component>RANGER_KMS_SERVER</component> - </service> - </group> - <group xsi:type="restart" name="HDFS" title="HDFS"> <service-check>false</service-check> <skippable>true</skippable> @@ -431,6 +421,16 @@ </execute-stage> </group> + <group xsi:type="restart" name="RANGER_KMS" title="Ranger KMS"> + <service-check>false</service-check> + <skippable>true</skippable> + <supports-auto-skip-failure>false</supports-auto-skip-failure> + <parallel-scheduler/> + <service name="RANGER_KMS"> + <component>RANGER_KMS_SERVER</component> + </service> + </group> + <group xsi:type="restart" name="KAFKA" title="Kafka"> <service-check>false</service-check> <skippable>true</skippable> @@ -831,30 +831,6 @@ </component> </service> - <service name="RANGER_KMS"> - <component name="RANGER_KMS_SERVER"> - <pre-upgrade> - <task xsi:type="execute" hosts="any" sequential="true"> - <summary>Upgrading Ranger KMS database schema</summary> - <script>scripts/kms_server.py</script> - <function>setup_ranger_kms_database</function> - </task> - </pre-upgrade> - - <pre-downgrade> - <task xsi:type="execute" hosts="any" sequential="true"> - <summary>Downgrading Ranger KMS database schema</summary> - <script>scripts/kms_server.py</script> - <function>setup_ranger_kms_database</function> - </task> - </pre-downgrade> - - <upgrade> - <task xsi:type="restart-task"/> - </upgrade> - </component> - </service> - <service name="HDFS"> <component name="NAMENODE"> <upgrade> @@ -899,6 +875,30 @@ </component> </service> + <service name="RANGER_KMS"> + <component name="RANGER_KMS_SERVER"> + <pre-upgrade> + <task xsi:type="execute" hosts="any" sequential="true"> + <summary>Upgrading Ranger KMS database schema</summary> + <script>scripts/kms_server.py</script> + <function>setup_ranger_kms_database</function> + </task> + </pre-upgrade> + + <pre-downgrade> + <task xsi:type="execute" hosts="any" sequential="true"> + <summary>Downgrading Ranger KMS database schema</summary> + <script>scripts/kms_server.py</script> + <function>setup_ranger_kms_database</function> + </task> + </pre-downgrade> + + <upgrade> + <task xsi:type="restart-task"/> + </upgrade> + </component> + </service> + <service name="MAPREDUCE2"> <component name="HISTORYSERVER"> <upgrade> http://git-wip-us.apache.org/repos/asf/ambari/blob/2eb193a3/ambari-server/src/main/resources/stacks/HDP/2.5/upgrades/nonrolling-upgrade-2.6.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/HDP/2.5/upgrades/nonrolling-upgrade-2.6.xml b/ambari-server/src/main/resources/stacks/HDP/2.5/upgrades/nonrolling-upgrade-2.6.xml index ad12256..1886d93 100644 --- a/ambari-server/src/main/resources/stacks/HDP/2.5/upgrades/nonrolling-upgrade-2.6.xml +++ b/ambari-server/src/main/resources/stacks/HDP/2.5/upgrades/nonrolling-upgrade-2.6.xml @@ -680,16 +680,6 @@ </service> </group> - <group xsi:type="restart" name="RANGER_KMS" title="Ranger KMS"> - <service-check>false</service-check> - <skippable>true</skippable> - <supports-auto-skip-failure>false</supports-auto-skip-failure> - <parallel-scheduler/> - <service name="RANGER_KMS"> - <component>RANGER_KMS_SERVER</component> - </service> - </group> - <group xsi:type="restart" name="HDFS" title="HDFS"> <service-check>false</service-check> <skippable>true</skippable> @@ -728,6 +718,16 @@ </execute-stage> </group> + <group xsi:type="restart" name="RANGER_KMS" title="Ranger KMS"> + <service-check>false</service-check> + <skippable>true</skippable> + <supports-auto-skip-failure>false</supports-auto-skip-failure> + <parallel-scheduler/> + <service name="RANGER_KMS"> + <component>RANGER_KMS_SERVER</component> + </service> + </group> + <group xsi:type="restart" name="KAFKA" title="Kafka"> <service-check>false</service-check> <skippable>true</skippable> @@ -1159,30 +1159,6 @@ </component> </service> - <service name="RANGER_KMS"> - <component name="RANGER_KMS_SERVER"> - <pre-upgrade> - <task xsi:type="execute" hosts="any" sequential="true"> - <summary>Upgrading Ranger KMS database schema</summary> - <script>scripts/kms_server.py</script> - <function>setup_ranger_kms_database</function> - </task> - </pre-upgrade> - - <pre-downgrade> - <task xsi:type="execute" hosts="any" sequential="true"> - <summary>Downgrading Ranger KMS database schema</summary> - <script>scripts/kms_server.py</script> - <function>setup_ranger_kms_database</function> - </task> - </pre-downgrade> - - <upgrade> - <task xsi:type="restart-task"/> - </upgrade> - </component> - </service> - <service name="HDFS"> <component name="NAMENODE"> <upgrade> @@ -1227,6 +1203,30 @@ </component> </service> + <service name="RANGER_KMS"> + <component name="RANGER_KMS_SERVER"> + <pre-upgrade> + <task xsi:type="execute" hosts="any" sequential="true"> + <summary>Upgrading Ranger KMS database schema</summary> + <script>scripts/kms_server.py</script> + <function>setup_ranger_kms_database</function> + </task> + </pre-upgrade> + + <pre-downgrade> + <task xsi:type="execute" hosts="any" sequential="true"> + <summary>Downgrading Ranger KMS database schema</summary> + <script>scripts/kms_server.py</script> + <function>setup_ranger_kms_database</function> + </task> + </pre-downgrade> + + <upgrade> + <task xsi:type="restart-task"/> + </upgrade> + </component> + </service> + <service name="MAPREDUCE2"> <component name="HISTORYSERVER"> <upgrade> http://git-wip-us.apache.org/repos/asf/ambari/blob/2eb193a3/ambari-server/src/main/resources/stacks/HDP/2.6/upgrades/host-upgrade-2.6.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/HDP/2.6/upgrades/host-upgrade-2.6.xml b/ambari-server/src/main/resources/stacks/HDP/2.6/upgrades/host-upgrade-2.6.xml index f923702..a5943c1 100644 --- a/ambari-server/src/main/resources/stacks/HDP/2.6/upgrades/host-upgrade-2.6.xml +++ b/ambari-server/src/main/resources/stacks/HDP/2.6/upgrades/host-upgrade-2.6.xml @@ -174,30 +174,6 @@ </component> </service> - <service name="RANGER_KMS"> - <component name="RANGER_KMS_SERVER"> - <pre-upgrade> - <task xsi:type="execute" hosts="any" sequential="true"> - <summary>Upgrading Ranger KMS database schema</summary> - <script>scripts/kms_server.py</script> - <function>setup_ranger_kms_database</function> - </task> - </pre-upgrade> - - <pre-downgrade> - <task xsi:type="execute" hosts="any" sequential="true"> - <summary>Downgrading Ranger KMS database schema</summary> - <script>scripts/kms_server.py</script> - <function>setup_ranger_kms_database</function> - </task> - </pre-downgrade> - - <upgrade> - <task xsi:type="restart-task"/> - </upgrade> - </component> - </service> - <service name="HDFS"> <component name="NAMENODE"> <upgrade> @@ -242,6 +218,30 @@ </component> </service> + <service name="RANGER_KMS"> + <component name="RANGER_KMS_SERVER"> + <pre-upgrade> + <task xsi:type="execute" hosts="any" sequential="true"> + <summary>Upgrading Ranger KMS database schema</summary> + <script>scripts/kms_server.py</script> + <function>setup_ranger_kms_database</function> + </task> + </pre-upgrade> + + <pre-downgrade> + <task xsi:type="execute" hosts="any" sequential="true"> + <summary>Downgrading Ranger KMS database schema</summary> + <script>scripts/kms_server.py</script> + <function>setup_ranger_kms_database</function> + </task> + </pre-downgrade> + + <upgrade> + <task xsi:type="restart-task"/> + </upgrade> + </component> + </service> + <service name="MAPREDUCE2"> <component name="HISTORYSERVER"> <upgrade> http://git-wip-us.apache.org/repos/asf/ambari/blob/2eb193a3/ambari-server/src/main/resources/stacks/HDP/2.6/upgrades/nonrolling-upgrade-2.6.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/HDP/2.6/upgrades/nonrolling-upgrade-2.6.xml b/ambari-server/src/main/resources/stacks/HDP/2.6/upgrades/nonrolling-upgrade-2.6.xml index a74d085..db845bd 100644 --- a/ambari-server/src/main/resources/stacks/HDP/2.6/upgrades/nonrolling-upgrade-2.6.xml +++ b/ambari-server/src/main/resources/stacks/HDP/2.6/upgrades/nonrolling-upgrade-2.6.xml @@ -401,16 +401,6 @@ </service> </group> - <group xsi:type="restart" name="RANGER_KMS" title="Ranger KMS"> - <service-check>false</service-check> - <skippable>true</skippable> - <supports-auto-skip-failure>false</supports-auto-skip-failure> - <parallel-scheduler/> - <service name="RANGER_KMS"> - <component>RANGER_KMS_SERVER</component> - </service> - </group> - <group xsi:type="restart" name="HDFS" title="HDFS"> <service-check>false</service-check> <skippable>true</skippable> @@ -449,6 +439,16 @@ </execute-stage> </group> + <group xsi:type="restart" name="RANGER_KMS" title="Ranger KMS"> + <service-check>false</service-check> + <skippable>true</skippable> + <supports-auto-skip-failure>false</supports-auto-skip-failure> + <parallel-scheduler/> + <service name="RANGER_KMS"> + <component>RANGER_KMS_SERVER</component> + </service> + </group> + <group xsi:type="restart" name="KAFKA" title="Kafka"> <service-check>false</service-check> <skippable>true</skippable> @@ -885,30 +885,6 @@ </component> </service> - <service name="RANGER_KMS"> - <component name="RANGER_KMS_SERVER"> - <pre-upgrade> - <task xsi:type="execute" hosts="any" sequential="true"> - <summary>Upgrading Ranger KMS database schema</summary> - <script>scripts/kms_server.py</script> - <function>setup_ranger_kms_database</function> - </task> - </pre-upgrade> - - <pre-downgrade> - <task xsi:type="execute" hosts="any" sequential="true"> - <summary>Downgrading Ranger KMS database schema</summary> - <script>scripts/kms_server.py</script> - <function>setup_ranger_kms_database</function> - </task> - </pre-downgrade> - - <upgrade> - <task xsi:type="restart-task"/> - </upgrade> - </component> - </service> - <service name="HDFS"> <component name="NAMENODE"> <upgrade> @@ -953,6 +929,30 @@ </component> </service> + <service name="RANGER_KMS"> + <component name="RANGER_KMS_SERVER"> + <pre-upgrade> + <task xsi:type="execute" hosts="any" sequential="true"> + <summary>Upgrading Ranger KMS database schema</summary> + <script>scripts/kms_server.py</script> + <function>setup_ranger_kms_database</function> + </task> + </pre-upgrade> + + <pre-downgrade> + <task xsi:type="execute" hosts="any" sequential="true"> + <summary>Downgrading Ranger KMS database schema</summary> + <script>scripts/kms_server.py</script> + <function>setup_ranger_kms_database</function> + </task> + </pre-downgrade> + + <upgrade> + <task xsi:type="restart-task"/> + </upgrade> + </component> + </service> + <service name="MAPREDUCE2"> <component name="HISTORYSERVER"> <upgrade>
