Infrastructure/ansible
1
0
Fork 0
Code Issues Pull requests 6 Projects Releases Packages Wiki Activity Actions

fix a bunch more variables in comments

Browse source
This commit is contained in:
Kevin Fenzi 2018-08-22 21:50:44 +00:00
parent 2aaf12ea1b
commit e908d88b39
1 changed files with 15 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

30
roles/ansible-ansible-openshift-ansible/templates/cluster-inventory-stg.j2
View file

@ -303,8 +303,8 @@ openshift_master_identity_providers=[{"name": "fedoraidp", "login": "true", "cha
# Note: You may make use of environment variables rather than store # Note: You may make use of environment variables rather than store
# sensitive configuration within the ansible inventory. # sensitive configuration within the ansible inventory.
# For example: # For example:
#openshift_cloudprovider_aws_access_key="{{ lookup('env','AWS_ACCESS_KEY_ID') }}" #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_secret_key="{ lookup('env','AWS_SECRET_ACCESS_KEY') }"
# #
# AWS # AWS
#openshift_cloudprovider_kind=aws #openshift_cloudprovider_kind=aws
@ -654,17 +654,17 @@ openshift_hosted_metrics_deploy=true
# `/hawkular/metrics` path will break installation of metrics. # `/hawkular/metrics` path will break installation of metrics.
#openshift_metrics_hawkular_hostname=hawkular-metrics.example.com #openshift_metrics_hawkular_hostname=hawkular-metrics.example.com
# Configure the metrics component images # Note, these will be modified by oreg_url by default # 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_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_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_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_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_heapster_image="docker.io/openshift/origin-metrics-heapster:{ openshift_image_tag }"
# when openshift_deployment_type=='openshift-enterprise' # when openshift_deployment_type=='openshift-enterprise'
#openshift_metrics_cassandra_image="registry.access.redhat.com/openshift3/metrics-cassandra:{{ 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_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_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_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_heapster_image="registry.access.redhat.com/openshift3/metrics-heapster:{ openshift_image_tag }"
# #
# StorageClass # StorageClass
# openshift_storageclass_name=gp2 # openshift_storageclass_name=gp2
@ -958,8 +958,8 @@ openshift_master_console_port={{openshift_console_port}}
# Specify an openshift_service_catalog image # Specify an openshift_service_catalog image
# (defaults for origin and openshift-enterprise, repsectively) # (defaults for origin and openshift-enterprise, repsectively)
#openshift_service_catalog_image="docker.io/openshift/origin-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 }}" #openshift_service_catalog_image="registry.access.redhat.com/openshift3/ose-service-catalog:{ openshift_image_tag }"
# TSB image tag # TSB image tag
#template_service_broker_version='v3.9' #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 # Additionally: EXTERNAL NFS REQUIRES that YOU CREATE the nfs exports
# that will back the application PV and optionally the database # that will back the application PV and optionally the database
# pv. Export path definitions, relative to # pv. Export path definitions, relative to
# {{ openshift_management_storage_nfs_base_dir }} # { openshift_management_storage_nfs_base_dir}
# #
# LOCAL NFS NOTE: # LOCAL NFS NOTE:
# #