openstack
/
tripleo-heat-templates
Code Issues Proposed changes

Set openshift_docker_insecure_registries 

This variable is used in the docker_image_availability check to
determine how to query the registries for image availability. Setting
this variable allows us to enable the docker_image_availability check
in the gate.

Change-Id: Ia1da542d342228bb28ad487371fad8d3ffc62d0b
This commit is contained in:
Martin André 2018-10-11 09:22:56 +02:00
parent a17b245049
commit cbac4c4373
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ci/environments/scenario009-multinode.yaml
View File

@ -33,4 +33,4 @@ parameter_defaults:
OpenShiftGlobalVariables:
# NOTE(flaper87): Needed for the gate
openshift_disable_check: package_availability,package_version,disk_availability,docker_storage,memory_availability,docker_image_availability
openshift_disable_check: package_availability,package_version,disk_availability,docker_storage,memory_availability

1
extraconfig/services/openshift-master.yaml
View File

@ -193,6 +193,7 @@ outputs:
osm_image: {get_param: DockerOpenShiftBaseImage}
osn_image: {get_param: DockerOpenShiftNodeImage}
openshift_cockpit_deployer_image: {get_param: DockerOpenShiftCockpitImage}
openshift_docker_insecure_registries: {get_param: DockerInsecureRegistryAddress}
openshift_docker_additional_registries: {get_param: DockerInsecureRegistryAddress}
openshift_master_bootstrap_auto_approve: true
osm_controller_args: {"experimental-cluster-signing-duration": ["20m"]}