From 23a1e70a8ca07ff78044e0df3a7137e0f25a62dc Mon Sep 17 00:00:00 2001 From: YAMAMOTO Takashi Date: Fri, 13 Jul 2018 16:06:52 +0900 Subject: [PATCH] cluster: Remove agent configuration To avoid fragile dependencies among components. Also, having those setting hardcoded here makes TEMPLATE setting in agent less useful. The default setting should be good enough for now. Signed-off-by: YAMAMOTO Takashi --- cluster/Dockerfile | 3 --- cluster/Dockerfile-arm64 | 3 --- cluster/README.md | 2 -- cluster/scripts/run-cluster.sh | 25 ------------------------- 4 files changed, 33 deletions(-) diff --git a/cluster/Dockerfile b/cluster/Dockerfile index 5554744..0caba58 100644 --- a/cluster/Dockerfile +++ b/cluster/Dockerfile @@ -26,9 +26,6 @@ ENV KEYSTONE_TENANT_NAME="admin" ENV KEYSTONE_ADMIN_TOKEN="admintoken" ENV UUID="" -# Agent-related cluster level configuration -ENV AGENT_LOG_LEVEL="INFO" - VOLUME /var/log/midonet-cluster CMD ["/cluster"] diff --git a/cluster/Dockerfile-arm64 b/cluster/Dockerfile-arm64 index ad486b1..1eefb85 100644 --- a/cluster/Dockerfile-arm64 +++ b/cluster/Dockerfile-arm64 @@ -56,9 +56,6 @@ ENV KEYSTONE_TENANT_NAME="admin" ENV KEYSTONE_ADMIN_TOKEN="admintoken" ENV UUID="" -# Agent-related cluster level configuration -ENV AGENT_LOG_LEVEL="INFO" - VOLUME /var/log/midonet-cluster CMD ["/cluster"] diff --git a/cluster/README.md b/cluster/README.md index f337e41..1ca06cc 100644 --- a/cluster/README.md +++ b/cluster/README.md @@ -35,8 +35,6 @@ where: having to enter the container. Other available options: -* AGENT\_LOG\_LEVEL: which allows you to change the logging level that is used - by the MidoNet agents in the cluster. It defaults to 'INFO'. * C\_SERVERS: the comma-separated IPs of the cassandra servers in the cluster. If it is not provided, some MidoNet features like flow tracing will be disabled. diff --git a/cluster/scripts/run-cluster.sh b/cluster/scripts/run-cluster.sh index 2b5f60f..26bcbea 100755 --- a/cluster/scripts/run-cluster.sh +++ b/cluster/scripts/run-cluster.sh @@ -61,31 +61,6 @@ echo "Setting up the cluster configuration..." zookeeper_hosts = "$ZK_ENDPOINTS" } - agent { - midolman { - bgp_keepalive: 1s - bgp_holdtime: 3s - bgp_connect_retry: 1s - lock_memory: true - simulation_threads: 2 - output_channels: 2 - } - - datapath { - max_flow_count: 1500000 - send_buffer_pool_max_size: 16384 - send_buffer_pool_initial_size: 4096 - } - - loggers.root: $AGENT_LOG_LEVEL - - haproxy_health_monitor { - namespace_cleanup: true - health_monitor_enable: true - haproxy_file_loc: /etc/midolman/l4lb/ - } - } - $AUTH_CONF EOF