From f8175fb55fd3d0a7c76ac8030157e02347c61525 Mon Sep 17 00:00:00 2001
From: Robert Collins <rbtcollins@hp.com>
Date: Fri, 11 Oct 2013 19:18:45 +1300
Subject: Delete unused interfaces.control key.

Change-Id: I3a84cf52cc46f0c338319a046d77edb2a9b29c45
---
 nova-compute-instance.yaml | 5 -----
 overcloud-source.yaml      | 5 -----
 undercloud-bm.yaml         | 2 --
 undercloud-vm.yaml         | 2 --
 4 files changed, 14 deletions(-)

diff --git a/nova-compute-instance.yaml b/nova-compute-instance.yaml
index 3074228e..dd7c39ae 100644
--- a/nova-compute-instance.yaml
+++ b/nova-compute-instance.yaml
@@ -26,9 +26,6 @@ Parameters:
   RabbitPassword:
     Type: String
     NoEcho: true
-  NovaInterfaces:
-    Type: String
-    Default: eth0
   NovaComputeDriver:
     Type: String
     Default: libvirt.LibvirtDriver
@@ -137,5 +134,3 @@ Resources:
       swift:
         store_user: ''
         store_key: ''
-      interfaces:
-        control: {Ref: NovaInterfaces}
diff --git a/overcloud-source.yaml b/overcloud-source.yaml
index 98c38540..8cb4596c 100644
--- a/overcloud-source.yaml
+++ b/overcloud-source.yaml
@@ -48,9 +48,6 @@ Parameters:
   NovaImage:
     Type: String
     Default: overcloud-compute
-  NovaInterfaces:
-    Default: eth0
-    Type: String
   NovaPassword:
     Default: unset
     Description: The password for the nova service account, used by nova-api.
@@ -224,8 +221,6 @@ Resources:
                     - notcompute
                     - networks
               - ':8000/v1/waitcondition'
-      interfaces:
-        control: eth0
       keystone:
         db: mysql://keystone:unset@localhost/keystone
         host:
diff --git a/undercloud-bm.yaml b/undercloud-bm.yaml
index 9e1e8d76..b4b23c1b 100644
--- a/undercloud-bm.yaml
+++ b/undercloud-bm.yaml
@@ -130,8 +130,6 @@ Resources:
             - SecretAccessKey
           stack_name:
             Ref: AWS::StackName
-      interfaces:
-        control: eth2
       keystone:
         db: mysql://keystone:unset@localhost/keystone
         host: 127.0.0.1
diff --git a/undercloud-vm.yaml b/undercloud-vm.yaml
index 8c948caf..a1274094 100644
--- a/undercloud-vm.yaml
+++ b/undercloud-vm.yaml
@@ -134,8 +134,6 @@ Resources:
             - SecretAccessKey
           stack_name:
             Ref: AWS::StackName
-      interfaces:
-        control: eth2
       keystone:
         db: mysql://keystone:unset@localhost/keystone
         host: 127.0.0.1
-- 
cgit 1.2.3-korg