From b1088a057d14a17570490b8a315c5c286783557b Mon Sep 17 00:00:00 2001 From: Kevin Fenzi Date: Sun, 9 Sep 2018 21:23:10 +0000 Subject: [PATCH] lets enable some more things in openshift stg --- .../templates/cluster-inventory-stg.j2 | 20 +++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/roles/ansible-ansible-openshift-ansible/templates/cluster-inventory-stg.j2 b/roles/ansible-ansible-openshift-ansible/templates/cluster-inventory-stg.j2 index 50d9124dd3..d3511de415 100644 --- a/roles/ansible-ansible-openshift-ansible/templates/cluster-inventory-stg.j2 +++ b/roles/ansible-ansible-openshift-ansible/templates/cluster-inventory-stg.j2 @@ -737,14 +737,14 @@ openshift_hosted_metrics_deploy=true # Prometheus deployment # # Currently prometheus deployment is disabled by default, enable it by setting this -#openshift_hosted_prometheus_deploy=true +openshift_hosted_prometheus_deploy=true # # Prometheus storage config # By default prometheus uses emptydir storage, if you want to persist you should # configure it to use pvc storage type. Each volume must be ReadWriteOnce. -#openshift_prometheus_storage_type=emptydir -#openshift_prometheus_alertmanager_storage_type=emptydir -#openshift_prometheus_alertbuffer_storage_type=emptydir +openshift_prometheus_storage_type=emptydir +openshift_prometheus_alertmanager_storage_type=emptydir +openshift_prometheus_alertbuffer_storage_type=emptydir # Use PVCs for persistence #openshift_prometheus_storage_type=pvc #openshift_prometheus_alertmanager_storage_type=pvc @@ -954,21 +954,21 @@ openshift_master_console_port={{openshift_console_port}} #openshift_buildoverrides_json='{"BuildOverrides":{"configuration":{"apiVersion":"v1","kind":"BuildDefaultsConfig","forcePull":"true"}}}' # Enable service catalog -#openshift_enable_service_catalog=true +openshift_enable_service_catalog=true # Enable template service broker (requires service catalog to be enabled, above) -#template_service_broker_install=true +template_service_broker_install=true # Specify an openshift_service_catalog image # (defaults for origin and openshift-enterprise, repsectively) #openshift_service_catalog_image="docker.io/openshift/origin-service-catalog:{ openshift_image_tag }"" -#openshift_service_catalog_image="registry.access.redhat.com/openshift3/ose-service-catalog:{ openshift_image_tag }" +openshift_service_catalog_image="registry.access.redhat.com/openshift3/ose-service-catalog:{ openshift_image_tag }" # TSB image tag -#template_service_broker_version='v3.9' +template_service_broker_version='v3.10' # Configure one of more namespaces whose templates will be served by the TSB -#openshift_template_service_broker_namespaces=['openshift'] +openshift_template_service_broker_namespaces=['openshift'] # masterConfig.volumeConfig.dynamicProvisioningEnabled, configurable as of 1.2/3.2, enabled by default #openshift_master_dynamic_provisioning_enabled=True @@ -977,7 +977,7 @@ openshift_master_console_port={{openshift_console_port}} #openshift_master_admission_plugin_config={"ProjectRequestLimit":{"configuration":{"apiVersion":"v1","kind":"ProjectRequestLimitConfig","limits":[{"selector":{"admin":"true"}},{"maxProjects":"1"}]}},"PodNodeConstraints":{"configuration":{"apiVersion":"v1","kind":"PodNodeConstraintsConfig"}}} # Configure usage of openshift_clock role. -#openshift_clock_enabled=true +openshift_clock_enabled=true # OpenShift Per-Service Environment Variables # Environment variables are added to /etc/sysconfig files for