summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBin Yang <bin.yang@windriver.com>2019-07-23 07:28:22 +0000
committerGerrit Code Review <gerrit@onap.org>2019-07-23 07:28:22 +0000
commitacf41fcb3b1cc3e2746c6171efc6389b1fc19377 (patch)
treeb8c9dd3fefbad7bd6c5eb4750e3731774b16c3c6
parent71a2a9c8b8c77cee67571549a06c96ceb3781077 (diff)
parent949f8a79fb2dd4481aece85bc652ac7d61cfd0bb (diff)
Merge "Provide idempotent multus plugin configuration"
-rw-r--r--kud/deployment_infra/playbooks/configure-multus.yml38
1 files changed, 18 insertions, 20 deletions
diff --git a/kud/deployment_infra/playbooks/configure-multus.yml b/kud/deployment_infra/playbooks/configure-multus.yml
index 9cca54d1..47109162 100644
--- a/kud/deployment_infra/playbooks/configure-multus.yml
+++ b/kud/deployment_infra/playbooks/configure-multus.yml
@@ -62,27 +62,25 @@
mode: 0755
when: multus_source_type == "tarball"
- name: create multus configuration file
- blockinfile:
- marker: ""
- path: /etc/cni/net.d/00-multus.conf
- create: yes
- block: |
- {
- "type": "multus",
- "name": "multus-cni",
- "cniVersion": "0.3.1",
- "kubeconfig": "/etc/kubernetes/admin.conf",
- "delegates": [
- {
- "type": "flannel",
+ copy:
+ dest: /etc/cni/net.d/00-multus.conf
+ content: |
+ {
+ "type": "multus",
+ "name": "multus-cni",
"cniVersion": "0.3.1",
- "masterplugin": true,
- "delegate": {
- "isDefaultGateway": true
- }
- }
- ]
- }
+ "kubeconfig": "/etc/kubernetes/admin.conf",
+ "delegates": [
+ {
+ "type": "flannel",
+ "cniVersion": "0.3.1",
+ "masterplugin": true,
+ "delegate": {
+ "isDefaultGateway": true
+ }
+ }
+ ]
+ }
- hosts: localhost
pre_tasks: