From e6cfbe42db9e2cf664db689d44873ff42e0f12f5 Mon Sep 17 00:00:00 2001
From: Bogdan Dobrelya <bdobrelia@mirantis.com>
Date: Wed, 3 Aug 2016 12:42:52 +0200
Subject: [PATCH] Revert "Merge pull request #393 from bogdando/ci_changes"

This reverts commit 4662b41de62b6197e1c62aff2def48b761c6b756, reversing
changes made to 4fb4ac120b9433109924b17701e822dde0d39fbf.
---
 .travis.yml                      | 12 ++++--------
 tests/templates/inventory-gce.j2 | 11 -----------
 2 files changed, 4 insertions(+), 19 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 126e579fb..6c26cd110 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -72,22 +72,19 @@ env:
       CLOUD_IMAGE=ubuntu-1604-xenial
       CLOUD_REGION=asia-east1-c
 
-    # Extra cases for separated roles
+    # Ubuntu 15.10
     - >-
       KUBE_NETWORK_PLUGIN=flannel
-      CLOUD_IMAGE=rhel-7-sudo
+      CLOUD_IMAGE=ubuntu-1510-wily
       CLOUD_REGION=europe-west1-b
-      MODE="separate"
     - >-
       KUBE_NETWORK_PLUGIN=calico
-      CLOUD_IMAGE=ubuntu-1604-xenial
+      CLOUD_IMAGE=ubuntu-1510-wily
       CLOUD_REGION=us-central1-a
-      MODE="separate"
     - >-
       KUBE_NETWORK_PLUGIN=weave
-      CLOUD_IMAGE=debian-8-kubespray
+      CLOUD_IMAGE=ubuntu-1510-wily
       CLOUD_REGION=us-east1-d
-      MODE="separate"
 
 
 before_install:
@@ -116,7 +113,6 @@ before_script:
 script:
   - >
     $HOME/.local/bin/ansible-playbook tests/cloud_playbooks/create-gce.yml -i tests/local_inventory/hosts -c local $LOG_LEVEL
-    -e mode=${MODE}
     -e test_id=${TEST_ID}
     -e kube_network_plugin=${KUBE_NETWORK_PLUGIN}
     -e gce_project_id=${GCE_PROJECT_ID}
diff --git a/tests/templates/inventory-gce.j2 b/tests/templates/inventory-gce.j2
index ef2ae06e6..72ad469de 100644
--- a/tests/templates/inventory-gce.j2
+++ b/tests/templates/inventory-gce.j2
@@ -2,16 +2,6 @@ node1 ansible_ssh_host={{gce.instance_data[0].public_ip}}
 node2 ansible_ssh_host={{gce.instance_data[1].public_ip}}
 node3 ansible_ssh_host={{gce.instance_data[2].public_ip}}
 
-{% if mode == "separate" %}
-[kube-master]
-node1
-
-[kube-node]
-node2
-
-[etcd]
-node3
-{% else %}
 [kube-master]
 node1
 node2
@@ -24,7 +14,6 @@ node3
 [etcd]
 node1
 node2
-{% endif %}
 
 [k8s-cluster:children]
 kube-node