Merge "magnum: Deprecate tempest_config_file"

manifests/magnum.pp

@@ -6,9 +6,6 @@
 #
 # === Parameters
 #
-# [*tempest_config_file*]
-#   Defaults to '/var/lib/tempest/etc/tempest.conf'
-#
 # [*provision_image*]
 #   (Optional) If ::tempest::magnum should configure the testing image
 #   Defaults to true
@@ -71,8 +68,10 @@
 #   (Optional) The keypair_id parameter used in Magnum tempest configuration
 #   Defaults to undef
 #
+# [*tempest_config_file*]
+#   Defaults to undef
+#
 class tempest::magnum (
-  Stdlib::Absolutepath $tempest_config_file = '/var/lib/tempest/etc/tempest.conf',
   Boolean $provision_image       = true,
   String[1] $image_source        = 'https://fedorapeople.org/groups/magnum/fedora-atomic-latest.qcow2',
   String[1] $image_name          = 'fedora-atomic-latest',
@@ -89,14 +88,20 @@ class tempest::magnum (
   Boolean $manage_tests_packages = true,
   # DEPRECATED PARAMETERS
   $keypair_id                    = undef,
+  $tempest_config_file           = undef,
 ) {
   include tempest::params
+  include tempest
 
   if $keypair_id != undef {
     warning("The keypair_id parameter is deprecated and has no effect. \
 Use the keypair_name parameter.")
   }
 
+  if $tempest_config_file != undef {
+    warning('The tempest_config_file parameter has been deprecated and has no effect')
+  }
+
   if $provision_image {
     $image_properties = { 'os_distro' => $image_os_distro }
     glance_image { $image_name:
@@ -138,7 +143,7 @@ Use the keypair_name parameter.")
   }
 
   Tempest_config {
-    path    => $tempest_config_file,
+    path => $::tempest::tempest_conf,
   }
 
   tempest_config {

releasenotes/notes/deprecate-magnum-tempest_config_file-7d3344abfe895815.yaml

@@ -0,0 +1,5 @@
+---
+deprecations:
+  - |
+    The ``tempest::magnum::tempest_config_file`` parameter is deprecated and
+    has no effect now.

spec/classes/tempest_magnum_spec.rb

@@ -1,6 +1,14 @@
 require 'spec_helper'
 
 describe 'tempest::magnum' do
+  let :pre_condition do
+    "
+    class { 'tempest':
+      configure_networks => false,
+      configure_images   => false
+    }"
+  end
+
   let :params do
     { :nic_id => 'b2e6021a-4956-4a1f-8329-790b9add05a9', }
   end