[2/4] ambari git commit: AMBARI-8714. Refactor UpgradeHelper_HDP2.py script to be compliant with 2.0/2.1 stack upgrade (dlysnichenko)

2014-12-19 Thread dmitriusan
http://git-wip-us.apache.org/repos/asf/ambari/blob/abf40552/ambari-server/src/main/resources/upgrade/catalog/UpgradeCatalog_1.3_to_2.2.json
--
diff --git 
a/ambari-server/src/main/resources/upgrade/catalog/UpgradeCatalog_1.3_to_2.2.json
 
b/ambari-server/src/main/resources/upgrade/catalog/UpgradeCatalog_1.3_to_2.2.json
new file mode 100644
index 000..5ee2816
--- /dev/null
+++ 
b/ambari-server/src/main/resources/upgrade/catalog/UpgradeCatalog_1.3_to_2.2.json
@@ -0,0 +1,961 @@
+{
+  version: 1.0,
+  stacks: [
+{
+  name: HDP,
+  old-version: 1.3,
+  target-version: 2.2,
+  options: {
+config-types: {
+  hdfs-site: {
+merged-copy: yes
+  },
+  core-site: {
+merged-copy: yes
+  },
+  hbase-site: {
+merged-copy: yes
+  },
+  hbase-env: {
+merged-copy: yes
+  },
+  oozie-env: {
+merged-copy: yes
+  },
+  hive-site: {
+merged-copy: yes
+  },
+  mapred-site: {
+merged-copy: yes
+  },
+  mapred-env: {
+merged-copy: yes
+  },
+  cluster-env : {
+merged-copy: yes
+  },
+  sqoop-env: {
+merged-copy: yes
+  },
+  pig-env: {
+merged-copy: yes
+  },
+  pig-properties: {
+merged-copy: yes
+  },
+  webhcat-site: {
+merged-copy: yes
+  },
+  zookeeper-env: {
+merged-copy: yes
+  },
+  hadoop-env: {
+merged-copy: yes
+  },
+  hadoop-policy: {
+merged-copy: yes
+  },
+  hbase-log4j: {
+merged-copy: yes
+  },
+  hdfs-log4j: {
+merged-copy: yes
+  },
+  hive-env: {
+merged-copy: yes
+  },
+  hive-exec-log4j: {
+merged-copy: yes
+  },
+  hive-log4j: {
+merged-copy: yes
+  },
+  oozie-site: {
+merged-copy: yes
+  }
+}
+  },
+  properties: {
+oozie-site: {
+  oozie.service.ProxyUserService.proxyuser.falcon.hosts: *,
+  oozie.service.coord.check.maximum.frequency: false,
+  oozie.service.SchemaService.wf.ext.schemas: 
shell-action-0.1.xsd,shell-action-0.2.xsd,shell-action-0.3.xsd,email-action-0.1.xsd,email-action-0.2.xsd,hive-action-0.2.xsd,hive-action-0.3.xsd,hive-action-0.4.xsd,hive-action-0.5.xsd,sqoop-action-0.2.xsd,sqoop-action-0.3.xsd,sqoop-action-0.4.xsd,ssh-action-0.1.xsd,ssh-action-0.2.xsd,distcp-action-0.1.xsd,distcp-action-0.2.xsd,oozie-sla-0.1.xsd,oozie-sla-0.2.xsd,
+  oozie.service.HadoopAccessorService.kerberos.enabled: false,
+  oozie.service.coord.push.check.requeue.interval: 3,
+  oozie.credentials.credentialclasses: 
hcat=org.apache.oozie.action.hadoop.HCatCredentials,
+  oozie.authentication.kerberos.name.rules: \n  
RULE:[2:$1@$0]([jt]t@.*TODO-KERBEROS-DOMAIN)s/.*/TODO-MAPREDUSER/\n  
RULE:[2:$1@$0]([nd]n@.*TODO-KERBEROS-DOMAIN)s/.*/TODO-HDFSUSER/\n  
RULE:[2:$1@$0](hm@.*TODO-KERBEROS-DOMAIN)s/.*/TODO-HBASE-USER/\n  
RULE:[2:$1@$0](rs@.*TODO-KERBEROS-DOMAIN)s/.*/TODO-HBASE-USER/\n  DEFAULT,
+  oozie.authentication.simple.anonymous.allowed: true,
+  oozie.service.AuthorizationService.security.enabled: true,
+  oozie.services.ext: 
org.apache.oozie.service.JMSAccessorService,org.apache.oozie.service.PartitionDependencyManagerService,org.apache.oozie.service.HCatAccessorService,
+  oozie.services: \n  
org.apache.oozie.service.SchedulerService,\n  
org.apache.oozie.service.InstrumentationService,\n  
org.apache.oozie.service.MemoryLocksService,\n  
org.apache.oozie.service.UUIDService,\n  
org.apache.oozie.service.ELService,\n  
org.apache.oozie.service.AuthorizationService,\n  
org.apache.oozie.service.UserGroupInformationService,\n  
org.apache.oozie.service.HadoopAccessorService,\n  
org.apache.oozie.service.JobsConcurrencyService,\n  
org.apache.oozie.service.URIHandlerService,\n  
org.apache.oozie.service.DagXLogInfoService,\n  
org.apache.oozie.service.SchemaService,\n  
org.apache.oozie.service.LiteWorkflowAppService,\n  
org.apache.oozie.service.JPAService,\n  
org.apache.oozie.service.StoreService,\n  
org.apache.oozie.service.CoordinatorStoreService,\n  
org.apache.oozie.service.SLAStoreService,\n  
org.apache.oozie.service.DBLiteWorkflowStoreService,\n  
org.apache.oozie.service.C
 allbackService,\n  org.apache.oozie.service.ShareLibService,\n  
org.apache.oozie.service.CallableQueueService,\n  
org.apache.oozie.service.ActionService,\n  

[2/4] ambari git commit: AMBARI-8714. Refactor UpgradeHelper_HDP2.py script to be compliant with 2.0/2.1 stack upgrade (dlysnichenko)

2014-12-18 Thread dmitriusan
http://git-wip-us.apache.org/repos/asf/ambari/blob/10659055/ambari-server/src/main/resources/upgrade/catalog/UpgradeCatalog_1.3_to_2.2.json
--
diff --git 
a/ambari-server/src/main/resources/upgrade/catalog/UpgradeCatalog_1.3_to_2.2.json
 
b/ambari-server/src/main/resources/upgrade/catalog/UpgradeCatalog_1.3_to_2.2.json
new file mode 100644
index 000..5ee2816
--- /dev/null
+++ 
b/ambari-server/src/main/resources/upgrade/catalog/UpgradeCatalog_1.3_to_2.2.json
@@ -0,0 +1,961 @@
+{
+  version: 1.0,
+  stacks: [
+{
+  name: HDP,
+  old-version: 1.3,
+  target-version: 2.2,
+  options: {
+config-types: {
+  hdfs-site: {
+merged-copy: yes
+  },
+  core-site: {
+merged-copy: yes
+  },
+  hbase-site: {
+merged-copy: yes
+  },
+  hbase-env: {
+merged-copy: yes
+  },
+  oozie-env: {
+merged-copy: yes
+  },
+  hive-site: {
+merged-copy: yes
+  },
+  mapred-site: {
+merged-copy: yes
+  },
+  mapred-env: {
+merged-copy: yes
+  },
+  cluster-env : {
+merged-copy: yes
+  },
+  sqoop-env: {
+merged-copy: yes
+  },
+  pig-env: {
+merged-copy: yes
+  },
+  pig-properties: {
+merged-copy: yes
+  },
+  webhcat-site: {
+merged-copy: yes
+  },
+  zookeeper-env: {
+merged-copy: yes
+  },
+  hadoop-env: {
+merged-copy: yes
+  },
+  hadoop-policy: {
+merged-copy: yes
+  },
+  hbase-log4j: {
+merged-copy: yes
+  },
+  hdfs-log4j: {
+merged-copy: yes
+  },
+  hive-env: {
+merged-copy: yes
+  },
+  hive-exec-log4j: {
+merged-copy: yes
+  },
+  hive-log4j: {
+merged-copy: yes
+  },
+  oozie-site: {
+merged-copy: yes
+  }
+}
+  },
+  properties: {
+oozie-site: {
+  oozie.service.ProxyUserService.proxyuser.falcon.hosts: *,
+  oozie.service.coord.check.maximum.frequency: false,
+  oozie.service.SchemaService.wf.ext.schemas: 
shell-action-0.1.xsd,shell-action-0.2.xsd,shell-action-0.3.xsd,email-action-0.1.xsd,email-action-0.2.xsd,hive-action-0.2.xsd,hive-action-0.3.xsd,hive-action-0.4.xsd,hive-action-0.5.xsd,sqoop-action-0.2.xsd,sqoop-action-0.3.xsd,sqoop-action-0.4.xsd,ssh-action-0.1.xsd,ssh-action-0.2.xsd,distcp-action-0.1.xsd,distcp-action-0.2.xsd,oozie-sla-0.1.xsd,oozie-sla-0.2.xsd,
+  oozie.service.HadoopAccessorService.kerberos.enabled: false,
+  oozie.service.coord.push.check.requeue.interval: 3,
+  oozie.credentials.credentialclasses: 
hcat=org.apache.oozie.action.hadoop.HCatCredentials,
+  oozie.authentication.kerberos.name.rules: \n  
RULE:[2:$1@$0]([jt]t@.*TODO-KERBEROS-DOMAIN)s/.*/TODO-MAPREDUSER/\n  
RULE:[2:$1@$0]([nd]n@.*TODO-KERBEROS-DOMAIN)s/.*/TODO-HDFSUSER/\n  
RULE:[2:$1@$0](hm@.*TODO-KERBEROS-DOMAIN)s/.*/TODO-HBASE-USER/\n  
RULE:[2:$1@$0](rs@.*TODO-KERBEROS-DOMAIN)s/.*/TODO-HBASE-USER/\n  DEFAULT,
+  oozie.authentication.simple.anonymous.allowed: true,
+  oozie.service.AuthorizationService.security.enabled: true,
+  oozie.services.ext: 
org.apache.oozie.service.JMSAccessorService,org.apache.oozie.service.PartitionDependencyManagerService,org.apache.oozie.service.HCatAccessorService,
+  oozie.services: \n  
org.apache.oozie.service.SchedulerService,\n  
org.apache.oozie.service.InstrumentationService,\n  
org.apache.oozie.service.MemoryLocksService,\n  
org.apache.oozie.service.UUIDService,\n  
org.apache.oozie.service.ELService,\n  
org.apache.oozie.service.AuthorizationService,\n  
org.apache.oozie.service.UserGroupInformationService,\n  
org.apache.oozie.service.HadoopAccessorService,\n  
org.apache.oozie.service.JobsConcurrencyService,\n  
org.apache.oozie.service.URIHandlerService,\n  
org.apache.oozie.service.DagXLogInfoService,\n  
org.apache.oozie.service.SchemaService,\n  
org.apache.oozie.service.LiteWorkflowAppService,\n  
org.apache.oozie.service.JPAService,\n  
org.apache.oozie.service.StoreService,\n  
org.apache.oozie.service.CoordinatorStoreService,\n  
org.apache.oozie.service.SLAStoreService,\n  
org.apache.oozie.service.DBLiteWorkflowStoreService,\n  
org.apache.oozie.service.C
 allbackService,\n  org.apache.oozie.service.ShareLibService,\n  
org.apache.oozie.service.CallableQueueService,\n  
org.apache.oozie.service.ActionService,\n  

[2/4] ambari git commit: AMBARI-8714. Refactor UpgradeHelper_HDP2.py script to be compliant with 2.0/2.1 stack upgrade (dlysnichenko)

2014-12-18 Thread dmitriusan
http://git-wip-us.apache.org/repos/asf/ambari/blob/c2b9a1a7/ambari-server/src/main/resources/upgrade/catalog/UpgradeCatalog_1.3_to_2.2.json
--
diff --git 
a/ambari-server/src/main/resources/upgrade/catalog/UpgradeCatalog_1.3_to_2.2.json
 
b/ambari-server/src/main/resources/upgrade/catalog/UpgradeCatalog_1.3_to_2.2.json
new file mode 100644
index 000..5ee2816
--- /dev/null
+++ 
b/ambari-server/src/main/resources/upgrade/catalog/UpgradeCatalog_1.3_to_2.2.json
@@ -0,0 +1,961 @@
+{
+  version: 1.0,
+  stacks: [
+{
+  name: HDP,
+  old-version: 1.3,
+  target-version: 2.2,
+  options: {
+config-types: {
+  hdfs-site: {
+merged-copy: yes
+  },
+  core-site: {
+merged-copy: yes
+  },
+  hbase-site: {
+merged-copy: yes
+  },
+  hbase-env: {
+merged-copy: yes
+  },
+  oozie-env: {
+merged-copy: yes
+  },
+  hive-site: {
+merged-copy: yes
+  },
+  mapred-site: {
+merged-copy: yes
+  },
+  mapred-env: {
+merged-copy: yes
+  },
+  cluster-env : {
+merged-copy: yes
+  },
+  sqoop-env: {
+merged-copy: yes
+  },
+  pig-env: {
+merged-copy: yes
+  },
+  pig-properties: {
+merged-copy: yes
+  },
+  webhcat-site: {
+merged-copy: yes
+  },
+  zookeeper-env: {
+merged-copy: yes
+  },
+  hadoop-env: {
+merged-copy: yes
+  },
+  hadoop-policy: {
+merged-copy: yes
+  },
+  hbase-log4j: {
+merged-copy: yes
+  },
+  hdfs-log4j: {
+merged-copy: yes
+  },
+  hive-env: {
+merged-copy: yes
+  },
+  hive-exec-log4j: {
+merged-copy: yes
+  },
+  hive-log4j: {
+merged-copy: yes
+  },
+  oozie-site: {
+merged-copy: yes
+  }
+}
+  },
+  properties: {
+oozie-site: {
+  oozie.service.ProxyUserService.proxyuser.falcon.hosts: *,
+  oozie.service.coord.check.maximum.frequency: false,
+  oozie.service.SchemaService.wf.ext.schemas: 
shell-action-0.1.xsd,shell-action-0.2.xsd,shell-action-0.3.xsd,email-action-0.1.xsd,email-action-0.2.xsd,hive-action-0.2.xsd,hive-action-0.3.xsd,hive-action-0.4.xsd,hive-action-0.5.xsd,sqoop-action-0.2.xsd,sqoop-action-0.3.xsd,sqoop-action-0.4.xsd,ssh-action-0.1.xsd,ssh-action-0.2.xsd,distcp-action-0.1.xsd,distcp-action-0.2.xsd,oozie-sla-0.1.xsd,oozie-sla-0.2.xsd,
+  oozie.service.HadoopAccessorService.kerberos.enabled: false,
+  oozie.service.coord.push.check.requeue.interval: 3,
+  oozie.credentials.credentialclasses: 
hcat=org.apache.oozie.action.hadoop.HCatCredentials,
+  oozie.authentication.kerberos.name.rules: \n  
RULE:[2:$1@$0]([jt]t@.*TODO-KERBEROS-DOMAIN)s/.*/TODO-MAPREDUSER/\n  
RULE:[2:$1@$0]([nd]n@.*TODO-KERBEROS-DOMAIN)s/.*/TODO-HDFSUSER/\n  
RULE:[2:$1@$0](hm@.*TODO-KERBEROS-DOMAIN)s/.*/TODO-HBASE-USER/\n  
RULE:[2:$1@$0](rs@.*TODO-KERBEROS-DOMAIN)s/.*/TODO-HBASE-USER/\n  DEFAULT,
+  oozie.authentication.simple.anonymous.allowed: true,
+  oozie.service.AuthorizationService.security.enabled: true,
+  oozie.services.ext: 
org.apache.oozie.service.JMSAccessorService,org.apache.oozie.service.PartitionDependencyManagerService,org.apache.oozie.service.HCatAccessorService,
+  oozie.services: \n  
org.apache.oozie.service.SchedulerService,\n  
org.apache.oozie.service.InstrumentationService,\n  
org.apache.oozie.service.MemoryLocksService,\n  
org.apache.oozie.service.UUIDService,\n  
org.apache.oozie.service.ELService,\n  
org.apache.oozie.service.AuthorizationService,\n  
org.apache.oozie.service.UserGroupInformationService,\n  
org.apache.oozie.service.HadoopAccessorService,\n  
org.apache.oozie.service.JobsConcurrencyService,\n  
org.apache.oozie.service.URIHandlerService,\n  
org.apache.oozie.service.DagXLogInfoService,\n  
org.apache.oozie.service.SchemaService,\n  
org.apache.oozie.service.LiteWorkflowAppService,\n  
org.apache.oozie.service.JPAService,\n  
org.apache.oozie.service.StoreService,\n  
org.apache.oozie.service.CoordinatorStoreService,\n  
org.apache.oozie.service.SLAStoreService,\n  
org.apache.oozie.service.DBLiteWorkflowStoreService,\n  
org.apache.oozie.service.C
 allbackService,\n  org.apache.oozie.service.ShareLibService,\n  
org.apache.oozie.service.CallableQueueService,\n  
org.apache.oozie.service.ActionService,\n