Merge "Do not declare service resources when manage_service is false"
This commit is contained in:
commit
9448a98907
|
@ -68,7 +68,6 @@ class octavia::health_manager (
|
|||
} else {
|
||||
$service_ensure = 'stopped'
|
||||
}
|
||||
}
|
||||
|
||||
service { 'octavia-health-manager':
|
||||
ensure => $service_ensure,
|
||||
|
@ -78,6 +77,7 @@ class octavia::health_manager (
|
|||
hasrestart => true,
|
||||
tag => ['octavia-service'],
|
||||
}
|
||||
}
|
||||
|
||||
octavia_config {
|
||||
'health_manager/heartbeat_key' : value => $heartbeat_key;
|
||||
|
|
|
@ -77,7 +77,6 @@ class octavia::housekeeping (
|
|||
} else {
|
||||
$service_ensure = 'stopped'
|
||||
}
|
||||
}
|
||||
|
||||
service { 'octavia-housekeeping':
|
||||
ensure => $service_ensure,
|
||||
|
@ -87,6 +86,7 @@ class octavia::housekeeping (
|
|||
hasrestart => true,
|
||||
tag => ['octavia-service'],
|
||||
}
|
||||
}
|
||||
|
||||
octavia_config {
|
||||
'house_keeping/cleanup_interval' : value => $cleanup_interval;
|
||||
|
|
|
@ -86,9 +86,11 @@ class octavia::worker (
|
|||
}
|
||||
$nova_flavor_defaults = merge($octavia_flavor_defaults, $nova_flavor_config)
|
||||
create_resources('nova_flavor', $octavia_flavor, $nova_flavor_defaults)
|
||||
if $manage_service {
|
||||
Nova_flavor<| tag == 'octavia' |> ~> Service['octavia-worker']
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
package { 'octavia-worker':
|
||||
ensure => $package_ensure,
|
||||
|
@ -102,7 +104,6 @@ class octavia::worker (
|
|||
} else {
|
||||
$service_ensure = 'stopped'
|
||||
}
|
||||
}
|
||||
|
||||
service { 'octavia-worker':
|
||||
ensure => $service_ensure,
|
||||
|
@ -112,6 +113,7 @@ class octavia::worker (
|
|||
hasrestart => true,
|
||||
tag => ['octavia-service'],
|
||||
}
|
||||
}
|
||||
|
||||
if $manage_keygen and ! $::octavia::controller::enable_ssh_access {
|
||||
fail('SSH key management cannot be enabled when SSH key access is disabled')
|
||||
|
|
|
@ -71,15 +71,8 @@ describe 'octavia::health_manager' do
|
|||
:enabled => false })
|
||||
end
|
||||
|
||||
it 'configures octavia-health-manager service' do
|
||||
is_expected.to contain_service('octavia-health-manager').with(
|
||||
:ensure => nil,
|
||||
:name => platform_params[:health_manager_service_name],
|
||||
:enable => false,
|
||||
:hasstatus => true,
|
||||
:hasrestart => true,
|
||||
:tag => ['octavia-service'],
|
||||
)
|
||||
it 'does not configure octavia-health-manager service' do
|
||||
is_expected.to_not contain_service('octavia-health-manager')
|
||||
end
|
||||
end
|
||||
|
||||
|
|
|
@ -77,15 +77,8 @@ describe 'octavia::housekeeping' do
|
|||
:enabled => false })
|
||||
end
|
||||
|
||||
it 'configures octavia-housekeeping service' do
|
||||
is_expected.to contain_service('octavia-housekeeping').with(
|
||||
:ensure => nil,
|
||||
:name => platform_params[:housekeeping_service_name],
|
||||
:enable => false,
|
||||
:hasstatus => true,
|
||||
:hasrestart => true,
|
||||
:tag => ['octavia-service'],
|
||||
)
|
||||
it 'does not configure octavia-housekeeping service' do
|
||||
is_expected.to_not contain_service('octavia-housekeeping')
|
||||
end
|
||||
end
|
||||
|
||||
|
|
|
@ -116,15 +116,8 @@ describe 'octavia::worker' do
|
|||
:enabled => false })
|
||||
end
|
||||
|
||||
it 'configures octavia-worker service' do
|
||||
is_expected.to contain_service('octavia-worker').with(
|
||||
:ensure => nil,
|
||||
:name => platform_params[:worker_service_name],
|
||||
:enable => false,
|
||||
:hasstatus => true,
|
||||
:hasrestart => true,
|
||||
:tag => ['octavia-service'],
|
||||
)
|
||||
it 'does not configure octavia-worker service' do
|
||||
is_expected.to_not contain_service('octavia-worker')
|
||||
end
|
||||
end
|
||||
|
||||
|
|
Loading…
Reference in New Issue