| author | Laszlo Peter <laszlo.peter@oracle.com> |
| Wed, 07 Sep 2016 14:48:41 -0700 | |
| changeset 6849 | f9a2279efa0d |
| parent 5405 | 66fd59fecd68 |
| permissions | -rw-r--r-- |
|
5405
66fd59fecd68
PSARC 2015/535 OpenStack service updates for Kilo
Devjani Ray <devjani.ray@oracle.com>
parents:
4545
diff
changeset
|
1 |
This patch is to replace Linux-specific code with conditional checks in |
|
66fd59fecd68
PSARC 2015/535 OpenStack service updates for Kilo
Devjani Ray <devjani.ray@oracle.com>
parents:
4545
diff
changeset
|
2 |
the Cinder Brick code to support Cinder backup on Solaris. Patch has |
|
66fd59fecd68
PSARC 2015/535 OpenStack service updates for Kilo
Devjani Ray <devjani.ray@oracle.com>
parents:
4545
diff
changeset
|
3 |
not yet been submitted upstream. |
|
3998
5bd484384122
PSARC 2015/110 OpenStack service updates for Juno
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
4 |
|
|
6849
f9a2279efa0d
24465600 Update Cinder for the Mitaka release
Laszlo Peter <laszlo.peter@oracle.com>
parents:
5405
diff
changeset
|
5 |
--- cinder-8.0.0/cinder/utils.py.~1~ 2016-04-07 00:30:55.000000000 -0700 |
|
f9a2279efa0d
24465600 Update Cinder for the Mitaka release
Laszlo Peter <laszlo.peter@oracle.com>
parents:
5405
diff
changeset
|
6 |
+++ cinder-8.0.0/cinder/utils.py 2016-06-10 14:39:00.866171230 -0700 |
|
f9a2279efa0d
24465600 Update Cinder for the Mitaka release
Laszlo Peter <laszlo.peter@oracle.com>
parents:
5405
diff
changeset
|
7 |
@@ -143,8 +143,12 @@ def check_exclusive_options(**kwargs): |
|
5405
66fd59fecd68
PSARC 2015/535 OpenStack service updates for Kilo
Devjani Ray <devjani.ray@oracle.com>
parents:
4545
diff
changeset
|
8 |
|
|
3998
5bd484384122
PSARC 2015/110 OpenStack service updates for Juno
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
9 |
def execute(*cmd, **kwargs): |
|
5bd484384122
PSARC 2015/110 OpenStack service updates for Juno
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
10 |
"""Convenience wrapper around oslo's execute() method.""" |
|
5bd484384122
PSARC 2015/110 OpenStack service updates for Juno
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
11 |
- if 'run_as_root' in kwargs and 'root_helper' not in kwargs: |
|
5bd484384122
PSARC 2015/110 OpenStack service updates for Juno
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
12 |
- kwargs['root_helper'] = get_root_helper() |
|
4545
538c0aeae836
PSARC 2015/289 OpenStack Cinder Enhancements
Strony <strony.zhang@oracle.com>
parents:
3998
diff
changeset
|
13 |
+ if sys.platform == 'sunos5': |
|
538c0aeae836
PSARC 2015/289 OpenStack Cinder Enhancements
Strony <strony.zhang@oracle.com>
parents:
3998
diff
changeset
|
14 |
+ if 'run_as_root' in kwargs: |
|
538c0aeae836
PSARC 2015/289 OpenStack Cinder Enhancements
Strony <strony.zhang@oracle.com>
parents:
3998
diff
changeset
|
15 |
+ kwargs['run_as_root'] = False |
|
538c0aeae836
PSARC 2015/289 OpenStack Cinder Enhancements
Strony <strony.zhang@oracle.com>
parents:
3998
diff
changeset
|
16 |
+ else: |
|
3998
5bd484384122
PSARC 2015/110 OpenStack service updates for Juno
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
17 |
+ if 'run_as_root' in kwargs and 'root_helper' not in kwargs: |
|
5bd484384122
PSARC 2015/110 OpenStack service updates for Juno
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
18 |
+ kwargs['root_helper'] = get_root_helper() |
|
5bd484384122
PSARC 2015/110 OpenStack service updates for Juno
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
19 |
return processutils.execute(*cmd, **kwargs) |
|
5405
66fd59fecd68
PSARC 2015/535 OpenStack service updates for Kilo
Devjani Ray <devjani.ray@oracle.com>
parents:
4545
diff
changeset
|
20 |
|
|
66fd59fecd68
PSARC 2015/535 OpenStack service updates for Kilo
Devjani Ray <devjani.ray@oracle.com>
parents:
4545
diff
changeset
|
21 |