From 68519022efac1f7e7fa70d8fc0072d903ed6805a Mon Sep 17 00:00:00 2001 From: Jim Galasyn Date: Thu, 7 Dec 2017 13:49:00 -0800 Subject: [PATCH] Add default_node_orchestrator option to config (#335) * Fix broken link * Add default_node_orchestrator option --- .../3.0/guides/admin/configure/set-orchestrator-type.md | 2 +- .../3.0/guides/admin/configure/ucp-configuration-file.md | 8 +++++--- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/datacenter/ucp/3.0/guides/admin/configure/set-orchestrator-type.md b/datacenter/ucp/3.0/guides/admin/configure/set-orchestrator-type.md index 2e00b6b7b7..1339248fc3 100644 --- a/datacenter/ucp/3.0/guides/admin/configure/set-orchestrator-type.md +++ b/datacenter/ucp/3.0/guides/admin/configure/set-orchestrator-type.md @@ -174,6 +174,6 @@ default_node_orchestrator = "swarm" The value can be `swarm` or `kubernetes`. -[Learn to set up Docker EE by using a config file](UCP configuration file.md). +[Learn to set up Docker EE by using a config file](ucp-configuration-file.md). diff --git a/datacenter/ucp/3.0/guides/admin/configure/ucp-configuration-file.md b/datacenter/ucp/3.0/guides/admin/configure/ucp-configuration-file.md index d4213c9a27..05e3c9d349 100644 --- a/datacenter/ucp/3.0/guides/admin/configure/ucp-configuration-file.md +++ b/datacenter/ucp/3.0/guides/admin/configure/ucp-configuration-file.md @@ -164,12 +164,12 @@ An array of tables that specifies the DTR instances that the current UCP instanc ## scheduling_configuration table (optional) -Specifies the users who can schedule containers on manager nodes. +Specifies scheduling options and the default orchestrator for new nodes. | Parameter | Required | Description | | ----------------------------- | -------- | -------------------------------------------------------------------------------------------------- | | `enable_admin_ucp_scheduling` | no | Set to `true` to allow admins to schedule on containers on manager nodes. The default is `false`. | -| `enable_user_ucp_scheduling` | no | Set to `true` to allow non-admin users to schedule containers on managers. The default is `false`. | +| `default_node_orchestrator` | no | Sets the type of orchestrator to use for new nodes that are joined to the cluster. Can be `swarm` or `kubernetes`. The default is `swarm`. | ## tracking_configuration table (optional) @@ -238,7 +238,9 @@ components. Assigning these values overrides the settings in a container's ## Kubernetes configuration flags -You can set additional flags on the Kubernetes system components in the configuration file. You must ensure that any custom flags don't conflict with configuration options already set by UCP. +You can set additional flags on the Kubernetes system components in the +`cluster_config` table. You must ensure that any custom flags don't +conflict with configuration options already set by UCP. ``` custom_kube_api_server_flags = ["--event-ttl=1h0m0s", "--service-node-port-range=30000-32767"]