Update hosts_template for ocp-ha-disconnected (#403)

Nate Stephany

2019-04-30 5618fc9d5c7e69a3d08455e05dc9408063b170c0

Update hosts_template for ocp-ha-disconnected (#403)

-Vars were causing issues for some students and are unecessary
-Remove openshift_hosted_prometheus vars
-Remove openshift_grafana vars

 ansible/configs/ocp-ha-disconnected-lab/files/hosts_template.3.11.59.j2

@@ -60,9 +60,6 @@
openshift_docker_blocked_registries=registry.redhat.io,registry.access.redhat.com,docker.io
# openshift_docker_additional_registries=

# For Operator Framework Images
# openshift_additional_registry_credentials=[{'host':'registry.connect.redhat.com','user':'{{ redhat_registry_user }}','password':'{{ redhat_registry_password }}','test_image':'mongodb/enterprise-operator:0.3.2'}]

openshift_examples_modify_imagestreams=true

{% if install_glusterfs|bool %}
@@ -186,9 +183,6 @@
# Prometheus Metrics
#########################

openshift_hosted_prometheus_deploy=true
openshift_prometheus_node_selector={"node-role.kubernetes.io/infra":"true"}

openshift_cluster_monitoring_operator_install=true

{% if install_glusterfs|bool %}
@@ -251,14 +245,6 @@
{# The following file will need to be copied over to the bastion before deployment
# There is an example in ocp-workshop/files
# openshift_prometheus_additional_rules_file=/root/prometheus_alerts_rules.yml #}

# Grafana
openshift_grafana_storage_type=pvc
openshift_grafana_pvc_size=2Gi
openshift_grafana_node_exporter=true
{% if install_glusterfs|bool %}
openshift_grafana_sc_name=glusterfs-storage
{% endif %}

########################
# Cluster Logging

 ansible/configs/ocp-ha-disconnected-lab/files/labs_hosts_template.3.11.59.j2

@@ -60,9 +60,6 @@
openshift_docker_blocked_registries=
openshift_docker_additional_registries=

# For Operator Framework Images
openshift_additional_registry_credentials=

openshift_examples_modify_imagestreams=

{% if install_glusterfs|bool %}
@@ -189,10 +186,6 @@
# Prometheus Metrics
#########################

openshift_hosted_prometheus_deploy=
openshift_prometheus_namespace=
openshift_prometheus_node_selector=

openshift_cluster_monitoring_operator_install=

{% if install_glusterfs|bool %}
@@ -256,10 +249,6 @@
# There is an example in ocp-workshop/files
# openshift_prometheus_additional_rules_file=/root/prometheus_alerts_rules.yml #}

# Grafana
openshift_grafana_storage_type=
openshift_grafana_pvc_size=
openshift_grafana_node_exporter=
{% if install_glusterfs|bool %}
openshift_grafana_sc_name=glusterfs-storage
{% endif %}