From e26a5ea3be34c8ed2e9c12bbfb04ccde24aa25c9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Martin=20Andr=C3=A9?= Date: Mon, 3 Dec 2018 10:49:26 +0100 Subject: [PATCH] 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 --- extraconfig/services/openshift-master.yaml | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/extraconfig/services/openshift-master.yaml b/extraconfig/services/openshift-master.yaml index b2e2caf56c..dba769fe0b 100644 --- a/extraconfig/services/openshift-master.yaml +++ b/extraconfig/services/openshift-master.yaml @@ -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"]}