summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBin Yang <bin.yang@windriver.com>2019-03-21 01:04:51 +0000
committerGerrit Code Review <gerrit@onap.org>2019-03-21 01:04:51 +0000
commit69320e75210709ad2dadf3c183289e9a67cf4817 (patch)
tree7e5c6272eae158b066f041b9a89336866d328425
parentc6d4c95561d1d1a783ca0e1176d794b3fa0fdb31 (diff)
parent190d6bbef31b244aa0d7a7fb9ba19da908b5c004 (diff)
Merge "Cleanup kubespray config values"
-rw-r--r--vagrant/inventory/group_vars/k8s-cluster.yml13
1 files changed, 1 insertions, 12 deletions
diff --git a/vagrant/inventory/group_vars/k8s-cluster.yml b/vagrant/inventory/group_vars/k8s-cluster.yml
index 4de3a276..8f719a43 100644
--- a/vagrant/inventory/group_vars/k8s-cluster.yml
+++ b/vagrant/inventory/group_vars/k8s-cluster.yml
@@ -7,12 +7,6 @@
# http://www.apache.org/licenses/LICENSE-2.0
##############################################################################
-## For some things, kubelet needs to load kernel modules. For example, dynamic kernel services are needed
-## for mounting persistent volumes into containers. These may not be loaded by preinstall kubernetes
-## processes. For example, ceph and rbd backed volumes. Set to true to allow kubelet to load kernel
-## modules.
-kubelet_load_modules: true
-
# Kubernetes configuration dirs and system namespace.
# Those are where all the additional config stuff goes
# kubernetes normally puts in /srv/kubernetes.
@@ -44,17 +38,12 @@ kube_token_auth: true
# Can also be set to 'cloud', which lets the cloud provider setup appropriate routing
kube_network_plugin: flannel
-# Settings for containerized control plane
-kubelet_deployment_type: host
-
-# NGINX Ingress Controller
-ingress_nginx_enabled: true
-
# Make a copy of kubeconfig on the host that runs Ansible in GITDIR/artifacts
kubeconfig_localhost: true
# Enable MountPropagation gate feature
local_volumes_enabled: true
+local_volume_provisioner_enabled: true
## Change this to use another Kubernetes version, e.g. a current beta release
kube_version: v1.12.3