From 7904094e11ad255574bc58e46c982b93c987d8f8 Mon Sep 17 00:00:00 2001
From: Angus Salkeld <asalkeld@redhat.com>
Date: Thu, 8 Aug 2013 11:29:46 +1000
Subject: [PATCH] Use the global environment to map Quantum to Neutron

Change-Id: Id3ccc0538d79955d0112daf37bcd80dce78a0373
---
 etc/heat/environment.d/default.yaml         | 2 ++
 heat/engine/resources/neutron/floatingip.py | 2 --
 heat/engine/resources/neutron/net.py        | 1 -
 heat/engine/resources/neutron/port.py       | 1 -
 heat/engine/resources/neutron/router.py     | 3 ---
 heat/engine/resources/neutron/subnet.py     | 1 -
 6 files changed, 2 insertions(+), 8 deletions(-)

diff --git a/etc/heat/environment.d/default.yaml b/etc/heat/environment.d/default.yaml
index b2bdc109..678f888f 100644
--- a/etc/heat/environment.d/default.yaml
+++ b/etc/heat/environment.d/default.yaml
@@ -1,5 +1,7 @@
 
 resource_registry:
+    # allow older templates with Quantum in them.
+    "OS::Quantum*": "OS::Neutron*"
     # Choose your implementation of AWS::CloudWatch::Alarm
     #"AWS::CloudWatch::Alarm": "file:///etc/heat/templates/AWS_CloudWatch_Alarm.yaml"
     "AWS::CloudWatch::Alarm": "OS::Heat::CWLiteAlarm"
diff --git a/heat/engine/resources/neutron/floatingip.py b/heat/engine/resources/neutron/floatingip.py
index 34b0f65c..e6b0c61c 100644
--- a/heat/engine/resources/neutron/floatingip.py
+++ b/heat/engine/resources/neutron/floatingip.py
@@ -104,6 +104,4 @@ def resource_mapping():
     return {
         'OS::Neutron::FloatingIP': FloatingIP,
         'OS::Neutron::FloatingIPAssociation': FloatingIPAssociation,
-        'OS::Quantum::FloatingIP': FloatingIP,
-        'OS::Quantum::FloatingIPAssociation': FloatingIPAssociation,
     }
diff --git a/heat/engine/resources/neutron/net.py b/heat/engine/resources/neutron/net.py
index 81696418..acbcd481 100644
--- a/heat/engine/resources/neutron/net.py
+++ b/heat/engine/resources/neutron/net.py
@@ -71,5 +71,4 @@ def resource_mapping():
 
     return {
         'OS::Neutron::Net': Net,
-        'OS::Quantum::Net': Net,
     }
diff --git a/heat/engine/resources/neutron/port.py b/heat/engine/resources/neutron/port.py
index fa8a1280..1311f351 100644
--- a/heat/engine/resources/neutron/port.py
+++ b/heat/engine/resources/neutron/port.py
@@ -102,5 +102,4 @@ def resource_mapping():
 
     return {
         'OS::Neutron::Port': Port,
-        'OS::Quantum::Port': Port,
     }
diff --git a/heat/engine/resources/neutron/router.py b/heat/engine/resources/neutron/router.py
index c81be307..793b212e 100644
--- a/heat/engine/resources/neutron/router.py
+++ b/heat/engine/resources/neutron/router.py
@@ -141,7 +141,4 @@ def resource_mapping():
         'OS::Neutron::Router': Router,
         'OS::Neutron::RouterInterface': RouterInterface,
         'OS::Neutron::RouterGateway': RouterGateway,
-        'OS::Quantum::Router': Router,
-        'OS::Quantum::RouterInterface': RouterInterface,
-        'OS::Quantum::RouterGateway': RouterGateway,
     }
diff --git a/heat/engine/resources/neutron/subnet.py b/heat/engine/resources/neutron/subnet.py
index f66e4ca4..d317fad8 100644
--- a/heat/engine/resources/neutron/subnet.py
+++ b/heat/engine/resources/neutron/subnet.py
@@ -91,5 +91,4 @@ def resource_mapping():
 
     return {
         'OS::Neutron::Subnet': Subnet,
-        'OS::Quantum::Subnet': Subnet,
     }
-- 
2.45.2