openstack
/
tripleo-heat-templates
Code Issues Proposed changes

Merge "Set openshift_docker_insecure_registries"

This commit is contained in:
Zuul 2018-10-22 21:15:53 +00:00 committed by Gerrit Code Review
parent 6ec469a316 cbac4c4373
commit 14f5234300
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"]}