From a4d7f11071e7b9dbeea62a75706d27963b021557 Mon Sep 17 00:00:00 2001 From: Tilman Baumann Date: Fri, 19 Jan 2018 11:09:13 +0100 Subject: [PATCH] Drop duplicate config keys (yaml syntax error) The yamllint command reported hard errors because of duplicate keys in config.yaml Closes-Bug: #1747002 Change-Id: I3b7b36b46b3e3d35936ee03ba8b5d7fc1e7bb5db --- config.yaml | 25 ------------------------- 1 file changed, 25 deletions(-) diff --git a/config.yaml b/config.yaml index 02e4b8f1..2c484aad 100644 --- a/config.yaml +++ b/config.yaml @@ -171,30 +171,6 @@ options: description: | Default multicast port number that will be used to communicate between HA Cluster nodes. - haproxy-server-timeout: - type: int - default: - description: | - Server timeout configuration in ms for haproxy, used in HA - configurations. If not provided, default value of 90000ms is used. - haproxy-client-timeout: - type: int - default: - description: | - Client timeout configuration in ms for haproxy, used in HA - configurations. If not provided, default value of 90000ms is used. - haproxy-queue-timeout: - type: int - default: - description: | - Queue timeout configuration in ms for haproxy, used in HA - configurations. If not provided, default value of 9000ms is used. - haproxy-connect-timeout: - type: int - default: - description: | - Connect timeout configuration in ms for haproxy, used in HA - configurations. If not provided, default value of 9000ms is used. # Network config (by default all access is over 'private-address') os-admin-network: type: string @@ -320,4 +296,3 @@ options: description: | SSL CA to use with the certificate and key provided - this is only required if you are providing a privately signed ssl_cert and ssl_key. -