Clean up intly vars (#1222)

Gerard Ryan

2020-03-03 52ef77ff449478f99f1b4c5d8ac1030211ceee00

Clean up intly vars (#1222)

* Don't set gitea=false for intly workload playbook

The default is now false in integreatly:
https://github.com/integr8ly/installation/blob/master/inventories/group_vars/all/manifest.yaml#L70

* Use existing default for amq_streams in intly

The default is already true in integreatly for RHPDS:
https://github.com/integr8ly/installation/blob/49637dcf73c50ff516618f2321bb27175583eb05/inventories/group_vars/pds/pds.yml#L6

 ansible/roles/ocp-workload-integreatly/defaults/main.yml

@@ -8,7 +8,6 @@
release_tag: "release-{{ ig_version }}"
webapp_namespace: webapp
self_signed_certs_enabled: True
amq_streams: True
openshift_master_config_path: /etc/origin/master/master-config.yaml
cluster_admin_username: admin@example.com
cluster_admin_password: ""

 ansible/roles/ocp-workload-integreatly/tasks/remove_workload.yml

@@ -1,9 +1,7 @@
---

- name: Uninstall Integreatly
  shell: |
          ansible-playbook -i "{{ inventory_hosts_file }}" \
          playbooks/uninstall.yml -e amq_streams="{{ amq_streams }}"
  shell: ansible-playbook -i "{{ inventory_hosts_file }}" playbooks/uninstall.yml
  args:
    chdir: "{{ install_dir }}"


 ansible/roles/ocp-workload-integreatly/tasks/workload.yml

@@ -7,7 +7,7 @@
  when: lets_encrypt_production|bool

- name: Generate passwords
  set_fact: 
  set_fact:
    cluster_admin_password: "{{ lookup('password', '/tmp/cluster_{{ ansible_date_time.iso8601_micro | to_uuid }} length=15 chars=ascii_letters,digits') }}"
    evals_password: "{{ lookup('password', '/tmp/evals_{{ ansible_date_time.iso8601_micro | to_uuid }} length=15 chars=ascii_letters,digits') }}"
    customer_admin_password: "{{ lookup('password', '/tmp/customer_{{ ansible_date_time.iso8601_micro | to_uuid }} length=15 chars=ascii_letters,digits') }}"
@@ -19,11 +19,9 @@
          playbooks/install.yml \
          -e eval_self_signed_certs="{{ self_signed_certs_enabled }} \
          -e rhsso_identity_provider_ca_cert_path={{ rhsso_identity_provider_ca_cert_path }} \
          -e amq_streams={{ amq_streams }} \
          -e rhsso_seed_users_password={{ evals_password }} \
          -e rhsso_evals_admin_password={{ customer_admin_password }} \
          -e rhsso_cluster_admin_password={{ cluster_admin_password }}" \
          -e gitea=false \
          | tee -a "{{ integreatly_logs }}"
  args:
    chdir: "{{ install_dir }}"