ambari-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mpapirkovs...@apache.org
Subject [2/2] ambari git commit: AMBARI-12451. Ranger configurations missing after HDP 2.2->2.3 upgrade. (mpapirkovskyy)
Date Fri, 17 Jul 2015 19:24:13 GMT
AMBARI-12451. Ranger configurations missing after HDP 2.2->2.3 upgrade. (mpapirkovskyy)


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

Branch: refs/heads/branch-2.1
Commit: fc89328b7c7c0af7eb8f87bb5a804a2a9e937a8c
Parents: 4570ca3
Author: Myroslav Papirkovskyy <mpapyrkovskyy@hortonworks.com>
Authored: Fri Jul 17 22:18:26 2015 +0300
Committer: Myroslav Papirkovskyy <mpapyrkovskyy@hortonworks.com>
Committed: Fri Jul 17 22:19:14 2015 +0300

----------------------------------------------------------------------
 .../catalog/UpgradeCatalog_2.2_to_2.3.json      |  9 +++
 .../UpgradeCatalog_2.2_to_2.3_step2.json        | 81 ++++++++++++++++++++
 2 files changed, 90 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ambari/blob/fc89328b/ambari-server/src/main/resources/upgrade/catalog/UpgradeCatalog_2.2_to_2.3.json
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/upgrade/catalog/UpgradeCatalog_2.2_to_2.3.json
b/ambari-server/src/main/resources/upgrade/catalog/UpgradeCatalog_2.2_to_2.3.json
index 7522727..818c898 100644
--- a/ambari-server/src/main/resources/upgrade/catalog/UpgradeCatalog_2.2_to_2.3.json
+++ b/ambari-server/src/main/resources/upgrade/catalog/UpgradeCatalog_2.2_to_2.3.json
@@ -310,6 +310,7 @@
                   }
                 },
                 "ranger-hdfs-security": {
+                  "upgrade.transition": "yes",
                   "ranger.plugin.hdfs.policy.source.impl": {
                     "value": "org.apache.ranger.admin.client.RangerAdminRESTClient",
                     "required-services": ["RANGER", "HDFS"]
@@ -430,6 +431,7 @@
                 }
               },
               "ranger-hbase-security": {
+                "upgrade.transition": "yes",
                 "ranger.plugin.hbase.policy.source.impl": {
                   "value":"org.apache.ranger.admin.client.RangerAdminRESTClient",
                   "required-services": ["RANGER", "HBASE"]
@@ -538,6 +540,7 @@
                 }
               },
               "ranger-hive-security": {
+                "upgrade.transition": "yes",
                 "ranger.plugin.hive.policy.source.impl": "org.apache.ranger.admin.client.RangerAdminRESTClient",
                 "ranger.plugin.hive.policy.rest.ssl.config.file": "usr/hdp/current/hive-server2/conf/conf.server/ranger-policymgr-ssl.xml",
                 "ranger.plugin.hive.policy.pollIntervalMs": "30000",
@@ -633,6 +636,7 @@
                 }
               },
               "ranger-knox-security": {
+                "upgrade.transition": "yes",
                 "ranger.plugin.knox.policy.source.impl": {
                   "value": "org.apache.ranger.admin.client.RangerAdminJersey2RESTClient"
                 },
@@ -730,6 +734,7 @@
                 }
               },
               "ranger-storm-security": {
+                "upgrade.transition": "yes",
                 "ranger.plugin.storm.policy.source.impl": {
                   "value": "org.apache.ranger.admin.client.RangerAdminRESTClient"
                 },
@@ -852,6 +857,7 @@
                 "xasecure.audit.provider.summary.enabled" : "true"
               },
               "ranger-kafka-security" : {
+                "upgrade.transition": "yes",
                 "ranger.plugin.kafka.service.name" : "{{repo_name}}",
                 "ranger.plugin.kafka.policy.source.impl" : "org.apache.ranger.admin.client.RangerAdminRESTClient",
                 "ranger.plugin.kafka.policy.rest.url" : "{{policymgr_mgr_url}}",
@@ -897,6 +903,7 @@
                 "xasecure.audit.provider.summary.enabled" : "false"
               },
               "ranger-yarn-security" : {
+                "upgrade.transition": "yes",
                 "ranger.plugin.yarn.service.name" : "{{repo_name}}",
                 "ranger.plugin.yarn.policy.source.impl" : "org.apache.ranger.admin.client.RangerAdminRESTClient",
                 "ranger.plugin.yarn.policy.rest.url" : "{{policymgr_mgr_url}}",
@@ -927,6 +934,7 @@
                     }
                 },
                 "ranger-admin-site": {
+                    "upgrade.transition": "yes",
                     "ranger.service.host": {
                         "value": "{RANGER_HOST}",
                         "template": "yes",
@@ -1020,6 +1028,7 @@
                     }
                 },
                 "ranger-ugsync-site": {
+                    "upgrade.transition": "yes",
                     "ranger.usersync.port": {
                         "value": "5151"
                     },

http://git-wip-us.apache.org/repos/asf/ambari/blob/fc89328b/ambari-server/src/main/resources/upgrade/catalog/UpgradeCatalog_2.2_to_2.3_step2.json
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/upgrade/catalog/UpgradeCatalog_2.2_to_2.3_step2.json
b/ambari-server/src/main/resources/upgrade/catalog/UpgradeCatalog_2.2_to_2.3_step2.json
new file mode 100644
index 0000000..014aa71
--- /dev/null
+++ b/ambari-server/src/main/resources/upgrade/catalog/UpgradeCatalog_2.2_to_2.3_step2.json
@@ -0,0 +1,81 @@
+{
+    "version": "1.0",
+    "stacks": [
+        {
+            "name": "HDP",
+            "old-version": "2.2",
+            "target-version": "2.3",
+            "options": {
+                "config-types": {
+                  "ranger-hdfs-security": {
+                    "merged-copy": "yes",
+                    "required-services": ["RANGER","HDFS"]
+                  },
+                  "ranger-hbase-security": {
+                    "merged-copy": "yes",
+                    "required-services": ["RANGER","HBASE"]
+                  },
+                  "ranger-hive-security": {
+                    "merged-copy": "yes",
+                    "required-services": ["RANGER","HIVE"]
+                  },
+                  "ranger-knox-security": {
+                    "merged-copy": "yes",
+                    "required-services": ["RANGER","KNOX"]
+                  },
+                  "ranger-storm-security": {
+                    "merged-copy": "yes",
+                    "required-services": ["RANGER","STORM"]
+                  },
+                  "ranger-kafka-security" : {
+                    "merged-copy": "yes",
+                    "required-services": ["RANGER","KAFKA"]
+                  },
+                  "ranger-yarn-security" : {
+                    "merged-copy": "yes",
+                    "required-services": ["RANGER","YARN"]
+                  },
+                    "ranger-admin-site": {
+                        "merged-copy": "yes",
+                        "required-services": [ "RANGER" ]
+                    },
+                    "ranger-ugsync-site": {
+                        "merged-copy": "yes",
+                        "required-services": [
+                            "RANGER"
+                        ]
+                    }
+                }
+            },
+            "properties": {
+              "ranger-admin-site": {
+                "upgrade.transition": {"remove": "yes"}
+              },
+              "ranger-ugsync-site": {
+                "upgrade.transition": {"remove": "yes"}
+              },
+              "ranger-hbase-security": {
+                "upgrade.transition": {"remove": "yes"}
+              },
+              "ranger-hdfs-security": {
+                "upgrade.transition": {"remove": "yes"}
+              },
+              "ranger-storm-security": {
+                "upgrade.transition": {"remove": "yes"}
+              },
+              "ranger-knox-security": {
+                "upgrade.transition": {"remove": "yes"}
+              },
+              "ranger-hive-security": {
+                "upgrade.transition": {"remove": "yes"}
+              },
+              "ranger-kafka-security": {
+                "upgrade.transition": {"remove": "yes"}
+              },
+              "ranger-yarn-security": {
+                "upgrade.transition": {"remove": "yes"}
+              }
+            }
+    }
+  ]
+}


Mime
View raw message