From e908d88b395387bf8fc49b0f8cb721abdc7ecdc8 Mon Sep 17 00:00:00 2001 From: Kevin Fenzi Date: Wed, 22 Aug 2018 21:50:44 +0000 Subject: [PATCH] fix a bunch more variables in comments --- .../templates/cluster-inventory-stg.j2 | 30 +++++++++---------- 1 file changed, 15 insertions(+), 15 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 02ea9acd29..4bf9e25412 100644 --- a/roles/ansible-ansible-openshift-ansible/templates/cluster-inventory-stg.j2 +++ b/roles/ansible-ansible-openshift-ansible/templates/cluster-inventory-stg.j2 @@ -303,8 +303,8 @@ openshift_master_identity_providers=[{"name": "fedoraidp", "login": "true", "cha # Note: You may make use of environment variables rather than store # sensitive configuration within the ansible inventory. # For example: -#openshift_cloudprovider_aws_access_key="{{ lookup('env','AWS_ACCESS_KEY_ID') }}" -#openshift_cloudprovider_aws_secret_key="{{ lookup('env','AWS_SECRET_ACCESS_KEY') }}" +#openshift_cloudprovider_aws_access_key="{ lookup('env','AWS_ACCESS_KEY_ID') }" +#openshift_cloudprovider_aws_secret_key="{ lookup('env','AWS_SECRET_ACCESS_KEY') }" # # AWS #openshift_cloudprovider_kind=aws @@ -654,17 +654,17 @@ openshift_hosted_metrics_deploy=true # `/hawkular/metrics` path will break installation of metrics. #openshift_metrics_hawkular_hostname=hawkular-metrics.example.com # Configure the metrics component images # Note, these will be modified by oreg_url by default -#openshift_metrics_cassandra_image="docker.io/openshift/origin-metrics-cassandra:{{ openshift_image_tag }}" -#openshift_metrics_hawkular_agent_image="docker.io/openshift/origin-metrics-hawkular-openshift-agent:{{ openshift_image_tag }}" -#openshift_metrics_hawkular_metrics_image="docker.io/openshift/origin-metrics-hawkular-metrics:{{ openshift_image_tag }}" -#openshift_metrics_schema_installer_image="docker.io/openshift/origin-metrics-schema-installer:{{ openshift_image_tag }}" -#openshift_metrics_heapster_image="docker.io/openshift/origin-metrics-heapster:{{ openshift_image_tag }}" +#openshift_metrics_cassandra_image="docker.io/openshift/origin-metrics-cassandra:{ openshift_image_tag }" +#openshift_metrics_hawkular_agent_image="docker.io/openshift/origin-metrics-hawkular-openshift-agent:{ openshift_image_tag }" +#openshift_metrics_hawkular_metrics_image="docker.io/openshift/origin-metrics-hawkular-metrics:{ openshift_image_tag }" +#openshift_metrics_schema_installer_image="docker.io/openshift/origin-metrics-schema-installer:{ openshift_image_tag }" +#openshift_metrics_heapster_image="docker.io/openshift/origin-metrics-heapster:{ openshift_image_tag }" # when openshift_deployment_type=='openshift-enterprise' -#openshift_metrics_cassandra_image="registry.access.redhat.com/openshift3/metrics-cassandra:{{ openshift_image_tag }}" -#openshift_metrics_hawkular_agent_image="registry.access.redhat.com/openshift3/metrics-hawkular-openshift-agent:{{ openshift_image_tag }}" -#openshift_metrics_hawkular_metrics_image="registry.access.redhat.com/openshift3/metrics-hawkular-metrics:{{ openshift_image_tag }}" -#openshift_metrics_schema_installer_image="registry.access.redhat.com/openshift3/metrics-schema-installer:{{ openshift_image_tag }}" -#openshift_metrics_heapster_image="registry.access.redhat.com/openshift3/metrics-heapster:{{ openshift_image_tag }}" +#openshift_metrics_cassandra_image="registry.access.redhat.com/openshift3/metrics-cassandra:{ openshift_image_tag }" +#openshift_metrics_hawkular_agent_image="registry.access.redhat.com/openshift3/metrics-hawkular-openshift-agent:{ openshift_image_tag }" +#openshift_metrics_hawkular_metrics_image="registry.access.redhat.com/openshift3/metrics-hawkular-metrics:{ openshift_image_tag }" +#openshift_metrics_schema_installer_image="registry.access.redhat.com/openshift3/metrics-schema-installer:{ openshift_image_tag }" +#openshift_metrics_heapster_image="registry.access.redhat.com/openshift3/metrics-heapster:{ openshift_image_tag }" # # StorageClass # openshift_storageclass_name=gp2 @@ -958,8 +958,8 @@ openshift_master_console_port={{openshift_console_port}} # 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="docker.io/openshift/origin-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' @@ -1099,7 +1099,7 @@ openshift_node_env_vars={"ENABLE_HTTP2": "true"} # Additionally: EXTERNAL NFS REQUIRES that YOU CREATE the nfs exports # that will back the application PV and optionally the database # pv. Export path definitions, relative to -# {{ openshift_management_storage_nfs_base_dir }} +# { openshift_management_storage_nfs_base_dir} # # LOCAL NFS NOTE: #