Browse Source

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>
changes/40/402240/1
Paul Belanger 6 years ago
parent
commit
0269a0d408
  1. 7
      defaults/main.yaml
  2. 13
      tasks/install.yaml
  3. 20
      tasks/install/git.yaml
  4. 25
      tasks/install/tarball.yaml
  5. 8
      tests/test.yaml
  6. 2
      vars/Debian.yaml
  7. 2
      vars/RedHat.yaml

7
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

13
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"

20
tasks/install/git.yaml

@ -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 }}"

25
tasks/install/tarball.yaml

@ -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 }}"

8
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

2
vars/Debian.yaml

@ -25,5 +25,3 @@
# License for the specific language governing permissions and limitations
# under the License.
---
__zookeeper_build_depends:
- git

2
vars/RedHat.yaml

@ -12,5 +12,3 @@
# License for the specific language governing permissions and limitations
# under the License.
---
__zookeeper_build_depends:
- git

Loading…
Cancel
Save