1
=== modified file 'bin/nova-import-canonical-imagestore'
2
--- bin/nova-import-canonical-imagestore	2010-08-08 02:51:17 +0000
3
+++ bin/nova-import-canonical-imagestore	2010-08-18 21:36:47 +0000
4
@@ -56,21 +56,21 @@
5
56
    for f in img['files']:
56
    for f in img['files']:
6
57
        if f['kind'] == 'kernel':
57
        if f['kind'] == 'kernel':
7
58
            dest = os.path.join(tempdir, 'kernel')
58
            dest = os.path.join(tempdir, 'kernel')
9
59
            subprocess.call(['curl', f['url'], '-o', dest])
59
            subprocess.call(['curl', '--fail', f['url'], '-o', dest])
10
60
            kernel_id = image.Image.add(dest,
60
            kernel_id = image.Image.add(dest,
11
61
                description='kernel/' + img['title'], kernel=True)
61
                description='kernel/' + img['title'], kernel=True)
12
62
62
13
63
    for f in img['files']:
63
    for f in img['files']:
14
64
        if f['kind'] == 'ramdisk':
64
        if f['kind'] == 'ramdisk':
15
65
            dest = os.path.join(tempdir, 'ramdisk')
65
            dest = os.path.join(tempdir, 'ramdisk')
17
66
            subprocess.call(['curl', f['url'], '-o', dest])
66
            subprocess.call(['curl', '--fail', f['url'], '-o', dest])
18
67
            ramdisk_id = image.Image.add(dest,
67
            ramdisk_id = image.Image.add(dest,
19
68
                description='ramdisk/' + img['title'], ramdisk=True)
68
                description='ramdisk/' + img['title'], ramdisk=True)
20
69
69
21
70
    for f in img['files']:
70
    for f in img['files']:
22
71
        if f['kind'] == 'image':
71
        if f['kind'] == 'image':
23
72
            dest = os.path.join(tempdir, 'image')
72
            dest = os.path.join(tempdir, 'image')
25
73
            subprocess.call(['curl', f['url'], '-o', dest])
73
            subprocess.call(['curl', '--fail', f['url'], '-o', dest])
26
74
            ramdisk_id = image.Image.add(dest,
74
            ramdisk_id = image.Image.add(dest,
27
75
                description=img['title'], kernel=kernel_id, ramdisk=ramdisk_id)
75
                description=img['title'], kernel=kernel_id, ramdisk=ramdisk_id)
28
76
76
29
77
77
30
=== modified file 'bin/nova-manage'
31
--- bin/nova-manage	2010-08-13 21:09:30 +0000
32
+++ bin/nova-manage	2010-08-18 21:36:47 +0000
33
@@ -56,7 +56,8 @@
34
56
            vpn = self._vpn_for(project.id)
56
            vpn = self._vpn_for(project.id)
35
57
            if vpn:
57
            if vpn:
36
58
                command = "ping -c1 -w1 %s > /dev/null; echo $?"
58
                command = "ping -c1 -w1 %s > /dev/null; echo $?"
38
59
                out, _err = utils.execute(command % vpn['private_dns_name'])
59
                out, _err = utils.execute(  command % vpn['private_dns_name'],
39
60
                                            check_exit_code=False)
40
60
                if out.strip() == '0':
61
                if out.strip() == '0':
41
61
                    net = 'up'
62
                    net = 'up'
42
62
                else:
63
                else:
43
63
64
44
=== modified file 'nova/cloudpipe/bootscript.sh'
45
--- nova/cloudpipe/bootscript.sh	2010-07-20 22:05:02 +0000
46
+++ nova/cloudpipe/bootscript.sh	2010-08-18 21:36:47 +0000
47
@@ -44,8 +44,8 @@
48
44
44
49
45
# SIGN the csr and save as server.crt
45
# SIGN the csr and save as server.crt
50
46
# CURL fetch to the supervisor, POSTing the CSR text, saving the result as the CRT file
46
# CURL fetch to the supervisor, POSTing the CSR text, saving the result as the CRT file
53
47
curl $SUPERVISOR -d "cert=$CSRTEXT" > /etc/openvpn/server.crt
47
curl --fail $SUPERVISOR -d "cert=$CSRTEXT" > /etc/openvpn/server.crt
54
48
curl $SUPERVISOR/getca/ > /etc/openvpn/ca.crt
48
curl --fail $SUPERVISOR/getca/ > /etc/openvpn/ca.crt
55
49
49
56
50
# Customize the server.conf.template
50
# Customize the server.conf.template
57
51
cd /etc/openvpn
51
cd /etc/openvpn
58
52
52
59
=== modified file 'nova/objectstore/image.py'
60
--- nova/objectstore/image.py	2010-08-16 12:16:21 +0000
61
+++ nova/objectstore/image.py	2010-08-18 21:36:47 +0000
62
@@ -232,13 +232,22 @@
63
232
232
64
233
    @staticmethod
233
    @staticmethod
65
234
    def decrypt_image(encrypted_filename, encrypted_key, encrypted_iv, cloud_private_key, decrypted_filename):
234
    def decrypt_image(encrypted_filename, encrypted_key, encrypted_iv, cloud_private_key, decrypted_filename):
67
235
        key, err = utils.execute('openssl rsautl -decrypt -inkey %s' % cloud_private_key, encrypted_key)
235
        key, err = utils.execute(
68
236
                'openssl rsautl -decrypt -inkey %s' % cloud_private_key, 
69
237
                process_input=encrypted_key,
70
238
                check_exit_code=False)
71
236
        if err:
239
        if err:
72
237
            raise exception.Error("Failed to decrypt private key: %s" % err)
240
            raise exception.Error("Failed to decrypt private key: %s" % err)
74
238
        iv, err = utils.execute('openssl rsautl -decrypt -inkey %s' % cloud_private_key, encrypted_iv)
241
        iv, err = utils.execute(
75
242
                'openssl rsautl -decrypt -inkey %s' % cloud_private_key, 
76
243
                process_input=encrypted_iv,
77
244
                check_exit_code=False)
78
239
        if err:
245
        if err:
79
240
            raise exception.Error("Failed to decrypt initialization vector: %s" % err)
246
            raise exception.Error("Failed to decrypt initialization vector: %s" % err)
81
241
        out, err = utils.execute('openssl enc -d -aes-128-cbc -in %s -K %s -iv %s -out %s' % (encrypted_filename, key, iv, decrypted_filename))
247
        _out, err = utils.execute(
82
248
                'openssl enc -d -aes-128-cbc -in %s -K %s -iv %s -out %s'
83
249
                 % (encrypted_filename, key, iv, decrypted_filename),
84
250
                 check_exit_code=False)
85
242
        if err:
251
        if err:
86
243
            raise exception.Error("Failed to decrypt image file %s : %s" % (encrypted_filename, err))
252
            raise exception.Error("Failed to decrypt image file %s : %s" % (encrypted_filename, err))
87
244
253
88
245
254
89
=== modified file 'nova/process.py'
90
--- nova/process.py	2010-08-16 12:16:21 +0000
91
+++ nova/process.py	2010-08-18 21:36:47 +0000
92
@@ -2,6 +2,7 @@
93
2
2
94
3
# Copyright 2010 United States Government as represented by the
3
# Copyright 2010 United States Government as represented by the
95
4
# Administrator of the National Aeronautics and Space Administration.
4
# Administrator of the National Aeronautics and Space Administration.
96
5
# Copyright 2010 FathomDB Inc.
97
5
# All Rights Reserved.
6
# All Rights Reserved.
98
6
#
7
#
99
7
#    Licensed under the Apache License, Version 2.0 (the "License"); you may
8
#    Licensed under the Apache License, Version 2.0 (the "License"); you may
100
@@ -20,17 +21,12 @@
101
20
Process pool, still buggy right now.
21
Process pool, still buggy right now.
102
21
"""
22
"""
103
22
23
104
23
import logging
105
24
import multiprocessing
106
25
import StringIO
24
import StringIO
107
26
25
108
27
from twisted.internet import defer
26
from twisted.internet import defer
109
28
from twisted.internet import error
27
from twisted.internet import error
110
29
from twisted.internet import process
111
30
from twisted.internet import protocol
28
from twisted.internet import protocol
112
31
from twisted.internet import reactor
29
from twisted.internet import reactor
113
32
from twisted.internet import threads
114
33
from twisted.python import failure
115
34
30
116
35
from nova import flags
31
from nova import flags
117
36
32
118
@@ -55,111 +51,100 @@
119
55
        IOError.__init__(self, "got stdout: %r\nstderr: %r" % (stdout, stderr))
51
        IOError.__init__(self, "got stdout: %r\nstderr: %r" % (stdout, stderr))
120
56
52
121
57
53
124
58
# NOTE(termie): this too
54
# This is based on _BackRelay from twister.internal.utils, but modified to 
125
59
class _BackRelay(protocol.ProcessProtocol):
55
#  capture both stdout and stderr, without odd stderr handling, and also to 
126
56
#  handle stdin
127
57
class BackRelayWithInput(protocol.ProcessProtocol):
128
60
    """
58
    """
129
61
    Trivial protocol for communicating with a process and turning its output
59
    Trivial protocol for communicating with a process and turning its output
130
62
    into the result of a L{Deferred}.
60
    into the result of a L{Deferred}.
131
63
61
132
64
    @ivar deferred: A L{Deferred} which will be called back with all of stdout
62
    @ivar deferred: A L{Deferred} which will be called back with all of stdout
137
65
        and, if C{errortoo} is true, all of stderr as well (mixed together in
63
        and all of stderr as well (as a tuple).  C{terminate_on_stderr} is true
138
66
        one string).  If C{errortoo} is false and any bytes are received over
64
        and any bytes are received over stderr, this will fire with an
139
67
        stderr, this will fire with an L{_UnexpectedErrorOutput} instance and
65
        L{_UnexpectedErrorOutput} instance and the attribute will be set to 
140
68
        the attribute will be set to C{None}.
66
        C{None}.
141
69
67
148
70
    @ivar onProcessEnded: If C{errortoo} is false and bytes are received over
68
    @ivar onProcessEnded: If C{terminate_on_stderr} is false and bytes are 
149
71
        stderr, this attribute will refer to a L{Deferred} which will be called
69
        received over stderr, this attribute will refer to a L{Deferred} which 
150
72
        back when the process ends.  This C{Deferred} is also associated with
70
        will be called back when the process ends.  This C{Deferred} is also 
151
73
        the L{_UnexpectedErrorOutput} which C{deferred} fires with earlier in
71
        associated with the L{_UnexpectedErrorOutput} which C{deferred} fires 
152
74
        this case so that users can determine when the process has actually
72
        with earlier in this case so that users can determine when the process 
153
75
        ended, in addition to knowing when bytes have been received via stderr.
73
        has actually ended, in addition to knowing when bytes have been received
154
74
        via stderr.
155
76
    """
75
    """
156
77
76
158
78
    def __init__(self, deferred, errortoo=0):
77
    def __init__(self, deferred, started_deferred=None, 
159
78
                    terminate_on_stderr=False, check_exit_code=True, 
160
79
                    process_input=None):
161
79
        self.deferred = deferred
80
        self.deferred = deferred
173
80
        self.s = StringIO.StringIO()
81
        self.stdout = StringIO.StringIO()
174
81
        if errortoo:
82
        self.stderr = StringIO.StringIO()
175
82
            self.errReceived = self.errReceivedIsGood
83
        self.started_deferred = started_deferred
176
83
        else:
84
        self.terminate_on_stderr = terminate_on_stderr
177
84
            self.errReceived = self.errReceivedIsBad
85
        self.check_exit_code = check_exit_code
178
85
86
        self.process_input = process_input
179
86
    def errReceivedIsBad(self, text):
87
        self.on_process_ended = None
180
87
        if self.deferred is not None:
88
    
181
88
            self.onProcessEnded = defer.Deferred()
89
    def errReceived(self, text):
182
89
            err = UnexpectedErrorOutput(text, self.onProcessEnded)
90
        self.stderr.write(text)
183
90
            self.deferred.errback(failure.Failure(err))
91
        if self.terminate_on_stderr and (self.deferred is not None):
184
92
            self.on_process_ended = defer.Deferred()
185
93
            self.deferred.errback(UnexpectedErrorOutput(
186
94
                                        stdout=self.stdout.getvalue(),
187
95
                                        stderr=self.stderr.getvalue()))
188
91
            self.deferred = None
96
            self.deferred = None
189
92
            self.transport.loseConnection()
97
            self.transport.loseConnection()
190
93
98
191
94
    def errReceivedIsGood(self, text):
192
95
        self.s.write(text)
193
96
194
97
    def outReceived(self, text):
99
    def outReceived(self, text):
231
98
        self.s.write(text)
100
        self.stdout.write(text)
232
99
101
233
100
    def processEnded(self, reason):
102
    def processEnded(self, reason):
234
101
        if self.deferred is not None:
103
        if self.deferred is not None:
235
102
            self.deferred.callback(self.s.getvalue())
104
            stdout, stderr = self.stdout.getvalue(), self.stderr.getvalue()
200
103
        elif self.onProcessEnded is not None:
201
104
            self.onProcessEnded.errback(reason)
202
105
203
106
204
107
class BackRelayWithInput(_BackRelay):
205
108
    def __init__(self, deferred, startedDeferred=None, error_ok=0,
206
109
                 input=None):
207
110
        # Twisted doesn't use new-style classes in most places :(
208
111
        _BackRelay.__init__(self, deferred, errortoo=error_ok)
209
112
        self.error_ok = error_ok
210
113
        self.input = input
211
114
        self.stderr = StringIO.StringIO()
212
115
        self.startedDeferred = startedDeferred
213
116
214
117
    def errReceivedIsBad(self, text):
215
118
        self.stderr.write(text)
216
119
        self.transport.loseConnection()
217
120
218
121
    def errReceivedIsGood(self, text):
219
122
        self.stderr.write(text)
220
123
221
124
    def connectionMade(self):
222
125
        if self.startedDeferred:
223
126
            self.startedDeferred.callback(self)
224
127
        if self.input:
225
128
            self.transport.write(self.input)
226
129
        self.transport.closeStdin()
227
130
228
131
    def processEnded(self, reason):
229
132
        if self.deferred is not None:
230
133
            stdout, stderr = self.s.getvalue(), self.stderr.getvalue()
236
134
            try:
105
            try:
243
135
                # NOTE(termie): current behavior means if error_ok is True
106
                if self.check_exit_code:
238
136
                #               we won't throw an error even if the process
239
137
                #               exited with a non-0 status, so you can't be
240
138
                #               okay with stderr output and not with bad exit
241
139
                #               codes.
242
140
                if not self.error_ok:
244
141
                    reason.trap(error.ProcessDone)
107
                    reason.trap(error.ProcessDone)
245
142
                self.deferred.callback((stdout, stderr))
108
                self.deferred.callback((stdout, stderr))
246
143
            except:
109
            except:
247
110
                # NOTE(justinsb): This logic is a little suspicious to me...
248
111
                # If the callback throws an exception, then errback will be 
249
112
                # called also. However, this is what the unit tests test for...
250
144
                self.deferred.errback(UnexpectedErrorOutput(stdout, stderr))
113
                self.deferred.errback(UnexpectedErrorOutput(stdout, stderr))
257
145
114
        elif self.on_process_ended is not None:
258
146
115
            self.on_process_ended.errback(reason)
259
147
def getProcessOutput(executable, args=None, env=None, path=None, reactor=None,
116
260
148
                     error_ok=0, input=None, startedDeferred=None):
117
261
149
    if reactor is None:
118
    def connectionMade(self):
262
150
        from twisted.internet import reactor
119
        if self.started_deferred:
263
120
            self.started_deferred.callback(self)
264
121
        if self.process_input:
265
122
            self.transport.write(self.process_input)
266
123
        self.transport.closeStdin()
267
124
268
125
def get_process_output(executable, args=None, env=None, path=None, 
269
126
                       process_reactor=None, check_exit_code=True, 
270
127
                       process_input=None, started_deferred=None,
271
128
                       terminate_on_stderr=False):
272
129
    if process_reactor is None:
273
130
        process_reactor = reactor
274
151
    args = args and args or ()
131
    args = args and args or ()
275
152
    env = env and env and {}
132
    env = env and env and {}
279
153
    d = defer.Deferred()
133
    deferred = defer.Deferred()
280
154
    p = BackRelayWithInput(
134
    process_handler = BackRelayWithInput(
281
155
            d, startedDeferred=startedDeferred, error_ok=error_ok, input=input)
135
            deferred, 
282
136
            started_deferred=started_deferred, 
283
137
            check_exit_code=check_exit_code, 
284
138
            process_input=process_input,
285
139
            terminate_on_stderr=terminate_on_stderr)
286
156
    # NOTE(vish): commands come in as unicode, but self.executes needs
140
    # NOTE(vish): commands come in as unicode, but self.executes needs
287
157
    #             strings or process.spawn raises a deprecation warning
141
    #             strings or process.spawn raises a deprecation warning
288
158
    executable = str(executable)
142
    executable = str(executable)
289
159
    if not args is None:
143
    if not args is None:
290
160
        args = [str(x) for x in args]
144
        args = [str(x) for x in args]
293
161
    reactor.spawnProcess(p, executable, (executable,)+tuple(args), env, path)
145
    process_reactor.spawnProcess(   process_handler, executable, 
294
162
    return d
146
                                    (executable,)+tuple(args), env, path)
295
147
    return deferred
296
163
148
297
164
149
298
165
class ProcessPool(object):
150
class ProcessPool(object):
299
@@ -185,26 +170,26 @@
300
185
        return self.execute(executable, args, **kw)
170
        return self.execute(executable, args, **kw)
301
186
171
302
187
    def execute(self, *args, **kw):
172
    def execute(self, *args, **kw):
304
188
        d = self._pool.acquire()
173
        deferred = self._pool.acquire()
305
189
174
308
190
        def _associateProcess(proto):
175
        def _associate_process(proto):
309
191
            d.process = proto.transport
176
            deferred.process = proto.transport
310
192
            return proto.transport
177
            return proto.transport
311
193
178
312
194
        started = defer.Deferred()
179
        started = defer.Deferred()
324
195
        started.addCallback(_associateProcess)
180
        started.addCallback(_associate_process)
325
196
        kw.setdefault('startedDeferred', started)
181
        kw.setdefault('started_deferred', started)
326
197
182
327
198
        d.process = None
183
        deferred.process = None
328
199
        d.started = started
184
        deferred.started = started
329
200
185
330
201
        d.addCallback(lambda _: getProcessOutput(*args, **kw))
186
        deferred.addCallback(lambda _: get_process_output(*args, **kw))
331
202
        d.addBoth(self._release)
187
        deferred.addBoth(self._release)
332
203
        return d
188
        return deferred
333
204
189
334
205
    def _release(self, rv=None):
190
    def _release(self, retval=None):
335
206
        self._pool.release()
191
        self._pool.release()
337
207
        return rv
192
        return retval
338
208
193
339
209
194
340
210
class SharedPool(object):
195
class SharedPool(object):
341
211
196
342
=== modified file 'nova/tests/network_unittest.py'
343
--- nova/tests/network_unittest.py	2010-08-18 15:44:24 +0000
344
+++ nova/tests/network_unittest.py	2010-08-18 21:36:47 +0000
345
@@ -166,7 +166,6 @@
346
166
            release_ip(mac3, address3, hostname, net.bridge_name)
166
            release_ip(mac3, address3, hostname, net.bridge_name)
347
167
        net = model.get_project_network(self.projects[0].id, "default")
167
        net = model.get_project_network(self.projects[0].id, "default")
348
168
        self.service.deallocate_fixed_ip(firstaddress)
168
        self.service.deallocate_fixed_ip(firstaddress)
349
169
        release_ip(mac, firstaddress, hostname, net.bridge_name)
350
170
169
351
171
    def test_vpn_ip_and_port_looks_valid(self):
170
    def test_vpn_ip_and_port_looks_valid(self):
352
172
        """Ensure the vpn ip and port are reasonable"""
171
        """Ensure the vpn ip and port are reasonable"""
353
173
172
354
=== modified file 'nova/tests/process_unittest.py'
355
--- nova/tests/process_unittest.py	2010-07-29 08:08:31 +0000
356
+++ nova/tests/process_unittest.py	2010-08-18 21:36:47 +0000
357
@@ -48,7 +48,7 @@
358
48
48
359
49
    def test_execute_stderr(self):
49
    def test_execute_stderr(self):
360
50
        pool = process.ProcessPool(2)
50
        pool = process.ProcessPool(2)
362
51
        d = pool.simple_execute('cat BAD_FILE', error_ok=1)
51
        d = pool.simple_execute('cat BAD_FILE', check_exit_code=False)
363
52
        def _check(rv):
52
        def _check(rv):
364
53
            self.assertEqual(rv[0], '')
53
            self.assertEqual(rv[0], '')
365
54
            self.assert_('No such file' in rv[1])
54
            self.assert_('No such file' in rv[1])
366
55
55
367
=== modified file 'nova/utils.py'
368
--- nova/utils.py	2010-08-16 12:16:21 +0000
369
+++ nova/utils.py	2010-08-18 21:36:47 +0000
370
@@ -56,23 +56,25 @@
371
56
#    c.perform()
56
#    c.perform()
372
57
#    c.close()
57
#    c.close()
373
58
#    fp.close()
58
#    fp.close()
378
59
    execute("curl %s -o %s" % (url, target))
59
    execute("curl --fail %s -o %s" % (url, target))
379
60
60
380
61
61
def execute(cmd, process_input=None, addl_env=None, check_exit_code=True):
377
62
def execute(cmd, input=None, addl_env=None):
381
63
    env = os.environ.copy()
62
    env = os.environ.copy()
382
64
    if addl_env:
63
    if addl_env:
383
65
        env.update(addl_env)
64
        env.update(addl_env)
384
66
    obj = subprocess.Popen(cmd, shell=True, stdin=subprocess.PIPE,
65
    obj = subprocess.Popen(cmd, shell=True, stdin=subprocess.PIPE,
385
67
        stdout=subprocess.PIPE, stderr=subprocess.PIPE, env=env)
66
        stdout=subprocess.PIPE, stderr=subprocess.PIPE, env=env)
386
68
    result = None
67
    result = None
389
69
    if input != None:
68
    if process_input != None:
390
70
        result = obj.communicate(input)
69
        result = obj.communicate(process_input)
391
71
    else:
70
    else:
392
72
        result = obj.communicate()
71
        result = obj.communicate()
393
73
    obj.stdin.close()
72
    obj.stdin.close()
394
74
    if obj.returncode:
73
    if obj.returncode:
395
75
        logging.debug("Result was %s" % (obj.returncode))
74
        logging.debug("Result was %s" % (obj.returncode))
396
75
        if check_exit_code and obj.returncode <> 0:
397
76
            raise Exception(    "Unexpected exit code: %s.  result=%s" 
398
77
                                % (obj.returncode, result))
399
76
    return result
78
    return result
400
77
79
401
78
80
402
@@ -98,9 +100,13 @@
403
98
    return arg
100
    return arg
404
99
101
405
100
102
407
101
def runthis(prompt, cmd):
103
def runthis(prompt, cmd, check_exit_code = True):
408
102
    logging.debug("Running %s" % (cmd))
104
    logging.debug("Running %s" % (cmd))
410
103
    logging.debug(prompt % (subprocess.call(cmd.split(" "))))
105
    exit_code = subprocess.call(cmd.split(" "))
411
106
    logging.debug(prompt % (exit_code))
412
107
    if check_exit_code and exit_code <> 0:
413
108
        raise Exception(    "Unexpected exit code: %s from cmd: %s" 
414
109
                            % (exit_code, cmd))
415
104
110
416
105
111
417
106
def generate_uid(topic, size=8):
112
def generate_uid(topic, size=8):
418
107
113
419
=== modified file 'nova/virt/images.py'
420
--- nova/virt/images.py	2010-08-17 11:53:30 +0000
421
+++ nova/virt/images.py	2010-08-18 21:36:47 +0000
422
@@ -60,7 +60,7 @@
423
60
                                                                     url_path)
60
                                                                     url_path)
424
61
    headers['Authorization'] = 'AWS %s:%s' % (access, signature)
61
    headers['Authorization'] = 'AWS %s:%s' % (access, signature)
425
62
62
427
63
    cmd = ['/usr/bin/curl', '--silent', url]
63
    cmd = ['/usr/bin/curl', '--fail', '--silent', url]
428
64
    for (k,v) in headers.iteritems():
64
    for (k,v) in headers.iteritems():
429
65
        cmd += ['-H', '%s: %s' % (k,v)]
65
        cmd += ['-H', '%s: %s' % (k,v)]
430
66
66
431
67
67
432
=== modified file 'nova/virt/libvirt_conn.py'
433
--- nova/virt/libvirt_conn.py	2010-08-17 11:53:30 +0000
434
+++ nova/virt/libvirt_conn.py	2010-08-18 21:36:47 +0000
435
@@ -227,10 +227,10 @@
436
227
        if not os.path.exists(basepath('ramdisk')):
227
        if not os.path.exists(basepath('ramdisk')):
437
228
           yield images.fetch(data['ramdisk_id'], basepath('ramdisk'), user, project)
228
           yield images.fetch(data['ramdisk_id'], basepath('ramdisk'), user, project)
438
229
229
440
230
        execute = lambda cmd, input=None: \
230
        execute = lambda cmd, process_input=None: \
441
231
                  process.simple_execute(cmd=cmd,
231
                  process.simple_execute(cmd=cmd,
444
232
                                         input=input,
232
                                         process_input=process_input,
445
233
                                         error_ok=1)
233
                                         check_exit_code=True)
446
234
234
447
235
        key = data['key_data']
235
        key = data['key_data']
448
236
        net = None
236
        net = None
449
237
237
450
=== modified file 'nova/volume/service.py'
451
--- nova/volume/service.py	2010-08-16 12:16:21 +0000
452
+++ nova/volume/service.py	2010-08-18 21:36:47 +0000
453
@@ -131,8 +131,10 @@
454
131
        if FLAGS.fake_storage:
131
        if FLAGS.fake_storage:
455
132
            return
132
            return
456
133
        # NOTE(vish): these commands sometimes sends output to stderr for warnings
133
        # NOTE(vish): these commands sometimes sends output to stderr for warnings
459
134
        yield process.simple_execute("sudo vblade-persist auto all", error_ok=1)
134
        yield process.simple_execute(   "sudo vblade-persist auto all", 
460
135
        yield process.simple_execute("sudo vblade-persist start all", error_ok=1)
135
                                        terminate_on_stderr=False)
461
136
        yield process.simple_execute(   "sudo vblade-persist start all",
462
137
                                        terminate_on_stderr=False)
463
136
138
464
137
    @defer.inlineCallbacks
139
    @defer.inlineCallbacks
465
138
    def _init_volume_group(self):
140
    def _init_volume_group(self):
466
@@ -247,13 +249,14 @@
467
247
                "sudo lvcreate -L %s -n %s %s" % (sizestr,
249
                "sudo lvcreate -L %s -n %s %s" % (sizestr,
468
248
                                                  self['volume_id'],
250
                                                  self['volume_id'],
469
249
                                                  FLAGS.volume_group),
251
                                                  FLAGS.volume_group),
471
250
                error_ok=1)
252
                terminate_on_stderr=False)
472
251
253
473
252
    @defer.inlineCallbacks
254
    @defer.inlineCallbacks
474
253
    def _delete_lv(self):
255
    def _delete_lv(self):
475
254
        yield process.simple_execute(
256
        yield process.simple_execute(
476
255
                "sudo lvremove -f %s/%s" % (FLAGS.volume_group,
257
                "sudo lvremove -f %s/%s" % (FLAGS.volume_group,
478
256
                                            self['volume_id']), error_ok=1)
258
                                            self['volume_id']), 
479
259
                terminate_on_stderr=False)
480
257
260
481
258
    @property
261
    @property
482
259
    def __devices_key(self):
262
    def __devices_key(self):
483
@@ -281,7 +284,8 @@
484
281
                 self['blade_id'],
284
                 self['blade_id'],
485
282
                 FLAGS.aoe_eth_dev,
285
                 FLAGS.aoe_eth_dev,
486
283
                 FLAGS.volume_group,
286
                 FLAGS.volume_group,
488
284
                 self['volume_id']), error_ok=1)
287
                 self['volume_id']), 
489
288
                 terminate_on_stderr=False)
490
285
289
491
286
    @defer.inlineCallbacks
290
    @defer.inlineCallbacks
492
287
    def _remove_export(self):
291
    def _remove_export(self):
493
@@ -294,10 +298,12 @@
494
294
    def _exec_remove_export(self):
298
    def _exec_remove_export(self):
495
295
        yield process.simple_execute(
299
        yield process.simple_execute(
496
296
                "sudo vblade-persist stop %s %s" % (self['shelf_id'],
300
                "sudo vblade-persist stop %s %s" % (self['shelf_id'],
498
297
                                                    self['blade_id']), error_ok=1)
301
                                                    self['blade_id']), 
499
302
                terminate_on_stderr=False)
500
298
        yield process.simple_execute(
303
        yield process.simple_execute(
501
299
                "sudo vblade-persist destroy %s %s" % (self['shelf_id'],
304
                "sudo vblade-persist destroy %s %s" % (self['shelf_id'],
503
300
                                                       self['blade_id']), error_ok=1)
305
                                                       self['blade_id']), 
504
306
                terminate_on_stderr=False)
505
301
307
506
302
308
507
303
class FakeVolume(Volume):
309
class FakeVolume(Volume):
508
304
310
509
=== modified file 'tools/install_venv.py'
510
--- tools/install_venv.py	2010-08-17 15:03:15 +0000
511
+++ tools/install_venv.py	2010-08-18 21:36:47 +0000
512
@@ -37,7 +37,7 @@
513
37
  sys.exit(1)
37
  sys.exit(1)
514
38
38
515
39
39
517
40
def run_command(cmd, redirect_output=True, error_ok=False):
40
def run_command(cmd, redirect_output=True, check_exit_code=True):
518
41
  """
41
  """
519
42
  Runs a command in an out-of-process shell, returning the
42
  Runs a command in an out-of-process shell, returning the
520
43
  output of that command.  Working directory is ROOT.
43
  output of that command.  Working directory is ROOT.
521
@@ -49,19 +49,18 @@
522
49
49
523
50
  proc = subprocess.Popen(cmd, cwd=ROOT, stdout=stdout)
50
  proc = subprocess.Popen(cmd, cwd=ROOT, stdout=stdout)
524
51
  output = proc.communicate()[0]
51
  output = proc.communicate()[0]
526
52
  if not error_ok and proc.returncode != 0:
52
  if check_exit_code and proc.returncode != 0:
527
53
    die('Command "%s" failed.\n%s', ' '.join(cmd), output)
53
    die('Command "%s" failed.\n%s', ' '.join(cmd), output)
528
54
  return output
54
  return output
529
55
55
530
56
56
533
57
HAS_EASY_INSTALL = bool(run_command(['which', 'easy_install']).strip())
57
HAS_EASY_INSTALL = bool(run_command(['which', 'easy_install'], check_exit_code=False).strip())
534
58
HAS_VIRTUALENV = bool(run_command(['which', 'virtualenv']).strip())
58
HAS_VIRTUALENV = bool(run_command(['which', 'virtualenv'], check_exit_code=False).strip())
535
59
59
536
60
60
537
61
def check_dependencies():
61
def check_dependencies():
538
62
  """Make sure virtualenv is in the path."""
62
  """Make sure virtualenv is in the path."""
539
63
63
540
64
  print 'Checking for virtualenv...',
541
65
  if not HAS_VIRTUALENV:
64
  if not HAS_VIRTUALENV:
542
66
    print 'not found.'
65
    print 'not found.'
543
67
    # Try installing it via easy_install...
66
    # Try installing it via easy_install...
Reviewer	Date Requested	Status
termie (community)	2010-07-31	Approve on 2010-08-18
justinsb (community)		Approve on 2010-08-18
Vish Ishaya (community)	2010-07-22	Approve on 2010-08-10
Review via email: mp+30707@code.launchpad.net