Code cleanup and add conditional for FTL install (#990)

Nate Stephany

2020-01-14 6836a5f75cc9d65f9dcb1e9ecde7aaf6dadbeccb

Code cleanup and add conditional for FTL install (#990)

* Code cleanup and add conditional for FTL install

* remove k8s tasks

 ansible/roles/bastion-lite/tasks/k8s.yml

File was deleted

 ansible/roles/bastion-lite/tasks/main.yml

@@ -45,29 +45,11 @@
    path: /etc/sysconfig/iptables
  register: statiptables

# TODO: This is used for python-openshift, but the k8s module needs just openshift, 
# which we can pin and get from PIP to avoid EPEL
# - name: Install Python pip/openshift/virtualenv for k8s module use on bastion
#   include_tasks: k8s.yml
#   when: install_k8s_modules | default(false)

# Add FTL to bastions
- name: Install FTL
  when: install_ftl | d(False) | bool
  when: >-
    install_ftl | d(False) | bool or
    ftl_injector_tag is defined
  block:
# TODO: This should not be required if we add proper python modules in earlier
# Also, it is a duplicate of the imported k8s.yml playbook
  # - name: Add epel-release repo
  #   yum:
  #     state: present
  #     name: https://dl.fedoraproject.org/pub/epel/epel-release-latest-7.noarch.rpm

  # - name: Install Python Dependencies
  #   yum:
  #     state: present
  #     name:
  #     - python-openshift

  - name: Install FTL
    include_role:
      name: ftl-injector
@@ -83,7 +65,6 @@
    owner: root
    group: root

# TODO: Move this to GPTE s3 public bucket
- name: Install stern (multi-pod logging tool) on the bastion
  get_url:
    url: https://gpte-public.s3.amazonaws.com/stern_linux_amd64