Browse Source

Merge "Expect python3 package in CentOS8 and Fedora"

tags/16.2.1
Zuul 3 months ago
committed by Gerrit Code Review
parent
commit
5603f26b31
1 changed files with 24 additions and 6 deletions
  1. +24
    -6
      spec/classes/horizon_init_spec.rb

+ 24
- 6
spec/classes/horizon_init_spec.rb View File

@@ -765,12 +765,30 @@ describe 'horizon' do
}
end
when 'RedHat'
{ :config_file => '/etc/openstack-dashboard/local_settings',
:package_name => 'openstack-dashboard',
:root_url => '/dashboard',
:root_path => '/usr/share/openstack-dashboard',
:memcache_package => 'python-memcached',
}
if facts[:operatingsystem] == 'Fedora'
{ :config_file => '/etc/openstack-dashboard/local_settings',
:package_name => 'openstack-dashboard',
:root_url => '/dashboard',
:root_path => '/usr/share/openstack-dashboard',
:memcache_package => 'python3-memcached',
}
else
if facts[:operatingsystemmajrelease] > '7'
{ :config_file => '/etc/openstack-dashboard/local_settings',
:package_name => 'openstack-dashboard',
:root_url => '/dashboard',
:root_path => '/usr/share/openstack-dashboard',
:memcache_package => 'python3-memcached',
}
else
{ :config_file => '/etc/openstack-dashboard/local_settings',
:package_name => 'openstack-dashboard',
:root_url => '/dashboard',
:root_path => '/usr/share/openstack-dashboard',
:memcache_package => 'python-memcached',
}
end
end
end
end



Loading…
Cancel
Save