Fix the duplicated vars defined
Change-Id: I57511901fc9a2ac48473fd53dfd756868f1ae2c9 Closes-Bug: #1792705
This commit is contained in:
parent
c4f538cb88
commit
ed34f37585
|
@ -2,7 +2,6 @@
|
||||||
#
|
#
|
||||||
class watcher::params {
|
class watcher::params {
|
||||||
include ::openstacklib::defaults
|
include ::openstacklib::defaults
|
||||||
$group = 'watcher'
|
|
||||||
|
|
||||||
if ($::os_package_type == 'debian') {
|
if ($::os_package_type == 'debian') {
|
||||||
$pyvers = '3'
|
$pyvers = '3'
|
||||||
|
@ -10,6 +9,9 @@ class watcher::params {
|
||||||
$pyvers = ''
|
$pyvers = ''
|
||||||
}
|
}
|
||||||
|
|
||||||
|
$client_package_name = "python${pyvers}-watcherclient"
|
||||||
|
$group = 'watcher'
|
||||||
|
|
||||||
case $::osfamily {
|
case $::osfamily {
|
||||||
'RedHat': {
|
'RedHat': {
|
||||||
$api_service_name = 'openstack-watcher-api'
|
$api_service_name = 'openstack-watcher-api'
|
||||||
|
@ -19,7 +21,6 @@ class watcher::params {
|
||||||
$applier_service_name = 'openstack-watcher-applier'
|
$applier_service_name = 'openstack-watcher-applier'
|
||||||
$decision_engine_package_name = 'openstack-watcher-decision-engine'
|
$decision_engine_package_name = 'openstack-watcher-decision-engine'
|
||||||
$decision_engine_service_name = 'openstack-watcher-decision-engine'
|
$decision_engine_service_name = 'openstack-watcher-decision-engine'
|
||||||
$client_package_name = undef
|
|
||||||
$watcher_wsgi_script_source = '/usr/lib/python2.7/site-packages/watcher/api/app.wsgi'
|
$watcher_wsgi_script_source = '/usr/lib/python2.7/site-packages/watcher/api/app.wsgi'
|
||||||
$watcher_wsgi_script_path = '/var/www/cgi-bin/watcher'
|
$watcher_wsgi_script_path = '/var/www/cgi-bin/watcher'
|
||||||
}
|
}
|
||||||
|
@ -31,7 +32,6 @@ class watcher::params {
|
||||||
$applier_service_name = 'watcher-applier'
|
$applier_service_name = 'watcher-applier'
|
||||||
$decision_engine_package_name = 'watcher-decision-engine'
|
$decision_engine_package_name = 'watcher-decision-engine'
|
||||||
$decision_engine_service_name = 'watcher-decision-engine'
|
$decision_engine_service_name = 'watcher-decision-engine'
|
||||||
$client_package_name = "python${pyvers}-watcherclient"
|
|
||||||
if ($::os_package_type == 'debian') {
|
if ($::os_package_type == 'debian') {
|
||||||
$watcher_wsgi_script_source = '/usr/share/watcher-common/app.wsgi'
|
$watcher_wsgi_script_source = '/usr/share/watcher-common/app.wsgi'
|
||||||
} else {
|
} else {
|
||||||
|
|
Loading…
Reference in New Issue