openstack/openstack-helm-infra
Code Issues Proposed changes

Merge "Gate: make pod subnet configurable"

Browse Source
This commit is contained in:
Zuul 2017-11-17 20:48:11 +00:00 committed by Gerrit Code Review
commit 172844c662
3 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
tools/gate/playbooks/deploy-kubeadm-aio-common/tasks/clean-node.yaml
View File

@ -44,7 +44,7 @@
PVC_SUPPORT_CEPH=true
PVC_SUPPORT_NFS=true
NET_SUPPORT_LINUXBRIDGE=true
KUBE_NET_POD_SUBNET=192.168.0.0/16
KUBE_NET_POD_SUBNET="{{ kubernetes.cluster.pod_subnet }}"
KUBE_NET_DNS_DOMAIN=cluster.local
CONTAINER_RUNTIME=docker
register: kubeadm_master_deploy

2
tools/gate/playbooks/deploy-kubeadm-aio-common/tasks/util-kubeadm-aio-run.yaml
View File

@ -46,7 +46,7 @@
PVC_SUPPORT_CEPH=true
PVC_SUPPORT_NFS=true
NET_SUPPORT_LINUXBRIDGE=true
KUBE_NET_POD_SUBNET=192.168.0.0/16
KUBE_NET_POD_SUBNET="{{ kubernetes.cluster.pod_subnet }}"
KUBE_NET_DNS_DOMAIN=cluster.local
CONTAINER_RUNTIME=docker
KUBELET_NODE_LABELS="{{ kubeadm_kubelet_labels }}"

1
tools/gate/playbooks/vars.yaml
View File

@ -27,6 +27,7 @@ kubernetes:
default_device: null
cluster:
cni: calico
pod_subnet: 192.168.0.0/16
nodes:
labels: