Remove usage of custom os_package_type fact
Currently we support usage of distro packages only, and this custom fact can be simply replaced by the default fact. Change-Id: Id544dc2bb4f8e7424b259050e44f403c68f80eb8
This commit is contained in:
parent
2e9d96138b
commit
37e07910a9
@ -97,7 +97,7 @@ class murano::dashboard(
|
||||
path => [ '/bin/', '/sbin/', '/usr/bin/', '/usr/sbin/' ],
|
||||
}
|
||||
|
||||
if $::os_package_type == 'ubuntu' {
|
||||
if $::operatingsystem == 'Ubuntu' {
|
||||
$collect_static_command = "${collect_static_script} collectstatic --noinput"
|
||||
} else {
|
||||
$collect_static_command = "${collect_static_script} collectstatic --noinput --clear"
|
||||
|
@ -32,7 +32,7 @@ describe 'murano::dashboard' do
|
||||
|
||||
shared_examples 'with default class parameters' do
|
||||
let(:collect_static_command) {
|
||||
if facts[:os_package_type] == 'ubuntu'
|
||||
if facts[:operatingsystem] == 'Ubuntu'
|
||||
"/usr/share/openstack-dashboard/manage.py collectstatic --noinput"
|
||||
else
|
||||
"/usr/share/openstack-dashboard/manage.py collectstatic --noinput --clear"
|
||||
@ -86,7 +86,7 @@ describe 'murano::dashboard' do
|
||||
|
||||
shared_examples 'with parameters override' do
|
||||
let(:collect_static_command) {
|
||||
if facts[:os_package_type] == 'ubuntu'
|
||||
if facts[:operatingsystem] == 'Ubuntu'
|
||||
"/bin/openstack-dashboard/manage.py collectstatic --noinput"
|
||||
else
|
||||
"/bin/openstack-dashboard/manage.py collectstatic --noinput --clear"
|
||||
|
Loading…
Reference in New Issue
Block a user