From 409134d4d013503fc2fdfd16cda8896e4499771e Mon Sep 17 00:00:00 2001
From: David Shrewsbury <shrewsbury.dave@gmail.com>
Date: Tue, 3 Nov 2015 15:12:50 -0500
Subject: [PATCH] Update ansible router playbook

Change-Id: Iae2cb060f8600476fd7af2ff77e99263edd67362
---
 .../tests/ansible/roles/router/tasks/main.yml | 24 ++++++++++---------
 .../tests/ansible/roles/router/vars/main.yml  |  1 +
 2 files changed, 14 insertions(+), 11 deletions(-)

diff --git a/shade/tests/ansible/roles/router/tasks/main.yml b/shade/tests/ansible/roles/router/tasks/main.yml
index e4ecba612..4e98987bf 100644
--- a/shade/tests/ansible/roles/router/tasks/main.yml
+++ b/shade/tests/ansible/roles/router/tasks/main.yml
@@ -1,16 +1,23 @@
 ---
-- name: Create network
+- name: Create external network
+  os_network:
+     cloud: "{{ cloud }}"
+     state: present
+     name: "{{ external_network_name }}"
+     external: true
+
+- name: Create internal network
   os_network:
      cloud: "{{ cloud }}"
      state: present
      name: "{{ network_name }}"
-     external: true
+     external: false
 
 - name: Create subnet1
   os_subnet:
      cloud: "{{ cloud }}"
      state: present
-     network_name: "{{ network_name }}"
+     network_name: "{{ external_network_name }}"
      name: shade_subnet1
      cidr: 10.6.6.0/24
 
@@ -27,21 +34,16 @@
      cloud: "{{ cloud }}"
      state: present
      name: "{{ router_name }}"
-     network: "{{ network_name }}"
-     interfaces:
-         - subnet: shade_subnet1
-           ip: 10.6.6.99
+     network: "{{ external_network_name }}"
 
 - name: Update router
   os_router:
      cloud: "{{ cloud }}"
      state: present
      name: "{{ router_name }}"
-     network: "{{ network_name }}"
+     network: "{{ external_network_name }}"
      interfaces:
-         - subnet: shade_subnet1
-         - subnet: shade_subnet2
-           ip: 10.7.7.99
+         - shade_subnet2
 
 - name: Delete router
   os_router:
diff --git a/shade/tests/ansible/roles/router/vars/main.yml b/shade/tests/ansible/roles/router/vars/main.yml
index 0990d1a59..df5cbeb55 100644
--- a/shade/tests/ansible/roles/router/vars/main.yml
+++ b/shade/tests/ansible/roles/router/vars/main.yml
@@ -1 +1,2 @@
+external_network_name: ansible_external_net
 router_name: ansible_router