You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by jl...@apache.org on 2015/11/14 00:06:41 UTC
ambari git commit: AMBARI-13893: [PluggableStackDefinition] Support
adding additional services to pluggable stacks (jluniya)
Repository: ambari
Updated Branches:
refs/heads/trunk aeac887af -> 9196eb7a2
AMBARI-13893: [PluggableStackDefinition] Support adding additional services to pluggable stacks (jluniya)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/9196eb7a
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/9196eb7a
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/9196eb7a
Branch: refs/heads/trunk
Commit: 9196eb7a270f12b8b373843e78cf7370103aceeb
Parents: aeac887
Author: Jayush Luniya <jl...@hortonworks.com>
Authored: Fri Nov 13 15:06:36 2015 -0800
Committer: Jayush Luniya <jl...@hortonworks.com>
Committed: Fri Nov 13 15:06:36 2015 -0800
----------------------------------------------------------------------
.../GenerateStackDefinition.py | 15 +++++++++++
.../stacks/PHD/3.3/services/HAWQ/metainfo.xml | 26 ++++++++++++++++++++
.../stacks/PHD/3.3/services/PXF/metainfo.xml | 26 ++++++++++++++++++++
3 files changed, 67 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/9196eb7a/ambari-common/src/main/python/pluggable_stack_definition/GenerateStackDefinition.py
----------------------------------------------------------------------
diff --git a/ambari-common/src/main/python/pluggable_stack_definition/GenerateStackDefinition.py b/ambari-common/src/main/python/pluggable_stack_definition/GenerateStackDefinition.py
index fece46b..d068d1f 100644
--- a/ambari-common/src/main/python/pluggable_stack_definition/GenerateStackDefinition.py
+++ b/ambari-common/src/main/python/pluggable_stack_definition/GenerateStackDefinition.py
@@ -573,6 +573,20 @@ class GeneratorHelper(object):
self.copy_common_services(parent_services)
pass
+ def copy_remaining_common_services(self, common_services = []):
+ ignored_files = ['.pyc']
+ source_common_services_path = os.path.join(self.resources_folder, "common-services")
+ dest_common_services_path = os.path.join(self.output_folder, "common-services")
+
+ source_common_services_list = os.listdir(source_common_services_path)
+ dest_common_services_list = os.listdir(dest_common_services_path)
+
+ for service_name in source_common_services_list:
+ if service_name not in dest_common_services_list:
+ source = os.path.join(source_common_services_path, service_name)
+ dest = os.path.join(dest_common_services_path, service_name)
+ copy_tree(source, dest, ignored_files, post_copy=None)
+
def copy_resource_management(self):
source_folder = join(os.path.abspath(join(self.resources_folder, "..", "..", "..", "..")),
'ambari-common', 'src', 'main', 'python', 'resource_management')
@@ -663,6 +677,7 @@ def main(argv):
gen_helper.copy_stacks()
gen_helper.copy_resource_management()
gen_helper.copy_common_services()
+ gen_helper.copy_remaining_common_services()
gen_helper.copy_ambari_properties()
gen_helper.copy_custom_actions()
http://git-wip-us.apache.org/repos/asf/ambari/blob/9196eb7a/ambari-server/src/main/resources/stacks/PHD/3.3/services/HAWQ/metainfo.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/PHD/3.3/services/HAWQ/metainfo.xml b/ambari-server/src/main/resources/stacks/PHD/3.3/services/HAWQ/metainfo.xml
new file mode 100644
index 0000000..04646bf
--- /dev/null
+++ b/ambari-server/src/main/resources/stacks/PHD/3.3/services/HAWQ/metainfo.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0"?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+<metainfo>
+ <schemaVersion>2.0</schemaVersion>
+ <services>
+ <service>
+ <name>HAWQ</name>
+ <extends>common-services/HAWQ/2.0.0</extends>
+ </service>
+ </services>
+</metainfo>
http://git-wip-us.apache.org/repos/asf/ambari/blob/9196eb7a/ambari-server/src/main/resources/stacks/PHD/3.3/services/PXF/metainfo.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/PHD/3.3/services/PXF/metainfo.xml b/ambari-server/src/main/resources/stacks/PHD/3.3/services/PXF/metainfo.xml
new file mode 100644
index 0000000..e9003ce
--- /dev/null
+++ b/ambari-server/src/main/resources/stacks/PHD/3.3/services/PXF/metainfo.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0"?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+<metainfo>
+ <schemaVersion>2.0</schemaVersion>
+ <services>
+ <service>
+ <name>PXF</name>
+ <extends>common-services/PXF/3.0.0</extends>
+ </service>
+ </services>
+</metainfo>