Merge "Rename quantum to neutron"

README.md

@@ -53,7 +53,6 @@ class { '::horizon':
   cache_server_port     => '11211',
   secret_key            => '12345',
   swift                 => false,
-  quantum               => false,
   django_debug          => 'True',
   api_result_limit      => '2000',
 }

manifests/init.pp

@@ -20,9 +20,6 @@
 #  [*swift*]
 #    (optional) Enable Swift interface extension. Defaults to false.
 #
-#  [*quantum*]
-#    (optional) Enable Quantum interface extension. Defaults to false.
-#
 #  [*horizon_app_links*]
 #    (optional) Array of arrays that can be used to add call-out links
 #    to the dashboard for other apps. There is no specific requirement
@@ -70,7 +67,6 @@ class horizon(
   $cache_server_ip         = '127.0.0.1',
   $cache_server_port       = '11211',
   $swift                   = false,
-  $quantum                 = false,
   $horizon_app_links       = false,
   $keystone_host           = '127.0.0.1',
   $keystone_port           = 5000,
@@ -92,10 +88,6 @@ class horizon(
     warning('swift parameter is deprecated and has no effect.')
   }
 
-  if $quantum {
-    warning('quantum parameter is deprecated and has no effect.')
-  }
-
   # I am totally confused by this, I do not think it should be installed...
   if ($::osfamily == 'Debian') {
     package { 'node-less': }

templates/local_settings.py.erb

@@ -129,10 +129,10 @@ OPENSTACK_HYPERVISOR_FEATURES = {
     'can_encrypt_volumes': False
 }
 
-# The OPENSTACK_QUANTUM_NETWORK settings can be used to enable optional
-# services provided by quantum.  Currently only the load balancer service
+# The OPENSTACK_NEUTRON_NETWORK settings can be used to enable optional
+# services provided by neutron.  Currently only the load balancer service
 # is available.
-OPENSTACK_QUANTUM_NETWORK = {
+OPENSTACK_NEUTRON_NETWORK = {
     'enable_lb': False
 }