Rely on osa defaults for enabled services

Tripleo should rely on openshift-ansible defaults as much as possible,
especially concerning the services which are enabled.

This removes the setting that explicitly disabled the service catalog
and template service broker, and wire in the ansible-service-broker
from heat parameters. The service-catalog and template-service-broker
images do not need to be specified since they're derived from the
oreg_url in openshift-ansible.

Change-Id: Ie09696a54ba01f23003366a9f221d2f32f4b0270
Depends-On: Ic358ed27d63015d297f50c10f553fc1c470ea6a5
Closes-Bug: #1806353
(cherry picked from commit e26a5ea3be)
This commit is contained in:
Martin André 2018-12-03 10:49:26 +01:00
parent 23e477ab35
commit 4017891ab9
1 changed files with 4 additions and 3 deletions

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:
@ -177,9 +180,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
@ -197,6 +197,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"]}