Remove openshift-ansible customization
This commit remove variables passed to openshift-ansible in order to stay more inline with openshift-ansible defaults. The removed variables are: - `openshift_enable_excluders`: use default value from openshift-ansible. - `openshift_use_dnsmasq`: removed from openshift-ansible. - `openshift_docker_selinux_enabled`: use default value from openshift-ansible. - `containerized`: removed from openshift-ansible. - `skip_version`: removed from openshift-ansible. - `debug_level`: use default value from openshift-ansible. - `osm_controller_args`: use default value from openshift-ansible. The provided experimental-cluster-signing-duration setting had an extremely low period and could cause nodes to become unreachable in the event of cert renewal during the master node failover. See [1] for details. [1] https://bugzilla.redhat.com/show_bug.cgi?id=1648493 Closes-Bug: #1806726 Change-Id: I4d9ae4f4745393aa817f07a542f06faa0c6a5eb9
This commit is contained in:
parent
e26a5ea3be
commit
3e613f1788
|
@ -171,17 +171,11 @@ outputs:
|
|||
$.data.image.rightSplit(":", 1)[1]
|
||||
data:
|
||||
image: {get_param: DockerOpenShiftControlPlaneImage}
|
||||
openshift_enable_excluders: false
|
||||
openshift_deployment_type: "{{tripleo_openshift_deployment_type}}"
|
||||
openshift_use_dnsmasq: true
|
||||
openshift_use_external_openvswitch: true
|
||||
openshift_docker_selinux_enabled: false
|
||||
containerized: true
|
||||
# Needed for containerized deployment
|
||||
skip_version: true
|
||||
# Fatal and Errors only
|
||||
debug_level: 0
|
||||
openshift_master_bootstrap_auto_approve: true
|
||||
# Local Registry
|
||||
openshift_docker_insecure_registries: {get_param: DockerInsecureRegistryAddress}
|
||||
oreg_url:
|
||||
yaql:
|
||||
expression:
|
||||
|
@ -194,9 +188,6 @@ outputs:
|
|||
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"]}
|
||||
- {get_param: OpenShiftGlobalVariables}
|
||||
tripleo_stack_action: {get_param: StackAction}
|
||||
openshift_master_node_vars: {get_param: OpenShiftMasterNodeVars}
|
||||
|
|
Loading…
Reference in New Issue