1 In-house patch to add support for Solaris 11.3 and 12.0.  This patch

     2 has not yet been submitted upstream due to requirements for 3rd party

     3 CI testing.

     4 

     5 --- openstack-glance-6.1.0/manifests/params.pp.orig     2015-08-10 09:37:49.703015029 -0700

     6 +++ openstack-glance-6.1.0/manifests/params.pp   2015-08-10 09:38:51.370489635 -0700

     7 @@ -1,14 +1,11 @@

     8  # these parameters need to be accessed from several locations and

     9  # should be considered to be constant

    10  class glance::params {

    11 -

    12 -  $client_package_name = 'python-glanceclient'

    13 -

    14 -  $cache_cleaner_command = 'glance-cache-cleaner'

    15 -  $cache_pruner_command  = 'glance-cache-pruner'

    16 -

    17    case $::osfamily {

    18      'RedHat': {

    19 +      $client_package_name   = 'python-glanceclient'

    20 +      $cache_cleaner_command = 'glance-cache-cleaner'

    21 +      $cache_pruner_command  = 'glance-cache-pruner'

    22        $api_package_name      = 'openstack-glance'

    23        $registry_package_name = 'openstack-glance'

    24        $api_service_name      = 'openstack-glance-api'

    25 @@ -21,6 +18,9 @@ class glance::params {

    26        }

    27      }

    28      'Debian': {

    29 +      $client_package_name   = 'python-glanceclient'

    30 +      $cache_cleaner_command = 'glance-cache-cleaner'

    31 +      $cache_pruner_command  = 'glance-cache-pruner'

    32        $api_package_name      = 'glance-api'

    33        $registry_package_name = 'glance-registry'

    34        $api_service_name      = 'glance-api'

    35 @@ -28,8 +28,19 @@ class glance::params {

    36        $db_sync_command       = 'glance-manage --config-file=/etc/glance/glance-registry.conf db_sync'

    37        $pyceph_package_name   = 'python-ceph'

    38      }

    39 +    'Solaris': {

    40 +      $client_package_name   = 'library/python/glanceclient'

    41 +      $pyceph_package_name   = undef

    42 +      $cache_cleaner_command = '/usr/lib/glance/glance-cache-cleaner'

    43 +      $cache_pruner_command  = '/usr/lib/glance/glance-cache-pruner'

    44 +      $api_package_name      = 'cloud/openstack/glance'

    45 +      $registry_package_name = 'cloud/openstack/glance'

    46 +      $api_service_name      = 'application/openstack/glance/glance-api'

    47 +      $registry_service_name = 'application/openstack/glance/glance-registry'

    48 +      $db_sync_command       = undef

    49 +    }

    50      default: {

    51 -      fail("Unsupported osfamily: ${::osfamily} operatingsystem: ${::operatingsystem}, module ${module_name} only support osfamily RedHat and Debian")

    52 +      fail("Unsupported osfamily: ${::osfamily} operatingsystem: ${::operatingsystem}, module ${module_name} only support osfamily Solaris, RedHat, and Debian")

    53      }

    54    }

    55