Browse Source

Adjust client packages for Fedora and RedHat > 7

python2 packages are being removed in Fedora, start
consuming python3 packages. Also use commands wherever
possible as that would be same for both CentOS 7 and Fedora.

Change-Id: Ibbd433690447476e6d10c21bd5bccada887016bd
yatin 5 months ago
parent
commit
bfa132db7e

+ 9
- 2
packstack/puppet/modules/packstack/manifests/ceilometer.pp View File

@@ -6,13 +6,20 @@ class packstack::ceilometer ()
6 6
 
7 7
     $config_gnocchi_host = hiera('CONFIG_KEYSTONE_HOST_URL')
8 8
 
9
+    if ($::operatingsystem == 'Fedora') or
10
+       ($::osfamily == 'RedHat' and Integer.new($::operatingsystemmajrelease) > 7) {
11
+      $pyvers = '3'
12
+    } else {
13
+      $pyvers = ''
14
+    }
15
+
9 16
     if $config_ceilometer_coordination_backend == 'redis' {
10 17
       $redis_host = hiera('CONFIG_REDIS_HOST_URL')
11 18
       $redis_port = hiera('CONFIG_REDIS_PORT')
12 19
       $coordination_url = "redis://${redis_host}:${redis_port}"
13 20
 
14
-      ensure_resource('package', 'python-redis', {
15
-        name   => 'python-redis',
21
+      ensure_resource('package', "python${pyvers}-redis", {
22
+        name   => "python${pyvers}-redis",
16 23
         tag    => 'openstack',
17 24
       })
18 25
     } else {

+ 2
- 2
packstack/puppet/modules/packstack/manifests/nova/compute.pp View File

@@ -5,8 +5,8 @@ class packstack::nova::compute ()
5 5
     create_resources(packstack::firewall, hiera($qemu_rule_name, {}))
6 6
     create_resources(packstack::firewall, hiera('FIREWALL_NOVA_COMPUTE_RULES', {}))
7 7
 
8
-    ensure_packages(['python-cinderclient'], {'ensure' => 'present'})
9
-    Package['python-cinderclient'] -> Class['nova']
8
+    ensure_packages(['/usr/bin/cinder'], {'ensure' => 'present'})
9
+    Package['/usr/bin/cinder'] -> Class['nova']
10 10
 
11 11
     # Install the private key to be used for live migration.  This needs to be
12 12
     # configured into libvirt/live_migration_uri in nova.conf.

+ 4
- 4
packstack/puppet/modules/packstack/manifests/openstackclient.pp View File

@@ -1,13 +1,13 @@
1 1
 class packstack::openstackclient ()
2 2
 {
3
-    $clientlibs = ['python-novaclient',
4
-      'python-glanceclient',
5
-      'python-cinderclient', 'python-openstackclient']
3
+    $clientlibs = ['/usr/bin/nova',
4
+      '/usr/bin/glance',
5
+      '/usr/bin/cinder', '/usr/bin/openstack']
6 6
 
7 7
     ensure_packages($clientlibs, {'ensure' => 'present'})
8 8
 
9 9
     if hiera('CONFIG_MANILA_INSTALL') == 'y' {
10
-      ensure_packages(['python-manilaclient'], {'ensure' => 'present'})
10
+      ensure_packages(['/usr/bin/manila'], {'ensure' => 'present'})
11 11
     }
12 12
 
13 13
     $ost_cl_keystone_admin_username = hiera('CONFIG_KEYSTONE_ADMIN_USERNAME')

Loading…
Cancel
Save