diff options
author | 2019-08-31 17:00:19 +0200 | |
---|---|---|
committer | 2019-08-31 22:38:37 +0200 | |
commit | 94625920bd45180934815d8ce33197805dfff921 (patch) | |
tree | f85069f89eb102d3b923b012885ed3c4ae910ee6 /scenarios/k8-calico-nofeature/role/k8-calico-nofeature/tasks/main.yml | |
parent | f3b67171e055dee18ef22251d6a4f07c40333953 (diff) |
This change updates the scenario logic for basic k8s
scenarios that enables the use of various network plugins.
The change simply stops copying k8s-cluster.yml over but instead
operates on the existing/original k8s-cluster.yml and updates
kube_network_plugin in place.
This makes it easier to maintain the scenarios and more importantly
unblocks us from bumping kubespray and kubernetes versions.
In order to verify this change properly, below change first must be
merged.
https://gerrit.opnfv.org/gerrit/#/c/releng-xci/+/68423/
JIRA: XCI-20
installer-type:kubespray
deploy-scenario:k8-calico-nofeature
Change-Id: Icf78a4fc693c659290714e666a2941b6f6e9487a
Signed-off-by: Fatih Degirmenci <fdegir@gmail.com>
Diffstat (limited to 'scenarios/k8-calico-nofeature/role/k8-calico-nofeature/tasks/main.yml')
-rw-r--r-- | scenarios/k8-calico-nofeature/role/k8-calico-nofeature/tasks/main.yml | 15 |
1 files changed, 10 insertions, 5 deletions
diff --git a/scenarios/k8-calico-nofeature/role/k8-calico-nofeature/tasks/main.yml b/scenarios/k8-calico-nofeature/role/k8-calico-nofeature/tasks/main.yml index 5b2939f..e01c7ae 100644 --- a/scenarios/k8-calico-nofeature/role/k8-calico-nofeature/tasks/main.yml +++ b/scenarios/k8-calico-nofeature/role/k8-calico-nofeature/tasks/main.yml @@ -1,4 +1,6 @@ +--- ############################################################################## +# Copyright (c) 2019 Ericsson Software Technology and others. # Copyright (c) 2018 HUAWEI TECHNOLOGIES CO.,LTD and others. # # All rights reserved. This program and the accompanying materials @@ -6,9 +8,12 @@ # which accompanies this distribution, and is available at # http://www.apache.org/licenses/LICENSE-2.0 ############################################################################## ---- -- name: copy k8s-cluster.yml - copy: - src: "k8s-cluster.yml" - dest: "{{ remote_xci_path }}/.cache/repos/kubespray/opnfv_inventory/group_vars/k8s-cluster.yml" +# set networking plugin to calico +- name: Set network plugin to calico + lineinfile: + path: "{{ remote_xci_path }}/.cache/repos/kubespray/inventory/opnfv/group_vars/k8s-cluster/k8s-cluster.yml" + regexp: "^kube_network_plugin:.*" + line: "kube_network_plugin: calico" + +# vim: set ts=2 sw=2 expandtab: |