openstack
/
tripleo-heat-templates
Code Issues Proposed changes

Merge "Rely on osa defaults for enabled services"

This commit is contained in:
Zuul 2019-01-17 22:25:46 +00:00 committed by Gerrit Code Review
parent 733a7f4ee9 e26a5ea3be
commit 11374f4ab8
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -94,6 +94,9 @@ parameters:
DockerOpenShiftEtcdImage:
description: etcd container image for openshift
type: string
DockerOpenShiftAnsibleServiceBrokerImage:
description: Ansible Service Broker image for openshift
type: string
resources:
@ -173,9 +176,6 @@ outputs:
openshift_use_dnsmasq: true
openshift_use_external_openvswitch: true
openshift_docker_selinux_enabled: false
# Disable services we're not using for now
openshift_enable_service_catalog: false
template_service_broker_install: false
containerized: true
# Needed for containerized deployment
skip_version: true
@ -193,6 +193,7 @@ outputs:
osm_image: {get_param: DockerOpenShiftControlPlaneImage}
osn_image: {get_param: DockerOpenShiftNodeImage}
openshift_cockpit_deployer_image: {get_param: DockerOpenShiftCockpitImage}
ansible_service_broker_image: {get_param: DockerOpenShiftAnsibleServiceBrokerImage}
openshift_docker_insecure_registries: {get_param: DockerInsecureRegistryAddress}
openshift_master_bootstrap_auto_approve: true
osm_controller_args: {"experimental-cluster-signing-duration": ["20m"]}