From 0269a0d408b1a3d2f6193860b2beeb62c42dd279 Mon Sep 17 00:00:00 2001
From: Paul Belanger <pabelanger@redhat.com>
Date: Thu, 24 Nov 2016 18:19:17 -0500
Subject: [PATCH] Remove unsupported code

This should have been removed from the initial commit, but we merged
to fast.

Change-Id: Id3eeb22af1341be4238d8fc15311a26d2b951562
Signed-off-by: Paul Belanger <pabelanger@redhat.com>
---
 defaults/main.yaml         |  7 -------
 tasks/install.yaml         | 13 -------------
 tasks/install/git.yaml     | 20 --------------------
 tasks/install/tarball.yaml | 25 -------------------------
 tests/test.yaml            |  8 --------
 vars/Debian.yaml           |  2 --
 vars/RedHat.yaml           |  2 --
 7 files changed, 77 deletions(-)
 delete mode 100644 tasks/install/git.yaml
 delete mode 100644 tasks/install/tarball.yaml

diff --git a/defaults/main.yaml b/defaults/main.yaml
index 37b13fb..c80d46e 100644
--- a/defaults/main.yaml
+++ b/defaults/main.yaml
@@ -18,13 +18,6 @@ zookeeper_task_manager:
   - service
 
 # tasks/install.yaml
-zookeeper_git_dest: /opt/ansible-role-zookeeper/git/pypa/zookeeper
-zookeeper_git_uri: git://git.apache.org/zookeeper.git
-zookeeper_git_version: master
-
-zookeeper_get_url_dest: /opt/ansible-role-zookeeper/tarball/
-zookeeper_get_url_url: http://apache.org/dist/zookeeper/zookeeper-3.4.9/zookeeper-3.4.9.tar.gz
-
 zookeeper_package_name: zookeeperd
 zookeeper_package_state: installed
 
diff --git a/tasks/install.yaml b/tasks/install.yaml
index 5e586c9..faecfe5 100644
--- a/tasks/install.yaml
+++ b/tasks/install.yaml
@@ -12,17 +12,4 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 ---
-- name: Define zookeeper_build_depends.
-  set_fact:
-    zookeeper_build_depends: "{{ __zookeeper_build_depends | list }}"
-  when: zookeeper_build_depends is not defined
-
-- name: Ensure build dependencies are installed
-  become: yes
-  package:
-    name: "{{ item }}"
-    state: installed
-  with_items: "{{ zookeeper_build_depends }}"
-  when: zookeeper_install_method == 'git'
-
 - include: "install/{{ zookeeper_install_method }}.yaml"
diff --git a/tasks/install/git.yaml b/tasks/install/git.yaml
deleted file mode 100644
index 0c88f8e..0000000
--- a/tasks/install/git.yaml
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 2015 Red Hat, Inc.
-#
-# Licensed 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.
----
-- name: Git clone zookeeper.
-  become: yes
-  git:
-    dest: "{{ zookeeper_git_dest }}"
-    repo: "{{ zookeeper_git_uri }}"
-    version: "{{ zookeeper_git_version }}"
diff --git a/tasks/install/tarball.yaml b/tasks/install/tarball.yaml
deleted file mode 100644
index c8e9ed1..0000000
--- a/tasks/install/tarball.yaml
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 2016 Red Hat, Inc.
-#
-# Licensed 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.
----
-- name: Create directory for get_url.
-  become: yes
-  file:
-    dest: "{{ zookeeper_get_url_dest }}"
-    state: directory
-
-- name: Download zookeeper tarball.
-  become: yes
-  get_url:
-    dest: "{{ zookeeper_get_url_dest }}"
-    url: "{{ zookeeper_get_url_url }}"
diff --git a/tests/test.yaml b/tests/test.yaml
index 0b019ae..a147a80 100644
--- a/tests/test.yaml
+++ b/tests/test.yaml
@@ -32,14 +32,6 @@
         that:
           - zookeeper_service_zookeeper
 
-    - name: Ensure zookeeper_user_name is zookeeper.
-      shell: /usr/bin/getent passwd zookeeper
-      tags: skip_ansible_lint
-
-    - name: Ensure zookeeper_user_group is zookeeper.
-      shell: /usr/bin/getent group zookeeper
-      tags: skip_ansible_lint
-
     - name: Ensure zookeeper is running.
       become: yes
       shell: /usr/sbin/service zookeeper status
diff --git a/vars/Debian.yaml b/vars/Debian.yaml
index de225f3..189b8b9 100644
--- a/vars/Debian.yaml
+++ b/vars/Debian.yaml
@@ -25,5 +25,3 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 ---
-__zookeeper_build_depends:
-  - git
diff --git a/vars/RedHat.yaml b/vars/RedHat.yaml
index 1ceacc2..ca41d99 100644
--- a/vars/RedHat.yaml
+++ b/vars/RedHat.yaml
@@ -12,5 +12,3 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 ---
-__zookeeper_build_depends:
-  - git