Use the global environment to map Quantum to Neutron

Change-Id: Id3ccc0538d79955d0112daf37bcd80dce78a0373

diff --git a/etc/heat/environment.d/default.yaml b/etc/heat/environment.d/default.yaml
index b2bdc1099d0d20c7820ec2a85e04421478dc3799..678f888f4f6a39ee299279ce24b6a85c33f0cb69 100644 (file)
--- 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 34b0f65c7ce6469cc70f237212ea40d4137f0d5f..e6b0c61c9caa168418cbbc158695e87829903f08 100644 (file)
--- 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 816964187bbb8707090d5c3e9cb3aa2d4d705497..acbcd4818aa0d143de19f757678b26f95390fa3e 100644 (file)
--- 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 fa8a12806a3b70fa83302631b19b56b87bde796b..1311f3518d2954c9644a024c585902cac4d028ed 100644 (file)
--- 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 c81be307440354505ea4b8739757bfd415236e41..793b212ed272c660cc7a990bf59542579babe350 100644 (file)
--- 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 f66e4ca42d508343a51b9786eb13b5b49b2ba266..d317fad8724330e40e1d104dac2cc25f5ecbb419 100644 (file)
--- 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,
     }