From a5f9a18c6819f39801bcee5f080e1ec27d30b718 Mon Sep 17 00:00:00 2001
From: Maru Newby <marun@redhat.com>
Date: Fri, 9 Aug 2013 01:00:58 -0700
Subject: [PATCH] Some more quantum -> neutron renaming.

Change-Id: I68c6df17272d12bbd9c70073ab8653b23b45cf67
---
 README.md                                | 6 +++---
 manifests/auth_file.pp                   | 4 ++--
 spec/classes/openstack_auth_file_spec.rb | 6 +++---
 templates/openrc.erb                     | 2 +-
 4 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/README.md b/README.md
index 6125014..7be3e9e 100644
--- a/README.md
+++ b/README.md
@@ -506,8 +506,8 @@ Release Notes
 
 **2.1.0**
 
-* Added support for Quantum OVS VLAN networking.
-* Added Quantum firewall driver at top scope parameter.
+* Added support for Neutron OVS VLAN networking.
+* Added Neutron firewall driver at top scope parameter.
 * Added support for Glance Registry MySQL Idle Timeout
 * Added support for debug logging.
 * Added rdb/ceph backend support to Glance.
@@ -524,7 +524,7 @@ Release Notes
 * Added configuration for Swift auth in controller.
 * Reintroduces support for provider networks.
 * Propogates both internal and admin addresses to services.
-* Passes through quantum core plugin.
+* Passes through neutron core plugin.
 * Exposes public_protocol parameter in openstack::controller.
 * Exposes Glance registry_host parameter.
 * Fixed authentication host parameter bug to use real_keystone_host.
diff --git a/manifests/auth_file.pp b/manifests/auth_file.pp
index 5557ff9..afae919 100644
--- a/manifests/auth_file.pp
+++ b/manifests/auth_file.pp
@@ -31,7 +31,7 @@
 #   (optional) Defaults to 'publicURL'.
 # [*nova_endpoint_type*]
 #   (optional) Defaults to 'publicURL'.
-# [*quantum_endpoint_type*]
+# [*neutron_endpoint_type*]
 #   (optional) Defaults to 'publicURL'.
 #
 class openstack::auth_file(
@@ -46,7 +46,7 @@ class openstack::auth_file(
   $glance_endpoint_type     = 'publicURL',
   $keystone_endpoint_type   = 'publicURL',
   $nova_endpoint_type       = 'publicURL',
-  $quantum_endpoint_type    = 'publicURL',
+  $neutron_endpoint_type    = 'publicURL',
 ) {
 
   file { '/root/openrc':
diff --git a/spec/classes/openstack_auth_file_spec.rb b/spec/classes/openstack_auth_file_spec.rb
index 3ee8f39..3d57f98 100644
--- a/spec/classes/openstack_auth_file_spec.rb
+++ b/spec/classes/openstack_auth_file_spec.rb
@@ -21,7 +21,7 @@ describe 'openstack::auth_file' do
         'export GLANCE_ENDPOINT_TYPE=publicURL',
         'export KEYSTONE_ENDPOINT_TYPE=publicURL',
         'export NOVA_ENDPOINT_TYPE=publicURL',
-        'export QUANTUM_ENDPOINT_TYPE=publicURL'
+        'export NEUTRON_ENDPOINT_TYPE=publicURL'
       ])
     end
   end
@@ -37,7 +37,7 @@ describe 'openstack::auth_file' do
         :glance_endpoint_type     => 'privateURL',
         :keystone_endpoint_type   => 'privateURL',
         :nova_endpoint_type       => 'privateURL',
-        :quantum_endpoint_type    => 'privateURL',
+        :neutron_endpoint_type    => 'privateURL',
       }
     end
 
@@ -56,7 +56,7 @@ describe 'openstack::auth_file' do
         'export GLANCE_ENDPOINT_TYPE=privateURL',
         'export KEYSTONE_ENDPOINT_TYPE=privateURL',
         'export NOVA_ENDPOINT_TYPE=privateURL',
-        'export QUANTUM_ENDPOINT_TYPE=privateURL'
+        'export NEUTRON_ENDPOINT_TYPE=privateURL'
       ])
     end
   end
diff --git a/templates/openrc.erb b/templates/openrc.erb
index 355670a..4110260 100644
--- a/templates/openrc.erb
+++ b/templates/openrc.erb
@@ -14,4 +14,4 @@ export CINDER_ENDPOINT_TYPE=<%= @cinder_endpoint_type %>
 export GLANCE_ENDPOINT_TYPE=<%= @glance_endpoint_type %>
 export KEYSTONE_ENDPOINT_TYPE=<%= @keystone_endpoint_type %>
 export NOVA_ENDPOINT_TYPE=<%= @nova_endpoint_type %>
-export QUANTUM_ENDPOINT_TYPE=<%= @quantum_endpoint_type %>
+export NEUTRON_ENDPOINT_TYPE=<%= @neutron_endpoint_type %>