From 4ee3699933ae9b00cf183ee10cda54688ae42884 Mon Sep 17 00:00:00 2001
From: ant31 <2t.antoine@gmail.com>
Date: Wed, 10 Feb 2016 23:02:12 +0100
Subject: [PATCH] Add weave to tests

---
 .travis.yml                  | 42 ++++++++++++++++++++++++------------
 roles/apps/k8s-kube-logstash |  2 +-
 2 files changed, 29 insertions(+), 15 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 46b08b43f..a8ef79a9d 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -21,6 +21,10 @@ env:
       KUBE_NETWORK_PLUGIN=calico
       CLOUD_IMAGE=debian-8
       CLOUD_REGION=europe-west1-b
+    - >-
+      KUBE_NETWORK_PLUGIN=weave
+      CLOUD_IMAGE=debian-8
+      CLOUD_REGION=europe-west1-b
 
     # Centos 7
     - >-
@@ -35,11 +39,11 @@ env:
 
 
    # # Redhat 7
-   #  - >-
-   #    KUBE_NETWORK_PLUGIN=flannel
-   #    CLOUD_IMAGE=rhel-7-sudo
-   #    CLOUD_REGION=us-east1-d
-   #    SSH_ARGS='--ssh-extra-args="-t"'
+    - >-
+      KUBE_NETWORK_PLUGIN=flannel
+      CLOUD_IMAGE=rhel-7-sudo
+      CLOUD_REGION=us-east1-d
+
    #  - >-
    #    KUBE_NETWORK_PLUGIN=calico
    #    CLOUD_IMAGE=rhel-7-sudo
@@ -54,21 +58,31 @@ env:
       KUBE_NETWORK_PLUGIN=calico
       CLOUD_IMAGE=ubuntu-1404-trusty
       CLOUD_REGION=europe-west1-c
-
-    # Ubuntu 15.10
     - >-
-      KUBE_NETWORK_PLUGIN=flannel
-      CLOUD_IMAGE=ubuntu-1510-wily
-      CLOUD_REGION=us-central1-a
-    - >-
-      KUBE_NETWORK_PLUGIN=calico
-      CLOUD_IMAGE=ubuntu-1510-wily
-      CLOUD_REGION=us-central1-a
+      KUBE_NETWORK_PLUGIN=weave
+      CLOUD_IMAGE=ubuntu-1404-trusty
+      CLOUD_REGION=europe-west1-c
+
+    # # Ubuntu 15.10
+    # - >-
+    #   KUBE_NETWORK_PLUGIN=flannel
+    #   CLOUD_IMAGE=ubuntu-1510-wily
+    #   CLOUD_REGION=us-central1-a
+    # - >-
+    #   KUBE_NETWORK_PLUGIN=calico
+    #   CLOUD_IMAGE=ubuntu-1510-wily
+    #   CLOUD_REGION=us-central1-a
+    # - >-
+    #   KUBE_NETWORK_PLUGIN=weave
+    #   CLOUD_IMAGE=ubuntu-1510-wily
+    #   CLOUD_REGION=us-central1-a
 
 
 matrix:
   allow_failures:
     - env: KUBE_NETWORK_PLUGIN=flannel CLOUD_IMAGE=centos-7-sudo CLOUD_REGION=us-central1-c
+    - env: KUBE_NETWORK_PLUGIN=flannel CLOUD_IMAGE=rhel-7-sudo CLOUD_REGION=us-east1-d
+    - env: KUBE_NETWORK_PLUGIN=weave CLOUD_IMAGE=ubuntu-1404-trusty CLOUD_REGION=europe-west1-c
 
 before_install:
   # Install Ansible.
diff --git a/roles/apps/k8s-kube-logstash b/roles/apps/k8s-kube-logstash
index c1c0ce8e2..71c7bf982 160000
--- a/roles/apps/k8s-kube-logstash
+++ b/roles/apps/k8s-kube-logstash
@@ -1 +1 @@
-Subproject commit c1c0ce8e27b430cff8e5b0f1519707eb892f5e67
+Subproject commit 71c7bf98210e8907554a26e25cc9c2a3ece8cffd