Repository: ambari Updated Branches: refs/heads/trunk edce91c3e -> 4dd3bcb47
AMBARI-8911. Ambari uses filename that conflicts with python's "mysql" package (dlysnichenko) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/4dd3bcb4 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/4dd3bcb4 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/4dd3bcb4 Branch: refs/heads/trunk Commit: 4dd3bcb47140b333c7bd92d36418ab333eb6d04d Parents: edce91c Author: Lisnichenko Dmitro <[email protected]> Authored: Wed Dec 24 22:16:56 2014 +0200 Committer: Lisnichenko Dmitro <[email protected]> Committed: Wed Dec 24 22:48:22 2014 +0200 ---------------------------------------------------------------------- .../HIVE/0.12.0.2.0/package/scripts/mysql.py | 35 -------------------- .../0.12.0.2.0/package/scripts/mysql_server.py | 2 +- .../0.12.0.2.0/package/scripts/mysql_utils.py | 35 ++++++++++++++++++++ 3 files changed, 36 insertions(+), 36 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/4dd3bcb4/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/package/scripts/mysql.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/package/scripts/mysql.py b/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/package/scripts/mysql.py deleted file mode 100644 index 5006b56..0000000 --- a/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/package/scripts/mysql.py +++ /dev/null @@ -1,35 +0,0 @@ -#!/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. - -""" - -from resource_management import * -import mysql_users - -def mysql_configure(): - import params - - # required for running hive - replace_bind_address = ('sed','-i','s|^bind-address[ \t]*=.*|bind-address = 0.0.0.0|',params.mysql_configname) - Execute(replace_bind_address, - sudo = True, - ) - - # this also will start mysql-server - mysql_users.mysql_adduser() - \ No newline at end of file http://git-wip-us.apache.org/repos/asf/ambari/blob/4dd3bcb4/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/package/scripts/mysql_server.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/package/scripts/mysql_server.py b/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/package/scripts/mysql_server.py index 8f77c1c..40ddb86 100644 --- a/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/package/scripts/mysql_server.py +++ b/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/package/scripts/mysql_server.py @@ -24,7 +24,7 @@ import mysql_users from resource_management import * from mysql_service import mysql_service -from mysql import mysql_configure +from mysql_utils import mysql_configure class MysqlServer(Script): http://git-wip-us.apache.org/repos/asf/ambari/blob/4dd3bcb4/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/package/scripts/mysql_utils.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/package/scripts/mysql_utils.py b/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/package/scripts/mysql_utils.py new file mode 100644 index 0000000..5006b56 --- /dev/null +++ b/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/package/scripts/mysql_utils.py @@ -0,0 +1,35 @@ +#!/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. + +""" + +from resource_management import * +import mysql_users + +def mysql_configure(): + import params + + # required for running hive + replace_bind_address = ('sed','-i','s|^bind-address[ \t]*=.*|bind-address = 0.0.0.0|',params.mysql_configname) + Execute(replace_bind_address, + sudo = True, + ) + + # this also will start mysql-server + mysql_users.mysql_adduser() + \ No newline at end of file
