From f85dbfffe94a46c174c000695c372eff3ef74f88 Mon Sep 17 00:00:00 2001
From: Matthew Mosesohn <mmosesohn@mirantis.com>
Date: Tue, 31 Jan 2017 18:47:27 +0300
Subject: [PATCH] Rename weave-kube to weave-net

Cleans up upgrade to weave 1.82. The original WeaveWorks
daemonset definition uses weave-net name.
---
 roles/kubernetes-apps/network_plugin/weave/tasks/main.yml   | 4 ++--
 roles/network_plugin/weave/tasks/main.yml                   | 6 +++---
 .../weave/templates/{weave-kube.yml.j2 => weave-net.yml.j2} | 0
 3 files changed, 5 insertions(+), 5 deletions(-)
 rename roles/network_plugin/weave/templates/{weave-kube.yml.j2 => weave-net.yml.j2} (100%)

diff --git a/roles/kubernetes-apps/network_plugin/weave/tasks/main.yml b/roles/kubernetes-apps/network_plugin/weave/tasks/main.yml
index b2ee3a6c3..7938f8edd 100644
--- a/roles/kubernetes-apps/network_plugin/weave/tasks/main.yml
+++ b/roles/kubernetes-apps/network_plugin/weave/tasks/main.yml
@@ -1,9 +1,9 @@
 - name: Weave | Start Resources
   run_once: true
   kube:
-    name: "weave-kube"
+    name: "weave-net"
     kubectl: "{{ bin_dir }}/kubectl"
-    filename: "{{ kube_config_dir }}/weave-kube.yml"
+    filename: "{{ kube_config_dir }}/weave-net.yml"
     resource: "ds"
     namespace: "{{system_namespace}}"
     state: "{{ item | ternary('latest','present') }}"
diff --git a/roles/network_plugin/weave/tasks/main.yml b/roles/network_plugin/weave/tasks/main.yml
index fb9dae80f..5edb837bb 100644
--- a/roles/network_plugin/weave/tasks/main.yml
+++ b/roles/network_plugin/weave/tasks/main.yml
@@ -8,8 +8,8 @@
   changed_when: false
   tags: [hyperkube, upgrade]
 
-- name: Weave | Create weave-kube manifest
+- name: Weave | Create weave-net manifest
   template:
-    src: weave-kube.yml.j2
-    dest: "{{ kube_config_dir }}/weave-kube.yml"
+    src: weave-net.yml.j2
+    dest: "{{ kube_config_dir }}/weave-net.yml"
   register: weave_manifest
diff --git a/roles/network_plugin/weave/templates/weave-kube.yml.j2 b/roles/network_plugin/weave/templates/weave-net.yml.j2
similarity index 100%
rename from roles/network_plugin/weave/templates/weave-kube.yml.j2
rename to roles/network_plugin/weave/templates/weave-net.yml.j2