Deprecate heat_service_type option

This patch[1] removed heat related support.

[1]https://review.openstack.org/#/c/385513/

Change-Id: Ic81a9c0033d7f6bddb23f131954b57e608b3bb45
Closes-Bug: #1743713

manifests/api.pp

@@ -266,7 +266,6 @@ the future release. Please use trove::api::package_ensure instead.")
     'DEFAULT/cinder_service_type':       value => $::trove::cinder_service_type;
     'DEFAULT/neutron_service_type':      value => $::trove::neutron_service_type;
     'DEFAULT/swift_service_type':        value => $::trove::swift_service_type;
-    'DEFAULT/heat_service_type':         value => $::trove::heat_service_type;
   }
 
   if $::trove::use_neutron {

manifests/init.pp

@@ -234,10 +234,6 @@
 #   (optional) Swift service type to use when searching catalog.
 #   Defaults to 'object-store'.
 #
-# [*heat_service_type*]
-#   (optional) Heat service type to use when searching catalog.
-#   Defaults to 'orchestration'.
-#
 # [*neutron_service_type*]
 #   (optional) Neutron service type to use when searching catalog.
 #   Defaults to 'network'.
@@ -292,6 +288,10 @@
 #     amqp (for AMQP 1.0)
 #   Defaults to 'rabbit'
 #
+# [*heat_service_type*]
+#   (optional) Heat service type to use when searching catalog.
+#   Defaults to undef.
+#
 class trove(
   $nova_proxy_admin_pass,
   $default_transport_url        = $::os_service_default,
@@ -343,7 +343,6 @@ class trove(
   $nova_compute_service_type    = 'compute',
   $cinder_service_type          = 'volumev2',
   $swift_service_type           = 'object-store',
-  $heat_service_type            = 'orchestration',
   $neutron_service_type         = 'network',
   $use_neutron                  = true,
   $default_neutron_networks     = $::os_service_default,
@@ -356,6 +355,7 @@ class trove(
   $rabbit_userid                = $::os_service_default,
   $rabbit_virtual_host          = $::os_service_default,
   $rpc_backend                  = 'rabbit',
+  $heat_service_type            = undef,
 ) {
 
   include ::trove::deps
@@ -375,6 +375,10 @@ trove::rpc_backend are deprecated. Please use trove::default_transport_url \
 instead.")
   }
 
+  if $heat_service_type {
+    warning('The heat_service_type parameter is deprecated, has no effect and will be removed in R release')
+  }
+
   if $nova_compute_url {
     trove_config { 'DEFAULT/nova_compute_url': value => $nova_compute_url }
   }

manifests/taskmanager.pp

@@ -64,10 +64,6 @@
 #   (optional) Authentication URL.
 #   Defaults to 'http://localhost:5000/v3'.
 #
-# [*heat_url*]
-#   (optional) URL without the tenant segment.
-#   Defaults to false
-#
 # [*guestagent_config_file*]
 #   (optional) Trove guest agent configuration file.
 #   Defaults to '/etc/trove/trove-guestagent.conf'.
@@ -104,7 +100,6 @@ class trove::taskmanager(
   $guest_log_file           = '/var/log/trove/trove-guestagent.log',
   $log_facility             = $::os_service_default,
   $auth_url                 = 'http://localhost:5000/v3',
-  $heat_url                 = false,
   $package_ensure           = 'present',
   $guestagent_config_file   = '/etc/trove/trove-guestagent.conf',
   $taskmanager_manager      = 'trove.taskmanager.manager.Manager',
@@ -178,7 +173,6 @@ the future release. Please use trove::default_neutron_networks instead.")
     'DEFAULT/cinder_service_type':       value => $::trove::cinder_service_type;
     'DEFAULT/neutron_service_type':      value => $::trove::neutron_service_type;
     'DEFAULT/swift_service_type':        value => $::trove::swift_service_type;
-    'DEFAULT/heat_service_type':         value => $::trove::heat_service_type;
   }
 
   if $::trove::single_tenant_mode {

releasenotes/notes/deprecate_heat_service_type-8a7a6a5b1c40bcdc.yaml

@@ -0,0 +1,4 @@
+---
+deprecations:
+  - trove::heat_service_type is deprecated and will be removed in a future
+    release.

spec/classes/trove_api_spec.rb

@@ -36,7 +36,6 @@ describe 'trove::api' do
          nova_compute_service_type => 'compute',
          cinder_service_type       => 'volume',
          swift_service_type        => 'object-store',
-         heat_service_type         => 'orchestration',
          neutron_service_type      => 'network'}
          class { '::trove::keystone::authtoken':
            password => 'a_big_secret',
@@ -72,7 +71,6 @@ describe 'trove::api' do
         is_expected.to contain_trove_config('DEFAULT/nova_compute_service_type').with_value('compute')
         is_expected.to contain_trove_config('DEFAULT/cinder_service_type').with_value('volume')
         is_expected.to contain_trove_config('DEFAULT/swift_service_type').with_value('object-store')
-        is_expected.to contain_trove_config('DEFAULT/heat_service_type').with_value('orchestration')
         is_expected.to contain_trove_config('DEFAULT/neutron_service_type').with_value('network')
         is_expected.to contain_trove_config('DEFAULT/http_get_rate').with_value('200')
         is_expected.to contain_trove_config('DEFAULT/http_post_rate').with_value('200')

spec/classes/trove_taskmanager_spec.rb

@@ -32,7 +32,6 @@ describe 'trove::taskmanager' do
          nova_compute_service_type => 'compute',
          cinder_service_type       => 'volume',
          swift_service_type        => 'object-store',
-         heat_service_type         => 'orchestration',
          neutron_service_type      => 'network'}"
       end
 
@@ -59,7 +58,6 @@ describe 'trove::taskmanager' do
         is_expected.to contain_trove_taskmanager_config('DEFAULT/nova_compute_service_type').with_value('compute')
         is_expected.to contain_trove_taskmanager_config('DEFAULT/cinder_service_type').with_value('volume')
         is_expected.to contain_trove_taskmanager_config('DEFAULT/swift_service_type').with_value('object-store')
-        is_expected.to contain_trove_taskmanager_config('DEFAULT/heat_service_type').with_value('orchestration')
         is_expected.to contain_trove_taskmanager_config('DEFAULT/neutron_service_type').with_value('network')
         is_expected.to contain_trove_taskmanager_config('DEFAULT/taskmanager_manager').with_value('trove.taskmanager.manager.Manager')
         is_expected.to contain_file('/etc/trove/trove-guestagent.conf')