Merge "Fix the duplicated vars defined" into stable/rocky

This commit is contained in:
Zuul 2018-11-15 02:07:42 +00:00 committed by Gerrit Code Review
commit cd5d21c815
1 changed files with 1 additions and 2 deletions

View File

@ -13,6 +13,7 @@ class octavia::params {
$worker_service_name = 'octavia-worker'
$health_manager_service_name = 'octavia-health-manager'
$housekeeping_service_name = 'octavia-housekeeping'
$client_package_name = "python${pyvers}-octaviaclient"
$group = 'octavia'
case $::osfamily {
'RedHat': {
@ -21,7 +22,6 @@ class octavia::params {
$worker_package_name = 'openstack-octavia-worker'
$health_manager_package_name = 'openstack-octavia-health-manager'
$housekeeping_package_name = 'openstack-octavia-housekeeping'
$client_package_name = "python${pyvers}-octaviaclient"
$octavia_wsgi_script_path = '/var/www/cgi-bin/octavia'
$octavia_wsgi_script_source = '/usr/bin/octavia-wsgi'
}
@ -31,7 +31,6 @@ class octavia::params {
$worker_package_name = 'octavia-worker'
$health_manager_package_name = 'octavia-health-manager'
$housekeeping_package_name = 'octavia-housekeeping'
$client_package_name = "python${pyvers}-octaviaclient"
$octavia_wsgi_script_path = '/usr/lib/cgi-bin/octavia'
$octavia_wsgi_script_source = '/usr/bin/octavia-wsgi'
}