You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@metron.apache.org by ce...@apache.org on 2016/03/21 18:06:19 UTC
[37/43] incubator-metron git commit: METRON-74: Remove Mysql RPM from
Project. (dlyle65535 via cestella) closes apache/incubator-metron#48
METRON-74: Remove Mysql RPM from Project. (dlyle65535 via cestella) closes apache/incubator-metron#48
Project: http://git-wip-us.apache.org/repos/asf/incubator-metron/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-metron/commit/d2808370
Tree: http://git-wip-us.apache.org/repos/asf/incubator-metron/tree/d2808370
Diff: http://git-wip-us.apache.org/repos/asf/incubator-metron/diff/d2808370
Branch: refs/heads/Metron_0.1BETA
Commit: d28083701d9102c9e41e9f4232a704142a88e8cb
Parents: c155293
Author: dlyle65535 <dl...@gmail.com>
Authored: Fri Mar 18 10:50:27 2016 -0400
Committer: cstella <ce...@gmail.com>
Committed: Fri Mar 18 10:50:27 2016 -0400
----------------------------------------------------------------------
.../ambari_common/tasks/passwd_less_ssh.yml | 2 +-
deployment/roles/ambari_master/tasks/main.yml | 2 +-
deployment/roles/mysql_client/tasks/main.yml | 2 +-
deployment/roles/mysql_server/defaults/main.yml | 20 +++++++++++++++++++
.../mysql57-community-release-el6-7.noarch.rpm | Bin 8848 -> 0 bytes
deployment/roles/mysql_server/tasks/main.yml | 17 ++++++++--------
deployment/roles/mysql_server/vars/main.yml | 20 -------------------
7 files changed, 31 insertions(+), 32 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-metron/blob/d2808370/deployment/roles/ambari_common/tasks/passwd_less_ssh.yml
----------------------------------------------------------------------
diff --git a/deployment/roles/ambari_common/tasks/passwd_less_ssh.yml b/deployment/roles/ambari_common/tasks/passwd_less_ssh.yml
index bb92f4e..6f613d2 100644
--- a/deployment/roles/ambari_common/tasks/passwd_less_ssh.yml
+++ b/deployment/roles/ambari_common/tasks/passwd_less_ssh.yml
@@ -29,5 +29,5 @@
#ambari_common.hosts
- name: Remove local copy of ssh keys
local_action: file path=/tmp/keys/{{ inventory_hostname }}.pub state=absent
- sudo: False
+ become: False
http://git-wip-us.apache.org/repos/asf/incubator-metron/blob/d2808370/deployment/roles/ambari_master/tasks/main.yml
----------------------------------------------------------------------
diff --git a/deployment/roles/ambari_master/tasks/main.yml b/deployment/roles/ambari_master/tasks/main.yml
index daf4e41..021e377 100644
--- a/deployment/roles/ambari_master/tasks/main.yml
+++ b/deployment/roles/ambari_master/tasks/main.yml
@@ -16,7 +16,7 @@
#
---
# tasks file for ambari_master
-- name: Install ambari repo
+- name: Install ambari server
yum: name=ambari-server state=present
- name: Setup ambari server
http://git-wip-us.apache.org/repos/asf/incubator-metron/blob/d2808370/deployment/roles/mysql_client/tasks/main.yml
----------------------------------------------------------------------
diff --git a/deployment/roles/mysql_client/tasks/main.yml b/deployment/roles/mysql_client/tasks/main.yml
index 32a7395..8c54c23 100644
--- a/deployment/roles/mysql_client/tasks/main.yml
+++ b/deployment/roles/mysql_client/tasks/main.yml
@@ -17,7 +17,7 @@
---
- name: Get Default mysql passowrd
- include_vars: "../roles/mysql_server/vars/main.yml"
+ include_vars: "../roles/mysql_server/defaults/main.yml"
when: mysql_root_password is undefined
- name: Allow remote login to mysql
http://git-wip-us.apache.org/repos/asf/incubator-metron/blob/d2808370/deployment/roles/mysql_server/defaults/main.yml
----------------------------------------------------------------------
diff --git a/deployment/roles/mysql_server/defaults/main.yml b/deployment/roles/mysql_server/defaults/main.yml
new file mode 100644
index 0000000..0acbd17
--- /dev/null
+++ b/deployment/roles/mysql_server/defaults/main.yml
@@ -0,0 +1,20 @@
+#
+# 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.
+#
+---
+mysql_rpm_version: mysql57-community-release-el6-7.noarch
+mysql_yum_repo_url: https://dev.mysql.com/get/{{ mysql_rpm_version }}.rpm
+mysql_root_password: P@ssw0rd
http://git-wip-us.apache.org/repos/asf/incubator-metron/blob/d2808370/deployment/roles/mysql_server/files/mysql57-community-release-el6-7.noarch.rpm
----------------------------------------------------------------------
diff --git a/deployment/roles/mysql_server/files/mysql57-community-release-el6-7.noarch.rpm b/deployment/roles/mysql_server/files/mysql57-community-release-el6-7.noarch.rpm
deleted file mode 100644
index 8603602..0000000
Binary files a/deployment/roles/mysql_server/files/mysql57-community-release-el6-7.noarch.rpm and /dev/null differ
http://git-wip-us.apache.org/repos/asf/incubator-metron/blob/d2808370/deployment/roles/mysql_server/tasks/main.yml
----------------------------------------------------------------------
diff --git a/deployment/roles/mysql_server/tasks/main.yml b/deployment/roles/mysql_server/tasks/main.yml
index 987c160..e97b245 100644
--- a/deployment/roles/mysql_server/tasks/main.yml
+++ b/deployment/roles/mysql_server/tasks/main.yml
@@ -17,20 +17,19 @@
---
- name: Create temporary directories
file:
- path: "/tmp/{{ item }}"
+ path: "/tmp/geoip"
state: directory
mode: 0755
- with_items:
- - "geoip"
-- name: Distribute Mysql
- copy:
- src: "{{ mysql_rpm_version }}.rpm"
- dest: /tmp
+- name: Install Mysql Community Release Repo Def
+ get_url:
+ dest: /tmp/{{ mysql_rpm_version }}.rpm
+ url: "{{ mysql_yum_repo_url }}"
-- name: Install Msyql Yum Repository
+- name: Install Mysql Community Release Repo
yum:
- name: "/tmp/{{ mysql_rpm_version }}.rpm"
+ pkg: /tmp/{{ mysql_rpm_version }}.rpm
+ state: installed
- name: Install MySQL
yum:
http://git-wip-us.apache.org/repos/asf/incubator-metron/blob/d2808370/deployment/roles/mysql_server/vars/main.yml
----------------------------------------------------------------------
diff --git a/deployment/roles/mysql_server/vars/main.yml b/deployment/roles/mysql_server/vars/main.yml
deleted file mode 100644
index ccf2426..0000000
--- a/deployment/roles/mysql_server/vars/main.yml
+++ /dev/null
@@ -1,20 +0,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.
-#
----
-mysql_rpm_version: mysql57-community-release-el6-7.noarch
-mysql_root_password: P@ssw0rd
-