You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by ao...@apache.org on 2013/12/19 13:51:07 UTC
git commit: AMBARI-4120. Fix HBase on 2.0._ failing in security,
oozie alerts (aonishuk)
Updated Branches:
refs/heads/trunk 69faaf7be -> 8692e9c9a
AMBARI-4120. Fix HBase on 2.0._ failing in security, oozie alerts
(aonishuk)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/8692e9c9
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/8692e9c9
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/8692e9c9
Branch: refs/heads/trunk
Commit: 8692e9c9a810885f8bc22e9c7c99faaf5544c556
Parents: 69faaf7
Author: Andrew Onischuk <ao...@hortonworks.com>
Authored: Thu Dec 19 04:40:14 2013 -0800
Committer: Andrew Onischuk <ao...@hortonworks.com>
Committed: Thu Dec 19 04:40:14 2013 -0800
----------------------------------------------------------------------
.../core/resources/__init__.py | 22 ++++++++++++++++++++
.../core/resources/accounts.py | 21 +++++++++++++++++++
.../core/resources/packaging.py | 22 ++++++++++++++++++++
.../core/resources/service.py | 22 ++++++++++++++++++++
.../core/resources/system.py | 22 ++++++++++++++++++++
.../libraries/functions/check_process_status.py | 22 ++++++++++++++++++++
.../libraries/functions/get_kinit_path.py | 22 ++++++++++++++++++++
.../functions/get_unique_id_and_date.py | 22 ++++++++++++++++++++
.../libraries/providers/monitor_webserver.py | 22 ++++++++++++++++++++
.../HBASE/package/scripts/hbase_master.py | 1 +
.../HBASE/package/scripts/hbase_regionserver.py | 1 +
.../package/templates/hadoop-services.cfg.j2 | 2 +-
pom.xml | 3 ++-
13 files changed, 202 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/8692e9c9/ambari-agent/src/main/python/resource_management/core/resources/__init__.py
----------------------------------------------------------------------
diff --git a/ambari-agent/src/main/python/resource_management/core/resources/__init__.py b/ambari-agent/src/main/python/resource_management/core/resources/__init__.py
index c4150ed..d5e903c 100644
--- a/ambari-agent/src/main/python/resource_management/core/resources/__init__.py
+++ b/ambari-agent/src/main/python/resource_management/core/resources/__init__.py
@@ -1,3 +1,25 @@
+#!/usr/bin/env python
+"""
+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.
+
+Ambari Agent
+
+"""
+
from resource_management.core.resources.accounts import *
from resource_management.core.resources.packaging import *
from resource_management.core.resources.service import *
http://git-wip-us.apache.org/repos/asf/ambari/blob/8692e9c9/ambari-agent/src/main/python/resource_management/core/resources/accounts.py
----------------------------------------------------------------------
diff --git a/ambari-agent/src/main/python/resource_management/core/resources/accounts.py b/ambari-agent/src/main/python/resource_management/core/resources/accounts.py
index cd86de2..f498db5 100644
--- a/ambari-agent/src/main/python/resource_management/core/resources/accounts.py
+++ b/ambari-agent/src/main/python/resource_management/core/resources/accounts.py
@@ -1,3 +1,24 @@
+#!/usr/bin/env python
+"""
+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.
+
+Ambari Agent
+
+"""
__all__ = ["Group", "User"]
from resource_management.core.base import Resource, ForcedListArgument, ResourceArgument, BooleanArgument
http://git-wip-us.apache.org/repos/asf/ambari/blob/8692e9c9/ambari-agent/src/main/python/resource_management/core/resources/packaging.py
----------------------------------------------------------------------
diff --git a/ambari-agent/src/main/python/resource_management/core/resources/packaging.py b/ambari-agent/src/main/python/resource_management/core/resources/packaging.py
index 8ca4534..c2ff20e 100644
--- a/ambari-agent/src/main/python/resource_management/core/resources/packaging.py
+++ b/ambari-agent/src/main/python/resource_management/core/resources/packaging.py
@@ -1,3 +1,25 @@
+#!/usr/bin/env python
+"""
+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.
+
+Ambari Agent
+
+"""
+
__all__ = ["Package"]
from resource_management.core.base import Resource, ForcedListArgument, ResourceArgument
http://git-wip-us.apache.org/repos/asf/ambari/blob/8692e9c9/ambari-agent/src/main/python/resource_management/core/resources/service.py
----------------------------------------------------------------------
diff --git a/ambari-agent/src/main/python/resource_management/core/resources/service.py b/ambari-agent/src/main/python/resource_management/core/resources/service.py
index 94f03b2..20d5c1b 100644
--- a/ambari-agent/src/main/python/resource_management/core/resources/service.py
+++ b/ambari-agent/src/main/python/resource_management/core/resources/service.py
@@ -1,3 +1,25 @@
+#!/usr/bin/env python
+"""
+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.
+
+Ambari Agent
+
+"""
+
__all__ = ["Service"]
from resource_management.core.base import Resource, ResourceArgument, ForcedListArgument
http://git-wip-us.apache.org/repos/asf/ambari/blob/8692e9c9/ambari-agent/src/main/python/resource_management/core/resources/system.py
----------------------------------------------------------------------
diff --git a/ambari-agent/src/main/python/resource_management/core/resources/system.py b/ambari-agent/src/main/python/resource_management/core/resources/system.py
index c8c31e3..85f4b04 100644
--- a/ambari-agent/src/main/python/resource_management/core/resources/system.py
+++ b/ambari-agent/src/main/python/resource_management/core/resources/system.py
@@ -1,3 +1,25 @@
+#!/usr/bin/env python
+"""
+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.
+
+Ambari Agent
+
+"""
+
__all__ = ["File", "Directory", "Link", "Execute", "ExecuteScript", "Mount"]
from resource_management.core.base import Resource, ForcedListArgument, ResourceArgument, BooleanArgument
http://git-wip-us.apache.org/repos/asf/ambari/blob/8692e9c9/ambari-agent/src/main/python/resource_management/libraries/functions/check_process_status.py
----------------------------------------------------------------------
diff --git a/ambari-agent/src/main/python/resource_management/libraries/functions/check_process_status.py b/ambari-agent/src/main/python/resource_management/libraries/functions/check_process_status.py
index 6bb08ea..b127b6a 100644
--- a/ambari-agent/src/main/python/resource_management/libraries/functions/check_process_status.py
+++ b/ambari-agent/src/main/python/resource_management/libraries/functions/check_process_status.py
@@ -1,3 +1,25 @@
+#!/usr/bin/env python
+"""
+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.
+
+Ambari Agent
+
+"""
+
from resource_management.core.exceptions import ComponentIsNotRunning
__all__ = ["check_process_status"]
http://git-wip-us.apache.org/repos/asf/ambari/blob/8692e9c9/ambari-agent/src/main/python/resource_management/libraries/functions/get_kinit_path.py
----------------------------------------------------------------------
diff --git a/ambari-agent/src/main/python/resource_management/libraries/functions/get_kinit_path.py b/ambari-agent/src/main/python/resource_management/libraries/functions/get_kinit_path.py
index e2daa58..74d331d 100644
--- a/ambari-agent/src/main/python/resource_management/libraries/functions/get_kinit_path.py
+++ b/ambari-agent/src/main/python/resource_management/libraries/functions/get_kinit_path.py
@@ -1,3 +1,25 @@
+#!/usr/bin/env python
+"""
+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.
+
+Ambari Agent
+
+"""
+
__all__ = ["get_kinit_path"]
import os
http://git-wip-us.apache.org/repos/asf/ambari/blob/8692e9c9/ambari-agent/src/main/python/resource_management/libraries/functions/get_unique_id_and_date.py
----------------------------------------------------------------------
diff --git a/ambari-agent/src/main/python/resource_management/libraries/functions/get_unique_id_and_date.py b/ambari-agent/src/main/python/resource_management/libraries/functions/get_unique_id_and_date.py
index 3bafdbf..1a9cbcb 100644
--- a/ambari-agent/src/main/python/resource_management/libraries/functions/get_unique_id_and_date.py
+++ b/ambari-agent/src/main/python/resource_management/libraries/functions/get_unique_id_and_date.py
@@ -1,3 +1,25 @@
+#!/usr/bin/env python
+"""
+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.
+
+Ambari Agent
+
+"""
+
__all__ = ["get_unique_id_and_date"]
import datetime
from resource_management.core.shell import checked_call
http://git-wip-us.apache.org/repos/asf/ambari/blob/8692e9c9/ambari-agent/src/main/python/resource_management/libraries/providers/monitor_webserver.py
----------------------------------------------------------------------
diff --git a/ambari-agent/src/main/python/resource_management/libraries/providers/monitor_webserver.py b/ambari-agent/src/main/python/resource_management/libraries/providers/monitor_webserver.py
index 50f5791..8487f66 100644
--- a/ambari-agent/src/main/python/resource_management/libraries/providers/monitor_webserver.py
+++ b/ambari-agent/src/main/python/resource_management/libraries/providers/monitor_webserver.py
@@ -1,3 +1,25 @@
+#!/usr/bin/env python
+"""
+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.
+
+Ambari Agent
+
+"""
+
from resource_management import *
from resource_management.core.system import System
http://git-wip-us.apache.org/repos/asf/ambari/blob/8692e9c9/ambari-server/src/main/resources/stacks/HDP/2.0._/services/HBASE/package/scripts/hbase_master.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.0._/services/HBASE/package/scripts/hbase_master.py b/ambari-server/src/main/resources/stacks/HDP/2.0._/services/HBASE/package/scripts/hbase_master.py
index 6036e73..d94b4b4 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.0._/services/HBASE/package/scripts/hbase_master.py
+++ b/ambari-server/src/main/resources/stacks/HDP/2.0._/services/HBASE/package/scripts/hbase_master.py
@@ -39,6 +39,7 @@ class HbaseMaster(Script):
def start(self, env):
import params
env.set_params(params)
+ self.configure(env) # for security
hbase_service( 'master',
action = 'start'
http://git-wip-us.apache.org/repos/asf/ambari/blob/8692e9c9/ambari-server/src/main/resources/stacks/HDP/2.0._/services/HBASE/package/scripts/hbase_regionserver.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.0._/services/HBASE/package/scripts/hbase_regionserver.py b/ambari-server/src/main/resources/stacks/HDP/2.0._/services/HBASE/package/scripts/hbase_regionserver.py
index 927ec4f..014d0ab 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.0._/services/HBASE/package/scripts/hbase_regionserver.py
+++ b/ambari-server/src/main/resources/stacks/HDP/2.0._/services/HBASE/package/scripts/hbase_regionserver.py
@@ -39,6 +39,7 @@ class HbaseRegionServer(Script):
def start(self, env):
import params
env.set_params(params)
+ self.configure(env) # for security
hbase_service( 'regionserver',
action = 'start'
http://git-wip-us.apache.org/repos/asf/ambari/blob/8692e9c9/ambari-server/src/main/resources/stacks/HDP/2.0._/services/NAGIOS/package/templates/hadoop-services.cfg.j2
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.0._/services/NAGIOS/package/templates/hadoop-services.cfg.j2 b/ambari-server/src/main/resources/stacks/HDP/2.0._/services/NAGIOS/package/templates/hadoop-services.cfg.j2
index 96fce7c..be14e57 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.0._/services/NAGIOS/package/templates/hadoop-services.cfg.j2
+++ b/ambari-server/src/main/resources/stacks/HDP/2.0._/services/NAGIOS/package/templates/hadoop-services.cfg.j2
@@ -612,7 +612,7 @@ define service {
service_description OOZIE::Oozie Server status
servicegroups OOZIE
{% if security_enabled %}
- check_command check_oozie_status!{{ oozie_server_port }}!{{ java64_home }}!true!{{ nagios_keytab_path }}>!{{ nagios_principal_name }}!{{ kinit_path_local }}
+ check_command check_oozie_status!{{ oozie_server_port }}!{{ java64_home }}!true!{{ nagios_keytab_path }}!{{ nagios_principal_name }}!{{ kinit_path_local }}
{% else %}
check_command check_oozie_status!{{ oozie_server_port }}!{{ java64_home }}!false
{% endif %}
http://git-wip-us.apache.org/repos/asf/ambari/blob/8692e9c9/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 5d86dc0..36af3c1 100644
--- a/pom.xml
+++ b/pom.xml
@@ -153,7 +153,8 @@
<!--Python Mock library (BSD license)-->
<exclude>ambari-common/src/test/python/mock/**</exclude>
-
+ <!--Jinja2 library (BSD license)-->
+ <exclude>ambari-common/src/main/python/jinja2/**</exclude>
</excludes>
</configuration>
</plugin>