openstack/puppet-openstack-integration
Code Issues Proposed changes

Neutron: Avoid usage of built-in service validation

Browse Source 
... because service validation feature in each module is being
deprecated.

Change-Id: Iaec28fc13f38d0b3a758df1bfcadee6b2e4c656f
This commit is contained in:
Takashi Kajinami 2021-12-13 23:45:36 +09:00
parent f2d36488cd
commit 6cd5788d7f
1 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
manifests/neutron.pp
View File

@ -201,11 +201,19 @@ class openstack_integration::neutron (
} }
if $::osfamily == 'Debian' { if $::osfamily == 'Debian' {
Service<| title == 'neutron-server'|> -> Openstacklib::Service_validation<| title == 'neutron-server' |> -> Neutron_network<||> $auth_url = $::openstack_integration::config::keystone_auth_uri
$validate_neutron_server_service = true exec { 'check-neutron-server':
} else { command => "openstack --os-auth-url ${auth_url} --os-project-name services --os-username neutron --os-identity-api-version 3 network list",
$validate_neutron_server_service = false environment => ['OS_PASSWORD=a_big_secret'],
path => '/usr/bin:/bin:/usr/sbin:/sbin',
provider => shell,
timeout => 60,
tries => 10,
try_sleep => 2,
}
Anchor['neutron::service::end'] -> Exec['check-neutron-server'] -> Neutron_network<||>
} }
class { 'neutron::db': class { 'neutron::db':
database_connection => 'mysql+pymysql://neutron:neutron@127.0.0.1/neutron?charset=utf8', database_connection => 'mysql+pymysql://neutron:neutron@127.0.0.1/neutron?charset=utf8',
} }
@ -214,7 +222,6 @@ class openstack_integration::neutron (
api_workers => 2, api_workers => 2,
rpc_workers => 2, rpc_workers => 2,
rpc_response_max_timeout => 300, rpc_response_max_timeout => 300,
validate => $validate_neutron_server_service,
service_providers => $providers_list, service_providers => $providers_list,
ensure_dr_package => $bgp_dragent_enabled, ensure_dr_package => $bgp_dragent_enabled,
} }