Repository: ambari Updated Branches: refs/heads/branch-2.4 834911835 -> f3c55c769
AMBARI-17428 Falcon client install failed (dsen) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/f3c55c76 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/f3c55c76 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/f3c55c76 Branch: refs/heads/branch-2.4 Commit: f3c55c769ad9af8b17e28e473e9263f2ca2e7772 Parents: 8349118 Author: Dmytro Sen <[email protected]> Authored: Fri Jun 24 16:55:03 2016 +0300 Committer: Dmytro Sen <[email protected]> Committed: Fri Jun 24 16:55:38 2016 +0300 ---------------------------------------------------------------------- .../configuration/falcon-client.properties.xml | 29 ++++++++++++++++++++ .../FALCON/0.5.0.2.1/metainfo.xml | 1 + .../FALCON/0.5.0.2.1/package/scripts/falcon.py | 3 -- .../configuration/falcon-client.properties.xml | 29 ++++++++++++++++++++ .../2.1.GlusterFS/services/FALCON/metainfo.xml | 3 +- .../services/FALCON/package/scripts/params.py | 1 + 6 files changed, 62 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/f3c55c76/ambari-server/src/main/resources/common-services/FALCON/0.5.0.2.1/configuration/falcon-client.properties.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/common-services/FALCON/0.5.0.2.1/configuration/falcon-client.properties.xml b/ambari-server/src/main/resources/common-services/FALCON/0.5.0.2.1/configuration/falcon-client.properties.xml new file mode 100644 index 0000000..f91f58a --- /dev/null +++ b/ambari-server/src/main/resources/common-services/FALCON/0.5.0.2.1/configuration/falcon-client.properties.xml @@ -0,0 +1,29 @@ +<?xml version="1.0"?> +<?xml-stylesheet type="text/xsl" href="configuration.xsl"?> +<!-- +/** + * 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. + */ +--> +<configuration supports_final="false"> + <property> + <name>falcon.url</name> + <value>http://{{falcon_host}}:{{falcon_port}}</value> + <description/> + <on-ambari-upgrade add="true"/> + </property> +</configuration> http://git-wip-us.apache.org/repos/asf/ambari/blob/f3c55c76/ambari-server/src/main/resources/common-services/FALCON/0.5.0.2.1/metainfo.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/common-services/FALCON/0.5.0.2.1/metainfo.xml b/ambari-server/src/main/resources/common-services/FALCON/0.5.0.2.1/metainfo.xml index 985e7f4..602144b 100644 --- a/ambari-server/src/main/resources/common-services/FALCON/0.5.0.2.1/metainfo.xml +++ b/ambari-server/src/main/resources/common-services/FALCON/0.5.0.2.1/metainfo.xml @@ -114,6 +114,7 @@ <config-type>falcon-env</config-type> <config-type>falcon-startup.properties</config-type> <config-type>falcon-runtime.properties</config-type> + <config-type>falcon-client.properties</config-type> </configuration-dependencies> <excluded-config-types> http://git-wip-us.apache.org/repos/asf/ambari/blob/f3c55c76/ambari-server/src/main/resources/common-services/FALCON/0.5.0.2.1/package/scripts/falcon.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/common-services/FALCON/0.5.0.2.1/package/scripts/falcon.py b/ambari-server/src/main/resources/common-services/FALCON/0.5.0.2.1/package/scripts/falcon.py index 2bdaa48..2fd1add 100644 --- a/ambari-server/src/main/resources/common-services/FALCON/0.5.0.2.1/package/scripts/falcon.py +++ b/ambari-server/src/main/resources/common-services/FALCON/0.5.0.2.1/package/scripts/falcon.py @@ -220,9 +220,6 @@ def falcon(type, action = None, upgrade_type=None): File(os.path.join(params.falcon_conf_dir, 'falcon-env.sh'), content = InlineTemplate(params.falcon_env_sh_template)) - File(os.path.join(params.falcon_conf_dir, 'client.properties'), - content = Template('client.properties.j2')) - PropertiesFile(os.path.join(params.falcon_conf_dir, 'runtime.properties'), properties = params.falcon_runtime_properties) http://git-wip-us.apache.org/repos/asf/ambari/blob/f3c55c76/ambari-server/src/main/resources/stacks/HDP/2.1.GlusterFS/services/FALCON/configuration/falcon-client.properties.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/HDP/2.1.GlusterFS/services/FALCON/configuration/falcon-client.properties.xml b/ambari-server/src/main/resources/stacks/HDP/2.1.GlusterFS/services/FALCON/configuration/falcon-client.properties.xml new file mode 100644 index 0000000..f91f58a --- /dev/null +++ b/ambari-server/src/main/resources/stacks/HDP/2.1.GlusterFS/services/FALCON/configuration/falcon-client.properties.xml @@ -0,0 +1,29 @@ +<?xml version="1.0"?> +<?xml-stylesheet type="text/xsl" href="configuration.xsl"?> +<!-- +/** + * 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. + */ +--> +<configuration supports_final="false"> + <property> + <name>falcon.url</name> + <value>http://{{falcon_host}}:{{falcon_port}}</value> + <description/> + <on-ambari-upgrade add="true"/> + </property> +</configuration> http://git-wip-us.apache.org/repos/asf/ambari/blob/f3c55c76/ambari-server/src/main/resources/stacks/HDP/2.1.GlusterFS/services/FALCON/metainfo.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/HDP/2.1.GlusterFS/services/FALCON/metainfo.xml b/ambari-server/src/main/resources/stacks/HDP/2.1.GlusterFS/services/FALCON/metainfo.xml index 2e444b1..d942229 100644 --- a/ambari-server/src/main/resources/stacks/HDP/2.1.GlusterFS/services/FALCON/metainfo.xml +++ b/ambari-server/src/main/resources/stacks/HDP/2.1.GlusterFS/services/FALCON/metainfo.xml @@ -96,8 +96,9 @@ <config-type>falcon-env</config-type> <config-type>falcon-startup.properties</config-type> <config-type>falcon-runtime.properties</config-type> + <config-type>falcon-client.properties</config-type> </configuration-dependencies> </service> </services> -</metainfo> \ No newline at end of file +</metainfo> http://git-wip-us.apache.org/repos/asf/ambari/blob/f3c55c76/ambari-server/src/main/resources/stacks/HDP/2.1.GlusterFS/services/FALCON/package/scripts/params.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/HDP/2.1.GlusterFS/services/FALCON/package/scripts/params.py b/ambari-server/src/main/resources/stacks/HDP/2.1.GlusterFS/services/FALCON/package/scripts/params.py index 41ecafa..7ef3d46 100644 --- a/ambari-server/src/main/resources/stacks/HDP/2.1.GlusterFS/services/FALCON/package/scripts/params.py +++ b/ambari-server/src/main/resources/stacks/HDP/2.1.GlusterFS/services/FALCON/package/scripts/params.py @@ -45,6 +45,7 @@ falcon_host = config['clusterHostInfo']['falcon_server_hosts'][0] falcon_port = config['configurations']['falcon-env']['falcon_port'] falcon_runtime_properties = config['configurations']['falcon-runtime.properties'] falcon_startup_properties = config['configurations']['falcon-startup.properties'] +falcon_client_properties = config['configurations']['falcon-client.properties'] smokeuser_keytab = config['configurations']['cluster-env']['smokeuser_keytab'] falcon_env_sh_template = config['configurations']['falcon-env']['content']
