From 70e26302f75e90baa67473804bb407df7b20001e Mon Sep 17 00:00:00 2001 From: portdirect Date: Tue, 21 Nov 2017 15:37:25 -0500 Subject: [PATCH] Gate: Fix vars for local development use This PS resolves an issue in the way ansible variables are merged re-enableing use of the gate scripts for local development use. Change-Id: Ia18a9f92816e4cc49f1c5423c04bed8a80abc6dc --- tools/gate/devel/local-vars.yaml | 1 + tools/gate/devel/multinode-vars.yaml | 6 ------ 2 files changed, 1 insertion(+), 6 deletions(-) diff --git a/tools/gate/devel/local-vars.yaml b/tools/gate/devel/local-vars.yaml index 8c769abb0..5699fb92c 100644 --- a/tools/gate/devel/local-vars.yaml +++ b/tools/gate/devel/local-vars.yaml @@ -17,3 +17,4 @@ kubernetes: default_device: docker0 cluster: cni: calico + pod_subnet: 192.168.0.0/16 diff --git a/tools/gate/devel/multinode-vars.yaml b/tools/gate/devel/multinode-vars.yaml index 8c769abb0..deb75e57c 100644 --- a/tools/gate/devel/multinode-vars.yaml +++ b/tools/gate/devel/multinode-vars.yaml @@ -11,9 +11,3 @@ # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. # See the License for the specific language governing permissions and # limitations under the License. - -kubernetes: - network: - default_device: docker0 - cluster: - cni: calico