From 20029b6a0aa6dd3423eb984aa98e0f4102d1282b Mon Sep 17 00:00:00 2001 From: PanFengyun Date: Thu, 7 Jul 2016 13:09:08 +0800 Subject: [PATCH] Change the type of flannel_network_subnetlen to 'number' 'flannel_network_subnetlen' is the size of subnet assigned to each nodes. The value of 'flannel_network_subnetlen' will pass to SubnetLen. So the type of flannel_network_subnetlen should be 'number' or int, not string. Change-Id: I49816fcfad7fcce7f77f6c0db20f82b630426512 --- magnum/drivers/swarm_fedora_atomic_v1/templates/cluster.yaml | 2 +- .../drivers/swarm_fedora_atomic_v1/templates/swarmmaster.yaml | 2 +- magnum/templates/kubernetes/kubecluster-coreos.yaml | 2 +- magnum/templates/kubernetes/kubecluster-fedora-ironic.yaml | 2 +- magnum/templates/kubernetes/kubecluster.yaml | 2 +- magnum/templates/kubernetes/kubemaster-coreos.yaml | 2 +- magnum/templates/kubernetes/kubemaster-fedora-ironic.yaml | 2 +- magnum/templates/kubernetes/kubemaster.yaml | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) diff --git a/magnum/drivers/swarm_fedora_atomic_v1/templates/cluster.yaml b/magnum/drivers/swarm_fedora_atomic_v1/templates/cluster.yaml index e12c54b905..01b0e58696 100644 --- a/magnum/drivers/swarm_fedora_atomic_v1/templates/cluster.yaml +++ b/magnum/drivers/swarm_fedora_atomic_v1/templates/cluster.yaml @@ -101,7 +101,7 @@ parameters: default: 10.100.0.0/16 flannel_network_subnetlen: - type: string + type: number description: size of subnet assigned to each master default: 24 diff --git a/magnum/drivers/swarm_fedora_atomic_v1/templates/swarmmaster.yaml b/magnum/drivers/swarm_fedora_atomic_v1/templates/swarmmaster.yaml index 8504859297..903d3d6a64 100644 --- a/magnum/drivers/swarm_fedora_atomic_v1/templates/swarmmaster.yaml +++ b/magnum/drivers/swarm_fedora_atomic_v1/templates/swarmmaster.yaml @@ -87,7 +87,7 @@ parameters: description: network range for flannel overlay network flannel_network_subnetlen: - type: string + type: number description: size of subnet assigned to each master flannel_backend: diff --git a/magnum/templates/kubernetes/kubecluster-coreos.yaml b/magnum/templates/kubernetes/kubecluster-coreos.yaml index 1f54c199b2..8b8b778b45 100644 --- a/magnum/templates/kubernetes/kubecluster-coreos.yaml +++ b/magnum/templates/kubernetes/kubecluster-coreos.yaml @@ -68,7 +68,7 @@ parameters: default: 10.100.0.0/16 flannel_network_subnetlen: - type: string + type: number description: size of subnet assigned to each minion default: 24 diff --git a/magnum/templates/kubernetes/kubecluster-fedora-ironic.yaml b/magnum/templates/kubernetes/kubecluster-fedora-ironic.yaml index 33e5875685..6a6e7098b3 100644 --- a/magnum/templates/kubernetes/kubecluster-fedora-ironic.yaml +++ b/magnum/templates/kubernetes/kubecluster-fedora-ironic.yaml @@ -50,7 +50,7 @@ parameters: default: 10.100.0.0/16 flannel_network_subnetlen: - type: string + type: number description: size of subnet assigned to each minion default: 24 diff --git a/magnum/templates/kubernetes/kubecluster.yaml b/magnum/templates/kubernetes/kubecluster.yaml index 47a3eafb5c..c6d61696c7 100644 --- a/magnum/templates/kubernetes/kubecluster.yaml +++ b/magnum/templates/kubernetes/kubecluster.yaml @@ -67,7 +67,7 @@ parameters: default: 10.100.0.0/16 flannel_network_subnetlen: - type: string + type: number description: size of subnet assigned to each minion default: 24 diff --git a/magnum/templates/kubernetes/kubemaster-coreos.yaml b/magnum/templates/kubernetes/kubemaster-coreos.yaml index 89fb76bd87..5b32400c30 100644 --- a/magnum/templates/kubernetes/kubemaster-coreos.yaml +++ b/magnum/templates/kubernetes/kubemaster-coreos.yaml @@ -45,7 +45,7 @@ parameters: description: network range for flannel overlay network flannel_network_subnetlen: - type: string + type: number description: size of subnet assigned to each master flannel_backend: diff --git a/magnum/templates/kubernetes/kubemaster-fedora-ironic.yaml b/magnum/templates/kubernetes/kubemaster-fedora-ironic.yaml index 983fef4fad..76acb6b4cb 100644 --- a/magnum/templates/kubernetes/kubemaster-fedora-ironic.yaml +++ b/magnum/templates/kubernetes/kubemaster-fedora-ironic.yaml @@ -37,7 +37,7 @@ parameters: description: network range for flannel overlay network flannel_network_subnetlen: - type: string + type: number description: size of subnet assigned to each minion flannel_backend: diff --git a/magnum/templates/kubernetes/kubemaster.yaml b/magnum/templates/kubernetes/kubemaster.yaml index cebcac127a..51f8519abf 100644 --- a/magnum/templates/kubernetes/kubemaster.yaml +++ b/magnum/templates/kubernetes/kubemaster.yaml @@ -53,7 +53,7 @@ parameters: description: network range for flannel overlay network flannel_network_subnetlen: - type: string + type: number description: size of subnet assigned to each master flannel_backend: