Merge branch 'development' of https://github.com/sborenst/ansible_agnostic_...

Tok

2018-10-26 0c82e6872dc9c343a3c236e00492aabf2392dc17

Merge branch 'development' of https://github.com/sborenst/ansible_agnostic_deployer into development

 ansible/roles/ocp-workload-3scale-multitenant/templates/manage_tenants.sh

@@ -121,7 +121,7 @@
            fi

            # Gateway project should be additionally owned by user passed by AAD config/rhte-oc-cluster-vms workload
            oc adm policy add-user-to-role $ocp_username admin -n tenantAdminId-gw
            oc adm policy add-role-to-user admin $ocp_username -n $tenantAdminId-gw

            THREESCALE_PORTAL_ENDPOINT=https://$tenant_access_token@$orgName-admin.{{ocp_apps_domain}}
            BACKEND_ENDPOINT_OVERRIDE=http://backend-listener.{{ocp_project}}:3000

 ansible/roles/ocp-workload-bxms-dm/defaults/main.yml

@@ -26,3 +26,5 @@
deploy_status_delay: 20

DM_IS_URL: https://raw.githubusercontent.com/jboss-container-images/rhdm-7-openshift-image/7.0.1.GA/rhdm70-image-streams.yaml

ocp_apps_domain: apps.{{subdomain_base}}

 ansible/roles/ocp-workload-bxms-dm/readme.adoc

@@ -8,42 +8,27 @@

=== Deploy a Workload with the `ocp-workload` playbook [Mostly for testing]
----
SUBDOMAIN_BASE=`oc whoami --show-server | cut -d'.' -f 2,3,4,5 | cut -d':' -f 1`
GUID=jb45
HOST_GUID=dev39
TARGET_HOST="bastion.$HOST_GUID.openshift.opentlc.com"
OCP_USERNAME="jbride-redhat.com"
WORKLOAD="ocp-workload-bxms-dm"
SSH_USERNAME="jbride-redhat.com"
SSH_PRIVATE_KEY="id_ocp"
OCP_USERNAME="jbride-redhat.com"

# a TARGET_HOST is specified in the command line, without using an inventory file
ansible-playbook -i ${TARGET_HOST}, ./configs/ocp-workloads/ocp-workload.yml \
                 -e"ansible_ssh_private_key_file=~/.ssh/${SSH_PRIVATE_KEY}" \
                 -e"ansible_ssh_user=${SSH_USERNAME}" \
ansible-playbook -i localhost, -c local ./configs/ocp-workloads/ocp-workload.yml \
                    -e"ANSIBLE_REPO_PATH=`pwd`" \
                    -e"ocp_username=${OCP_USERNAME}" \
                    -e"ocp_workload=${WORKLOAD}" \
                    -e"guid=${GUID}" \
                    -e"ocp_user_needs_quota=true" \
                    -e"ocp_apps_domain=apps.${HOST_GUID}.openshift.opentlc.com" \
                    -e"ACTION=create"
                    -e"ACTION=create" \
                    -e"subdomain_base=$SUBDOMAIN_BASE" \
                    -e"ocp_username=$OCP_USERNAME"

----

=== To Delete an environment
----
GUID=jb45
HOST_GUID=dev39
TARGET_HOST="bastion.$HOST_GUID.openshift.opentlc.com"
OCP_USERNAME="jbride-redhat.com"
WORKLOAD="ocp-workload-bxms-dm"
SSH_USERNAME="jbride-redhat.com"
SSH_PRIVATE_KEY="id_ocp"

# a TARGET_HOST is specified in the command line, without using an inventory file
ansible-playbook -i ${TARGET_HOST}, ./configs/ocp-workloads/ocp-workload.yml \
                 -e"ansible_ssh_private_key_file=~/.ssh/${SSH_PRIVATE_KEY}" \
                 -e"ansible_ssh_user=${SSH_USERNAME}" \
ansible-playbook -i localhost, -c local ./configs/ocp-workloads/ocp-workload.yml \
                    -e"ANSIBLE_REPO_PATH=`pwd`" \
                    -e"ocp_username=${OCP_USERNAME}" \
                    -e"ocp_workload=${WORKLOAD}" \

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

@@ -4,8 +4,9 @@
silent: False
install_dir: /tmp/integreatly
inventory_hosts_file: inventories/hosts
release_tag: release-1.0.0
release_tag: release-1.0.1
webapp_namespace: webapp
self_signed_certs_enabled: false
openshift_master_config_path: /etc/origin/master/master-config.yaml
admin_username: admin@example.com
admin_password: Password1

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

@@ -3,7 +3,7 @@
- name: Run Integreatly installer
  shell: |
          ansible-playbook -i "{{ inventory_hosts_file }}" \
          playbooks/install.yml
          playbooks/install.yml -e eval_self_signed_certs="{{ self_signed_certs_enabled }}"
  args:
    chdir: "{{ install_dir }}/evals"