From cbac4c43737aa520ed91e78659d749badb72968d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Martin=20Andr=C3=A9?= Date: Thu, 11 Oct 2018 09:22:56 +0200 Subject: [PATCH] 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 --- ci/environments/scenario009-multinode.yaml | 2 +- extraconfig/services/openshift-master.yaml | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/ci/environments/scenario009-multinode.yaml b/ci/environments/scenario009-multinode.yaml index 7e7d4d7146..8567112c0d 100644 --- a/ci/environments/scenario009-multinode.yaml +++ b/ci/environments/scenario009-multinode.yaml @@ -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 diff --git a/extraconfig/services/openshift-master.yaml b/extraconfig/services/openshift-master.yaml index 58f3a41ac3..7d43725c7b 100644 --- a/extraconfig/services/openshift-master.yaml +++ b/extraconfig/services/openshift-master.yaml @@ -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"]}