Some more quantum -> neutron renaming.
Change-Id: I68c6df17272d12bbd9c70073ab8653b23b45cf67
This commit is contained in:
@@ -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.
|
||||
|
@@ -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':
|
||||
|
@@ -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
|
||||
|
@@ -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 %>
|
||||
|
Reference in New Issue
Block a user