openstack/tripleo-heat-templates
Code Issues Proposed changes

Merge "Remove openshift-ansible customization"

Browse Source
This commit is contained in:
Zuul 2019-01-17 22:25:51 +00:00 committed by Gerrit Code Review
commit 4b4f7f89da
1 changed files with 2 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -171,17 +171,11 @@ outputs:
$.data.image.rightSplit(":", 1)[1] $.data.image.rightSplit(":", 1)[1]
data: data:
image: {get_param: DockerOpenShiftControlPlaneImage} image: {get_param: DockerOpenShiftControlPlaneImage}
openshift_enable_excluders: false
openshift_deployment_type: "{{tripleo_openshift_deployment_type}}" openshift_deployment_type: "{{tripleo_openshift_deployment_type}}"
openshift_use_dnsmasq: true
openshift_use_external_openvswitch: true openshift_use_external_openvswitch: true
openshift_docker_selinux_enabled: false openshift_master_bootstrap_auto_approve: true
containerized: true
# Needed for containerized deployment
skip_version: true
# Fatal and Errors only
debug_level: 0
# Local Registry # Local Registry
openshift_docker_insecure_registries: {get_param: DockerInsecureRegistryAddress}
oreg_url: oreg_url:
yaql: yaql:
expression: expression:
@ -194,9 +188,6 @@ outputs:
osn_image: {get_param: DockerOpenShiftNodeImage} osn_image: {get_param: DockerOpenShiftNodeImage}
openshift_cockpit_deployer_image: {get_param: DockerOpenShiftCockpitImage} openshift_cockpit_deployer_image: {get_param: DockerOpenShiftCockpitImage}
ansible_service_broker_image: {get_param: DockerOpenShiftAnsibleServiceBrokerImage} 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"]}
- {get_param: OpenShiftGlobalVariables} - {get_param: OpenShiftGlobalVariables}
tripleo_stack_action: {get_param: StackAction} tripleo_stack_action: {get_param: StackAction}
openshift_master_node_vars: {get_param: OpenShiftMasterNodeVars} openshift_master_node_vars: {get_param: OpenShiftMasterNodeVars}