1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
|
Description: Fix path for Debian
Author: Thomas Goirand <zigo@debian.org>
Forwarded: no
Last-Update: 2020-04-25
Index: puppet-module-tempest/lib/puppet/type/tempest_glance_id_setter.rb
===================================================================
--- puppet-module-tempest.orig/lib/puppet/type/tempest_glance_id_setter.rb
+++ puppet-module-tempest/lib/puppet/type/tempest_glance_id_setter.rb
@@ -1,7 +1,7 @@
Puppet::Type.newtype(:tempest_glance_id_setter) do
#
# tempest_glance_id_setter { 'image_id':
-# tempest_conf_path => '/var/lib/tempest/etc/tempest.conf',
+# tempest_conf_path => '/etc/tempest/tempest.conf',
# image_name => $name,
# }
#
Index: puppet-module-tempest/manifests/init.pp
===================================================================
--- puppet-module-tempest.orig/manifests/init.pp
+++ puppet-module-tempest/manifests/init.pp
@@ -15,7 +15,7 @@
# [*git_clone*]
# Defaults to true
# [*tempest_config_file*]
-# Defaults to '/var/lib/tempest/etc/tempest.conf'
+# Defaults to '/etc/tempest/tempest.conf'
# [*tempest_repo_uri*]
# Defaults to 'git://github.com/openstack/tempest.git'
# [*tempest_repo_revision*]
@@ -51,7 +51,7 @@
# [*cli_dir*]
# Defaults to undef
# [*lock_path*]
-# Defaults to '/var/lib/tempest'
+# Defaults to '/var/lock/tempest'
# [*log_file*]
# Defaults to $::os_service_default
# [*debug*]
@@ -232,7 +232,7 @@ class tempest(
$tempest_workspace = '/var/lib/tempest',
$install_from_source = true,
$git_clone = true,
- $tempest_config_file = '/var/lib/tempest/etc/tempest.conf',
+ $tempest_config_file = '/etc/tempest/tempest.conf',
# Clone config
#
@@ -267,7 +267,7 @@ class tempest(
$identity_uri = undef,
$identity_uri_v3 = undef,
$cli_dir = undef,
- $lock_path = '/var/lib/tempest',
+ $lock_path = '/var/lock/tempest',
$log_file = $::os_service_default,
$debug = false,
$use_stderr = true,
Index: puppet-module-tempest/manifests/magnum.pp
===================================================================
--- puppet-module-tempest.orig/manifests/magnum.pp
+++ puppet-module-tempest/manifests/magnum.pp
@@ -7,7 +7,7 @@
# === Parameters
#
# [*tempest_config_file*]
-# Defaults to '/var/lib/tempest/etc/tempest.conf'
+# Defaults to '/etc/tempest/tempest.conf'
#
# [*provision_image*]
# (Optional) If ::tempest::magnum should configure the testing image
@@ -62,7 +62,7 @@
# Defaults to '8.8.8.8'
#
class tempest::magnum (
- $tempest_config_file = '/var/lib/tempest/etc/tempest.conf',
+ $tempest_config_file = '/etc/tempest/tempest.conf',
$provision_image = true,
$image_source = 'https://fedorapeople.org/groups/magnum/fedora-atomic-latest.qcow2',
$image_name = 'fedora-atomic-latest',
Index: puppet-module-tempest/spec/classes/tempest_init_spec.rb
===================================================================
--- puppet-module-tempest.orig/spec/classes/tempest_init_spec.rb
+++ puppet-module-tempest/spec/classes/tempest_init_spec.rb
@@ -136,7 +136,7 @@ describe 'tempest' do
it 'creates ec2 credentials' do
is_expected.to contain_tempest_ec2_credentials('ec2_test_creds').with(
:ensure => 'present',
- :tempest_conf_path => '/var/lib/tempest/etc/tempest.conf',
+ :tempest_conf_path => '/etc/tempest/tempest.conf',
:user => 'ec2api-tester',
:project => 'openstack'
)
@@ -284,13 +284,13 @@ describe 'tempest' do
it 'set glance id' do
is_expected.to contain_tempest_glance_id_setter('image_ref').with(
:ensure => 'present',
- :tempest_conf_path => '/var/lib/tempest/etc/tempest.conf',
+ :tempest_conf_path => '/etc/tempest/tempest.conf',
:image_name => 'image name',
)
is_expected.to contain_tempest_glance_id_setter('image_ref_alt').with(
:ensure => 'present',
- :tempest_conf_path => '/var/lib/tempest/etc/tempest.conf',
+ :tempest_conf_path => '/etc/tempest/tempest.conf',
:image_name => 'image name alt',
)
end
@@ -298,7 +298,7 @@ describe 'tempest' do
it 'neutron net id' do
is_expected.to contain_tempest_neutron_net_id_setter('public_network_id').with(
:ensure => 'present',
- :tempest_conf_path => '/var/lib/tempest/etc/tempest.conf',
+ :tempest_conf_path => '/etc/tempest/tempest.conf',
:network_name => 'network name',
)
end
|
