Change service-type to load-balancer

Changes the default service type from "octavia" to "load-balancer' to match
changes to the octavia service [1].

[1] https://review.openstack.org/#/c/450916/

Change-Id: Icb72e484a15a918fb66ea8eed190acaaeabd7c3b
This commit is contained in:
Brent Eagles 2017-08-02 13:17:24 -02:30
parent 8b4707a1f5
commit 3c1dd62dd7
3 changed files with 16 additions and 11 deletions

View File

@ -28,7 +28,7 @@
# Defaults to 'true'.
#
# [*service_type*]
# Type of service. Defaults to 'octavia'.
# Type of service. Defaults to 'load-balancer'.
#
# [*region*]
# Region for endpoint. Defaults to 'RegionOne'.
@ -57,7 +57,7 @@ class octavia::keystone::auth (
$configure_user = true,
$configure_user_role = true,
$service_name = 'octavia',
$service_type = 'octavia',
$service_type = 'load-balancer',
$region = 'RegionOne',
$public_url = 'http://127.0.0.1:9876',
$admin_url = 'http://127.0.0.1:9876',

View File

@ -0,0 +1,5 @@
---
fixes:
- |
This patch alters the default keystone service type from "octavia" to "load-balancer" to
sync with https://review.openstack.org/#/c/450916/.

View File

@ -26,12 +26,12 @@ describe 'octavia::keystone::auth' do
:roles => ['admin']
)}
it { is_expected.to contain_keystone_service('octavia::octavia').with(
it { is_expected.to contain_keystone_service('octavia::load-balancer').with(
:ensure => 'present',
:description => 'Octavia Service'
) }
it { is_expected.to contain_keystone_endpoint('RegionOne/octavia::octavia').with(
it { is_expected.to contain_keystone_endpoint('RegionOne/octavia::load-balancer').with(
:ensure => 'present',
:public_url => 'http://127.0.0.1:9876',
:admin_url => 'http://127.0.0.1:9876',
@ -47,7 +47,7 @@ describe 'octavia::keystone::auth' do
:admin_url => 'http://10.10.10.12:81', }
end
it { is_expected.to contain_keystone_endpoint('RegionOne/octavia::octavia').with(
it { is_expected.to contain_keystone_endpoint('RegionOne/octavia::load-balancer').with(
:ensure => 'present',
:public_url => 'https://10.10.10.10:80',
:internal_url => 'http://10.10.10.11:81',
@ -63,8 +63,8 @@ describe 'octavia::keystone::auth' do
it { is_expected.to contain_keystone_user('octaviay') }
it { is_expected.to contain_keystone_user_role('octaviay@services') }
it { is_expected.to contain_keystone_service('octavia::octavia') }
it { is_expected.to contain_keystone_endpoint('RegionOne/octavia::octavia') }
it { is_expected.to contain_keystone_service('octavia::load-balancer') }
it { is_expected.to contain_keystone_endpoint('RegionOne/octavia::load-balancer') }
end
describe 'when overriding service name' do
@ -76,8 +76,8 @@ describe 'octavia::keystone::auth' do
it { is_expected.to contain_keystone_user('octavia') }
it { is_expected.to contain_keystone_user_role('octavia@services') }
it { is_expected.to contain_keystone_service('octavia_service::octavia') }
it { is_expected.to contain_keystone_endpoint('RegionOne/octavia_service::octavia') }
it { is_expected.to contain_keystone_service('octavia_service::load-balancer') }
it { is_expected.to contain_keystone_endpoint('RegionOne/octavia_service::load-balancer') }
end
describe 'when disabling user configuration' do
@ -91,7 +91,7 @@ describe 'octavia::keystone::auth' do
it { is_expected.not_to contain_keystone_user('octavia') }
it { is_expected.to contain_keystone_user_role('octavia@services') }
it { is_expected.to contain_keystone_service('octavia::octavia').with(
it { is_expected.to contain_keystone_service('octavia::load-balancer').with(
:ensure => 'present',
:description => 'Octavia Service'
) }
@ -110,7 +110,7 @@ describe 'octavia::keystone::auth' do
it { is_expected.not_to contain_keystone_user('octavia') }
it { is_expected.not_to contain_keystone_user_role('octavia@services') }
it { is_expected.to contain_keystone_service('octavia::octavia').with(
it { is_expected.to contain_keystone_service('octavia::load-balancer').with(
:ensure => 'present',
:description => 'Octavia Service'
) }