uricp 0.0.20 → 0.0.21
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/Gemfile.lock +1 -1
- data/features/rbd_access.feature +7 -7
- data/lib/uricp/strategy/common.rb +1 -1
- data/lib/uricp/strategy/rbd_cached_put.rb +1 -1
- data/lib/uricp/strategy/rbd_snap.rb +1 -1
- data/lib/uricp/version.rb +1 -1
- metadata +1 -1
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA256:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: aeaa81822977930906959744feb0d8bdf9ca820afd10e6b97d32a726cbf67391
|
4
|
+
data.tar.gz: cd29b49f83ba53a275f4574c32cbb7f1b92c5218421cef668355a14ab5a36bec
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: 56c0e441da6e7e709580e09cdcc68c56b3ff731fc9fd028e56160dbfca427048ecab2f79c049f490bd15bcb027a67ec1b4aa01ddd2ce801cda89ad53f9ba6efa
|
7
|
+
data.tar.gz: 92122076440ca0cbd0345f29bf4386503c9f3830d6a4ffbfc92a4f55e40b9ea7790ff81cc1ebf1101ce7ac4cb552c312bf2be0cc5c3c49f0b727ab0247f46f90
|
data/Gemfile.lock
CHANGED
data/features/rbd_access.feature
CHANGED
@@ -32,7 +32,7 @@ Feature: Manipulate file images in ceph
|
|
32
32
|
"""
|
33
33
|
And the output should contain:
|
34
34
|
"""
|
35
|
-
rbd clone --
|
35
|
+
rbd clone --id libvirt 'servers/freedos.qcow2@base' 'servers/srv-testy'
|
36
36
|
"""
|
37
37
|
|
38
38
|
Scenario: HTTP URI from file cache via unpopulated rbd cache
|
@@ -53,7 +53,7 @@ Feature: Manipulate file images in ceph
|
|
53
53
|
"""
|
54
54
|
And the output should contain:
|
55
55
|
"""
|
56
|
-
rbd clone --
|
56
|
+
rbd clone --id libvirt 'servers/freedos.qcow2@base' 'servers/srv-testy'
|
57
57
|
"""
|
58
58
|
|
59
59
|
Scenario: HTTP URI to rbd via populated caches
|
@@ -65,7 +65,7 @@ Feature: Manipulate file images in ceph
|
|
65
65
|
"""
|
66
66
|
And the output should contain:
|
67
67
|
"""
|
68
|
-
rbd clone --
|
68
|
+
rbd clone --id libvirt 'servers/freedos.qcow2@base' 'servers/srv-testy'
|
69
69
|
"""
|
70
70
|
|
71
71
|
Scenario: rbd to rbd - no cache
|
@@ -89,7 +89,7 @@ Feature: Manipulate file images in ceph
|
|
89
89
|
"""
|
90
90
|
And the output should contain:
|
91
91
|
"""
|
92
|
-
rbd clone --
|
92
|
+
rbd clone --id libvirt 'servers/img-testy@uricp_snap' 'servers/srv-testy'
|
93
93
|
"""
|
94
94
|
|
95
95
|
Scenario: rbd to rbd - unpopulated cache
|
@@ -117,7 +117,7 @@ Feature: Manipulate file images in ceph
|
|
117
117
|
"""
|
118
118
|
And the output should contain:
|
119
119
|
"""
|
120
|
-
rbd clone --
|
120
|
+
rbd clone --id libvirt 'servers/srv-testy@uricp_snap' 'servers/img-testy'
|
121
121
|
"""
|
122
122
|
And the output should not contain:
|
123
123
|
"""
|
@@ -145,7 +145,7 @@ Feature: Manipulate file images in ceph
|
|
145
145
|
"""
|
146
146
|
And the output should contain:
|
147
147
|
"""
|
148
|
-
rbd clone --
|
148
|
+
rbd clone --id libvirt 'servers/img-testy@base' 'servers/srv-testy'
|
149
149
|
"""
|
150
150
|
|
151
151
|
Scenario: RBD export.
|
@@ -206,7 +206,7 @@ Feature: Manipulate file images in ceph
|
|
206
206
|
"""
|
207
207
|
And the output should contain:
|
208
208
|
"""
|
209
|
-
rbd clone --
|
209
|
+
rbd clone --id libvirt 'servers/srv-testy@uricp_snap' 'servers/img-testy'
|
210
210
|
"""
|
211
211
|
And the output should contain:
|
212
212
|
"""
|
@@ -161,7 +161,7 @@ module Uricp::Strategy
|
|
161
161
|
if dry_run?
|
162
162
|
result = options['dry-cache'] && options['cache_name'] !~ /srv-...../
|
163
163
|
else
|
164
|
-
sh "rbd snap ls --id #{rbd_id} --format json #{target}" do |stdout|
|
164
|
+
sh "rbd snap ls --id #{rbd_id} --format json #{target} 2>/dev/null" do |stdout|
|
165
165
|
result = JSON.parse(stdout).any? { |x| x['name'] == rbd_base_name }
|
166
166
|
end
|
167
167
|
end
|
@@ -47,7 +47,7 @@ module Uricp::Strategy
|
|
47
47
|
return false if dry_run?
|
48
48
|
|
49
49
|
result = false
|
50
|
-
sh "rbd snap ls --id #{rbd_id} --format json #{rbd_image_spec(from)}" do |stdout|
|
50
|
+
sh "rbd snap ls --id #{rbd_id} --format json #{rbd_image_spec(from)} 2>/dev/null" do |stdout|
|
51
51
|
result = JSON.parse(stdout).any? { |x| x['name'] == rbd_snapshot_name }
|
52
52
|
end
|
53
53
|
result
|
data/lib/uricp/version.rb
CHANGED