1. devstack
  2. Commit f95c9a960322df3cce1f4d98430f86a9654fc632
Browse code

Merge "Namespace XTRACE commands"

Jenkins authored on 2015/11/27 20:51:07
Showing 63 changed files
functions
History View file @ f95c9a9
... ... 
@@ -22,7 +22,7 @@ source ${FUNC_DIR}/inc/python
22 22 
 source ${FUNC_DIR}/inc/rootwrap
23 23
24 24 
 # Save trace setting
25 
-XTRACE=$(set +o | grep xtrace)
25 
+_XTRACE_FUNCTIONS=$(set +o | grep xtrace)
26 26 
 set +o xtrace
27 27
28 28 
 # Check if a function already exists
... ... 
@@ -603,7 +603,7 @@ function create_disk {
603 603 
 }
604 604
605 605 
 # Restore xtrace
606 
-$XTRACE
606 
+$_XTRACE_FUNCTIONS
607 607
608 608 
 # Local variables:
609 609 
 # mode: shell-script
functions-common
History View file @ f95c9a9
... ... 
@@ -32,7 +32,7 @@
32 32 
 #
33 33
34 34 
 # Save trace setting
35 
-XTRACE=$(set +o | grep xtrace)
35 
+_XTRACE_FUNCTIONS_COMMON=$(set +o | grep xtrace)
36 36 
 set +o xtrace
37 37
38 38 
 # ensure we don't re-source this in the same environment
... ... 
@@ -2254,7 +2254,7 @@ function time_totals {
2254 2254 
 }
2255 2255
2256 2256 
 # Restore xtrace
2257 
-$XTRACE
2257 
+$_XTRACE_FUNCTIONS_COMMON
2258 2258
2259 2259 
 # Local variables:
2260 2260 
 # mode: shell-script
inc/meta-config
History View file @ f95c9a9
... ... 
@@ -20,7 +20,7 @@
20 20 
 # file-name is the destination of the config file
21 21
22 22 
 # Save trace setting
23 
-INC_META_XTRACE=$(set +o | grep xtrace)
23 
+_XTRACE_INC_META=$(set +o | grep xtrace)
24 24 
 set +o xtrace
25 25
26 26
... ... 
@@ -197,7 +197,7 @@ function merge_config_group {
197 197
198 198
199 199 
 # Restore xtrace
200 
-$INC_META_XTRACE
200 
+$_XTRACE_INC_META
201 201
202 202 
 # Local variables:
203 203 
 # mode: shell-script
lib/apache
History View file @ f95c9a9
... ... 
@@ -19,7 +19,7 @@
19 19 
 # - restart_apache_server
20 20
21 21 
 # Save trace setting
22 
-XTRACE=$(set +o | grep xtrace)
22 
+_XTRACE_LIB_APACHE=$(set +o | grep xtrace)
23 23 
 set +o xtrace
24 24
25 25 
 # Allow overriding the default Apache user and group, default to
... ... 
@@ -191,7 +191,7 @@ function restart_apache_server {
191 191 
 }
192 192
193 193 
 # Restore xtrace
194 
-$XTRACE
194 
+$_XTRACE_LIB_APACHE
195 195
196 196 
 # Tell emacs to use shell-script-mode
197 197 
 ## Local variables:
lib/ceph
History View file @ f95c9a9
... ... 
@@ -18,7 +18,7 @@
18 18 
 # - cleanup_ceph
19 19
20 20 
 # Save trace setting
21 
-XTRACE=$(set +o | grep xtrace)
21 
+_XTRACE_LIB_CEPH=$(set +o | grep xtrace)
22 22 
 set +o xtrace
23 23
24 24
... ... 
@@ -375,7 +375,7 @@ function stop_ceph {
375 375
376 376
377 377 
 # Restore xtrace
378 
-$XTRACE
378 
+$_XTRACE_LIB_CEPH
379 379
380 380 
 ## Local variables:
381 381 
 ## mode: shell-script
lib/cinder
History View file @ f95c9a9
... ... 
@@ -20,7 +20,7 @@
20 20 
 # - cleanup_cinder
21 21
22 22 
 # Save trace setting
23 
-XTRACE=$(set +o | grep xtrace)
23 
+_XTRACE_CINDER=$(set +o | grep xtrace)
24 24 
 set +o xtrace
25 25
26 26
... ... 
@@ -567,7 +567,7 @@ function create_cinder_volume_group {
567 567
568 568
569 569 
 # Restore xtrace
570 
-$XTRACE
570 
+$_XTRACE_CINDER
571 571
572 572 
 # Tell emacs to use shell-script-mode
573 573 
 ## Local variables:
lib/cinder_backends/ceph
History View file @ f95c9a9
... ... 
@@ -22,7 +22,7 @@
22 22
23 23
24 24 
 # Save trace setting
25 
-MY_XTRACE=$(set +o | grep xtrace)
25 
+_XTRACE_CINDER_CEPH=$(set +o | grep xtrace)
26 26 
 set +o xtrace
27 27
28 28
... ... 
@@ -76,7 +76,7 @@ function configure_cinder_backend_ceph {
76 76 
 }
77 77
78 78 
 # Restore xtrace
79 
-$MY_XTRACE
79 
+$_XTRACE_CINDER_CEPH
80 80
81 81 
 # Local variables:
82 82 
 # mode: shell-script
lib/cinder_backends/glusterfs
History View file @ f95c9a9
... ... 
@@ -19,7 +19,7 @@
19 19 
 # configure_cinder_backend_glusterfs - Configure Cinder for GlusterFS backends
20 20
21 21 
 # Save trace setting
22 
-GLUSTERFS_XTRACE=$(set +o | grep xtrace)
22 
+_XTRACE_CINDER_GLUSTERFS=$(set +o | grep xtrace)
23 23 
 set +o xtrace
24 24
25 25
... ... 
@@ -41,7 +41,7 @@ function configure_cinder_backend_glusterfs {
41 41
42 42
43 43 
 # Restore xtrace
44 
-$GLUSTERFS_XTRACE
44 
+$_XTRACE_CINDER_GLUSTERFS
45 45
46 46 
 # Local variables:
47 47 
 # mode: shell-script
lib/cinder_backends/lvm
History View file @ f95c9a9
... ... 
@@ -22,7 +22,7 @@
22 22
23 23
24 24 
 # Save trace setting
25 
-MY_XTRACE=$(set +o | grep xtrace)
25 
+_XTRACE_CINDER_LVM=$(set +o | grep xtrace)
26 26 
 set +o xtrace
27 27
28 28
... ... 
@@ -68,7 +68,7 @@ function init_cinder_backend_lvm {
68 68 
 }
69 69
70 70 
 # Restore xtrace
71 
-$MY_XTRACE
71 
+$_XTRACE_CINDER_LVM
72 72
73 73 
 # mode: shell-script
74 74 
 # End:
lib/cinder_backends/netapp_iscsi
History View file @ f95c9a9
... ... 
@@ -20,7 +20,7 @@
20 20 
 # configure_cinder_backend_netapp_iscsi - configure iSCSI
21 21
22 22 
 # Save trace setting
23 
-MY_XTRACE=$(set +o | grep xtrace)
23 
+_XTRACE_CINDER_NETAPP=$(set +o | grep xtrace)
24 24 
 set +o xtrace
25 25
26 26
... ... 
@@ -59,7 +59,7 @@ function configure_cinder_backend_netapp_iscsi {
59 59
60 60
61 61 
 # Restore xtrace
62 
-$MY_XTRACE
62 
+$_XTRACE_CINDER_NETAPP
63 63
64 64 
 # Local variables:
65 65 
 # mode: shell-script
lib/cinder_backends/netapp_nfs
History View file @ f95c9a9
... ... 
@@ -20,7 +20,7 @@
20 20 
 # configure_cinder_backend_netapp_nfs - configure NFS
21 21
22 22 
 # Save trace setting
23 
-MY_XTRACE=$(set +o | grep xtrace)
23 
+_XTRACE_CINDER_NETAPP=$(set +o | grep xtrace)
24 24 
 set +o xtrace
25 25
26 26
... ... 
@@ -70,7 +70,7 @@ function cleanup_cinder_backend_netapp_nfs {
70 70
71 71
72 72 
 # Restore xtrace
73 
-$MY_XTRACE
73 
+$_XTRACE_CINDER_NETAPP
74 74
75 75 
 # Local variables:
76 76 
 # mode: shell-script
lib/cinder_backends/nfs
History View file @ f95c9a9
... ... 
@@ -19,7 +19,7 @@
19 19 
 # configure_cinder_backend_nfs - Configure Cinder for NFS backends
20 20
21 21 
 # Save trace setting
22 
-NFS_XTRACE=$(set +o | grep xtrace)
22 
+_XTRACE_CINDER_NFS=$(set +o | grep xtrace)
23 23 
 set +o xtrace
24 24
25 25
... ... 
@@ -38,7 +38,7 @@ function configure_cinder_backend_nfs {
38 38
39 39
40 40 
 # Restore xtrace
41 
-$NFS_XTRACE
41 
+$_XTRACE_CINDER_NFS
42 42
43 43 
 # Local variables:
44 44 
 # mode: shell-script
lib/cinder_backends/solidfire
History View file @ f95c9a9
... ... 
@@ -17,7 +17,7 @@
17 17 
 # configure_cinder_driver - make configuration changes, including those to other services
18 18
19 19 
 # Save trace setting
20 
-MY_XTRACE=$(set +o | grep xtrace)
20 
+_XTRACE_CINDER_SOLIDFIRE=$(set +o | grep xtrace)
21 21 
 set +o xtrace
22 22
23 23
... ... 
@@ -42,7 +42,7 @@ function configure_cinder_backend_solidfire {
42 42
43 43
44 44 
 # Restore xtrace
45 
-$MY_XTRACE
45 
+$_XTRACE_CINDER_SOLIDFIRE
46 46
47 47 
 # Local variables:
48 48 
 # mode: shell-script
lib/cinder_backends/vmdk
History View file @ f95c9a9
... ... 
@@ -15,7 +15,7 @@
15 15 
 # configure_cinder_backend_vmdk - Configure Cinder for VMware vmdk backends
16 16
17 17 
 # Save trace setting
18 
-VMDK_XTRACE=$(set +o | grep xtrace)
18 
+_XTRACE_CINDER_VMDK=$(set +o | grep xtrace)
19 19 
 set +o xtrace
20 20
21 21
... ... 
@@ -40,7 +40,7 @@ function configure_cinder_backend_vmdk {
40 40
41 41
42 42 
 # Restore xtrace
43 
-$VMDK_XTRACE
43 
+$_XTRACE_CINDER_VMDK
44 44
45 45 
 # Local variables:
46 46 
 # mode: shell-script
lib/cinder_backends/xiv
History View file @ f95c9a9
... ... 
@@ -42,7 +42,7 @@
42 42 
 # configure_cinder_backend_xiv - Configure Cinder for xiv backends
43 43
44 44 
 # Save trace setting
45 
-XIV_XTRACE=$(set +o | grep xtrace)
45 
+_XTRACE_CINDER_XIV=$(set +o | grep xtrace)
46 46 
 set +o xtrace
47 47
48 48 
 # Defaults
... ... 
@@ -79,7 +79,7 @@ function configure_cinder_backend_xiv {
79 79 
 }
80 80
81 81 
 # Restore xtrace
82 
-$XIV_XTRACE
82 
+$_XTRACE_CINDER_XIV
83 83
84 84 
 # Local variables:
85 85 
 # mode: shell-script
lib/cinder_plugins/XenAPINFS
History View file @ f95c9a9
... ... 
@@ -15,7 +15,7 @@
15 15 
 # configure_cinder_driver - make configuration changes, including those to other services
16 16
17 17 
 # Save trace setting
18 
-MY_XTRACE=$(set +o | grep xtrace)
18 
+_XTRACE_CINDER_XENAPINFS=$(set +o | grep xtrace)
19 19 
 set +o xtrace
20 20
21 21
... ... 
@@ -39,7 +39,7 @@ function configure_cinder_driver {
39 39 
 }
40 40
41 41 
 # Restore xtrace
42 
-$MY_XTRACE
42 
+$_XTRACE_CINDER_XENAPINFS
43 43
44 44 
 # Local variables:
45 45 
 # mode: shell-script
lib/cinder_plugins/glusterfs
History View file @ f95c9a9
... ... 
@@ -15,7 +15,7 @@
15 15 
 # configure_cinder_driver - make configuration changes, including those to other services
16 16
17 17 
 # Save trace setting
18 
-MY_XTRACE=$(set +o | grep xtrace)
18 
+_XTRACE_CINDER_GLUSTERFS=$(set +o | grep xtrace)
19 19 
 set +o xtrace
20 20
21 21
... ... 
@@ -45,7 +45,7 @@ function configure_cinder_driver {
45 45 
 }
46 46
47 47 
 # Restore xtrace
48 
-$MY_XTRACE
48 
+$_XTRACE_CINDER_GLUSTERFS
49 49
50 50 
 # Local variables:
51 51 
 # mode: shell-script
lib/cinder_plugins/nfs
History View file @ f95c9a9
... ... 
@@ -15,7 +15,7 @@
15 15 
 # configure_cinder_driver - make configuration changes, including those to other services
16 16
17 17 
 # Save trace setting
18 
-MY_XTRACE=$(set +o | grep xtrace)
18 
+_XTRACE_CINDER_NFS=$(set +o | grep xtrace)
19 19 
 set +o xtrace
20 20
21 21
... ... 
@@ -36,7 +36,7 @@ function configure_cinder_driver {
36 36 
 }
37 37
38 38 
 # Restore xtrace
39 
-$MY_XTRACE
39 
+$_XTRACE_CINDER_NFS
40 40
41 41 
 # Local variables:
42 42 
 # mode: shell-script
lib/cinder_plugins/sheepdog
History View file @ f95c9a9
... ... 
@@ -15,7 +15,7 @@
15 15 
 # configure_cinder_driver - make configuration changes, including those to other services
16 16
17 17 
 # Save trace setting
18 
-MY_XTRACE=$(set +o | grep xtrace)
18 
+_XTRACE_CINDER_SHEEPDOG=$(set +o | grep xtrace)
19 19 
 set +o xtrace
20 20
21 21
... ... 
@@ -34,7 +34,7 @@ function configure_cinder_driver {
34 34 
 }
35 35
36 36 
 # Restore xtrace
37 
-$MY_XTRACE
37 
+$_XTRACE_CINDER_SHEEPDOG
38 38
39 39 
 # Local variables:
40 40 
 # mode: shell-script
lib/cinder_plugins/vsphere
History View file @ f95c9a9
... ... 
@@ -15,7 +15,7 @@
15 15 
 # configure_cinder_driver - make configuration changes, including those to other services
16 16
17 17 
 # Save trace setting
18 
-MY_XTRACE=$(set +o | grep xtrace)
18 
+_XTRACE_CINDER_VSPHERE=$(set +o | grep xtrace)
19 19 
 set +o xtrace
20 20
21 21
... ... 
@@ -37,7 +37,7 @@ function configure_cinder_driver {
37 37 
 }
38 38
39 39 
 # Restore xtrace
40 
-$MY_XTRACE
40 
+$_XTRACE_CINDER_VSPHERE
41 41
42 42 
 # Local variables:
43 43 
 # mode: shell-script
lib/database
History View file @ f95c9a9
... ... 
@@ -20,7 +20,7 @@
20 20 
 # and call register_database $DATABASE_TYPE
21 21
22 22 
 # Save trace setting
23 
-XTRACE=$(set +o | grep xtrace)
23 
+_XTRACE_LIB_DB=$(set +o | grep xtrace)
24 24 
 set +o xtrace
25 25
26 26 
 DATABASE_BACKENDS=""
... ... 
@@ -137,7 +137,7 @@ function database_connection_url {
137 137
138 138
139 139 
 # Restore xtrace
140 
-$XTRACE
140 
+$_XTRACE_LIB_DB
141 141
142 142 
 # Tell emacs to use shell-script-mode
143 143 
 ## Local variables:
lib/databases/mysql
History View file @ f95c9a9
... ... 
@@ -8,7 +8,7 @@
8 8 
 # - DATABASE_{HOST,USER,PASSWORD} must be defined
9 9
10 10 
 # Save trace setting
11 
-MY_XTRACE=$(set +o | grep xtrace)
11 
+_XTRACE_DB_MYSQL=$(set +o | grep xtrace)
12 12 
 set +o xtrace
13 13
14 14 
 MYSQL_DRIVER=${MYSQL_DRIVER:-PyMySQL}
... ... 
@@ -178,7 +178,7 @@ function database_connection_url_mysql {
178 178
179 179
180 180 
 # Restore xtrace
181 
-$MY_XTRACE
181 
+$_XTRACE_DB_MYSQL
182 182
183 183 
 # Local variables:
184 184 
 # mode: shell-script
lib/databases/postgresql
History View file @ f95c9a9
... ... 
@@ -8,7 +8,7 @@
8 8 
 # - DATABASE_{HOST,USER,PASSWORD} must be defined
9 9
10 10 
 # Save trace setting
11 
-PG_XTRACE=$(set +o | grep xtrace)
11 
+_XTRACE_PG=$(set +o | grep xtrace)
12 12 
 set +o xtrace
13 13
14 14
... ... 
@@ -119,7 +119,7 @@ function database_connection_url_postgresql {
119 119
120 120
121 121 
 # Restore xtrace
122 
-$PG_XTRACE
122 
+$_XTRACE_PG
123 123
124 124 
 # Local variables:
125 125 
 # mode: shell-script
lib/dlm
History View file @ f95c9a9
... ... 
@@ -19,7 +19,7 @@
19 19 
 # - cleanup_dlm
20 20
21 21 
 # Save trace setting
22 
-XTRACE=$(set +o | grep xtrace)
22 
+_XTRACE_DLM=$(set +o | grep xtrace)
23 23 
 set +o xtrace
24 24
25 25
... ... 
@@ -100,7 +100,7 @@ function install_dlm {
100 100 
 }
101 101
102 102 
 # Restore xtrace
103 
-$XTRACE
103 
+$_XTRACE_DLM
104 104
105 105 
 # Tell emacs to use shell-script-mode
106 106 
 ## Local variables:
lib/dstat
History View file @ f95c9a9
... ... 
@@ -13,7 +13,7 @@
13 13 
 # - stop_dstat
14 14
15 15 
 # Save trace setting
16 
-XTRACE=$(set +o | grep xtrace)
16 
+_XTRACE_DSTAT=$(set +o | grep xtrace)
17 17 
 set +o xtrace
18 18
19 19 
 # start_dstat() - Start running processes, including screen
... ... 
@@ -34,4 +34,4 @@ function stop_dstat {
34 34 
 }
35 35
36 36 
 # Restore xtrace
37 
-$XTRACE
37 
+$_XTRACE_DSTAT
lib/glance
History View file @ f95c9a9
... ... 
@@ -21,7 +21,7 @@
21 21 
 # - cleanup_glance
22 22
23 23 
 # Save trace setting
24 
-XTRACE=$(set +o | grep xtrace)
24 
+_XTRACE_GLANCE=$(set +o | grep xtrace)
25 25 
 set +o xtrace
26 26
27 27
... ... 
@@ -403,7 +403,7 @@ function stop_glance {
403 403 
 }
404 404
405 405 
 # Restore xtrace
406 
-$XTRACE
406 
+$_XTRACE_GLANCE
407 407
408 408 
 # Tell emacs to use shell-script-mode
409 409 
 ## Local variables:
lib/heat
History View file @ f95c9a9
... ... 
@@ -23,7 +23,7 @@
23 23 
 # - cleanup_heat
24 24
25 25 
 # Save trace setting
26 
-XTRACE=$(set +o | grep xtrace)
26 
+_XTRACE_HEAT=$(set +o | grep xtrace)
27 27 
 set +o xtrace
28 28
29 29
... ... 
@@ -464,7 +464,7 @@ function build_heat_pip_mirror {
464 464 
 }
465 465
466 466 
 # Restore xtrace
467 
-$XTRACE
467 
+$_XTRACE_HEAT
468 468
469 469 
 # Tell emacs to use shell-script-mode
470 470 
 ## Local variables:
lib/horizon
History View file @ f95c9a9
... ... 
@@ -19,7 +19,7 @@
19 19 
 # - cleanup_horizon
20 20
21 21 
 # Save trace setting
22 
-XTRACE=$(set +o | grep xtrace)
22 
+_XTRACE_HORIZON=$(set +o | grep xtrace)
23 23 
 set +o xtrace
24 24
25 25
... ... 
@@ -193,7 +193,7 @@ function _prepare_message_catalog_compilation {
193 193
194 194
195 195 
 # Restore xtrace
196 
-$XTRACE
196 
+$_XTRACE_HORIZON
197 197
198 198 
 # Tell emacs to use shell-script-mode
199 199 
 ## Local variables:
lib/infra
History View file @ f95c9a9
... ... 
@@ -15,7 +15,7 @@
15 15 
 # - install_infra
16 16
17 17 
 # Save trace setting
18 
-XTRACE=$(set +o | grep xtrace)
18 
+_XTRACE_INFRA=$(set +o | grep xtrace)
19 19 
 set +o xtrace
20 20
21 21
... ... 
@@ -50,7 +50,7 @@ function install_infra {
50 50 
 }
51 51
52 52 
 # Restore xtrace
53 
-$XTRACE
53 
+$_XTRACE_INFRA
54 54
55 55 
 # Tell emacs to use shell-script-mode
56 56 
 ## Local variables:
lib/ironic
History View file @ f95c9a9
... ... 
@@ -21,8 +21,8 @@
21 21 
 # - cleanup_ironic
22 22
23 23 
 # Save trace and pipefail settings
24 
-XTRACE=$(set +o | grep xtrace)
25 
-PIPEFAIL=$(set +o | grep pipefail)
24 
+_XTRACE_IRONIC=$(set +o | grep xtrace)
25 
+_PIPEFAIL_IRONIC=$(set +o | grep pipefail)
26 26 
 set +o xtrace
27 27 
 set +o pipefail
28 28
... ... 
@@ -855,8 +855,8 @@ function cleanup_baremetal_basic_ops {
855 855 
 }
856 856
857 857 
 # Restore xtrace + pipefail
858 
-$XTRACE
859 
-$PIPEFAIL
858 
+$_XTRACE_IRONIC
859 
+$_PIPEFAIL_IRONIC
860 860
861 861 
 # Tell emacs to use shell-script-mode
862 862 
 ## Local variables:
lib/keystone
History View file @ f95c9a9
... ... 
@@ -28,7 +28,7 @@
28 28 
 # - _cleanup_keystone_apache_wsgi
29 29
30 30 
 # Save trace setting
31 
-XTRACE=$(set +o | grep xtrace)
31 
+_XTRACE_KEYSTONE=$(set +o | grep xtrace)
32 32 
 set +o xtrace
33 33
34 34 
 # Defaults
... ... 
@@ -592,7 +592,7 @@ function stop_keystone {
592 592
593 593
594 594 
 # Restore xtrace
595 
-$XTRACE
595 
+$_XTRACE_KEYSTONE
596 596
597 597 
 # Tell emacs to use shell-script-mode
598 598 
 ## Local variables:
lib/ldap
History View file @ f95c9a9
... ... 
@@ -8,7 +8,7 @@
8 8 
 # - install_ldap()
9 9
10 10 
 # Save trace setting
11 
-XTRACE=$(set +o | grep xtrace)
11 
+_XTRACE_LDAP=$(set +o | grep xtrace)
12 12 
 set +o xtrace
13 13
14 14
... ... 
@@ -166,7 +166,7 @@ function clear_ldap_state {
166 166 
 }
167 167
168 168 
 # Restore xtrace
169 
-$XTRACE
169 
+$_XTRACE_LDAP
170 170
171 171 
 # Tell emacs to use shell-script-mode
172 172 
 ## Local variables:
lib/lvm
History View file @ f95c9a9
... ... 
@@ -16,7 +16,7 @@
16 16
17 17
18 18 
 # Save trace setting
19 
-MY_XTRACE=$(set +o | grep xtrace)
19 
+_XTRACE_LVM=$(set +o | grep xtrace)
20 20 
 set +o xtrace
21 21
22 22
... ... 
@@ -182,7 +182,7 @@ function set_lvm_filter {
182 182 
 }
183 183
184 184 
 # Restore xtrace
185 
-$MY_XTRACE
185 
+$_XTRACE_LVM
186 186
187 187 
 # mode: shell-script
188 188 
 # End:
lib/neutron-legacy
History View file @ f95c9a9
... ... 
@@ -357,7 +357,7 @@ else
357 357 
 fi
358 358
359 359 
 # Save trace setting
360 
-XTRACE=$(set +o | grep xtrace)
360 
+_XTRACE_NEUTRON=$(set +o | grep xtrace)
361 361 
 set +o xtrace
362 362
363 363
... ... 
@@ -1492,7 +1492,7 @@ function is_provider_network {
1492 1492
1493 1493
1494 1494 
 # Restore xtrace
1495 
-$XTRACE
1495 
+$_XTRACE_NEUTRON
1496 1496
1497 1497 
 # Tell emacs to use shell-script-mode
1498 1498 
 ## Local variables:
lib/neutron_plugins/bigswitch_floodlight
History View file @ f95c9a9
... ... 
@@ -4,7 +4,7 @@
4 4 
 # ------------------------------------
5 5
6 6 
 # Save trace setting
7 
-BS_XTRACE=$(set +o | grep xtrace)
7 
+_XTRACE_NEUTRON_BIGSWITCH=$(set +o | grep xtrace)
8 8 
 set +o xtrace
9 9
10 10 
 source $TOP_DIR/lib/neutron_plugins/ovs_base
... ... 
@@ -75,4 +75,4 @@ function neutron_plugin_check_adv_test_requirements {
75 75 
 }
76 76
77 77 
 # Restore xtrace
78 
-$BS_XTRACE
78 
+$_XTRACE_NEUTRON_BIGSWITCH
lib/neutron_plugins/brocade
History View file @ f95c9a9
... ... 
@@ -4,7 +4,7 @@
4 4 
 # ----------------------
5 5
6 6 
 # Save trace setting
7 
-BRCD_XTRACE=$(set +o | grep xtrace)
7 
+_XTRACE_NEUTRON_BROCADE=$(set +o | grep xtrace)
8 8 
 set +o xtrace
9 9
10 10 
 function is_neutron_ovs_base_plugin {
... ... 
@@ -81,4 +81,4 @@ function neutron_plugin_check_adv_test_requirements {
81 81 
 }
82 82
83 83 
 # Restore xtrace
84 
-$BRCD_XTRACE
84 
+$_XTRACE_NEUTRON_BROCADE
lib/neutron_plugins/cisco
History View file @ f95c9a9
... ... 
@@ -4,7 +4,7 @@
4 4 
 # ---------------------------
5 5
6 6 
 # Save trace setting
7 
-CISCO_XTRACE=$(set +o | grep xtrace)
7 
+_XTRACE_NEUTRON_CISCO=$(set +o | grep xtrace)
8 8 
 set +o xtrace
9 9
10 10 
 # Scecify the VSM parameters
... ... 
@@ -154,4 +154,4 @@ function neutron_plugin_setup_interface_driver {
154 154 
 }
155 155
156 156 
 # Restore xtrace
157 
-$CISCO_XTRACE
157 
+$_XTRACE_NEUTRON_CISCO
lib/neutron_plugins/embrane
History View file @ f95c9a9
... ... 
@@ -4,7 +4,7 @@
4 4 
 # ---------------------------
5 5
6 6 
 # Save trace setting
7 
-EMBR_XTRACE=$(set +o | grep xtrace)
7 
+_XTRACE_NEUTRON_EMBR=$(set +o | grep xtrace)
8 8 
 set +o xtrace
9 9
10 10 
 source $TOP_DIR/lib/neutron_plugins/openvswitch
... ... 
@@ -39,4 +39,5 @@ function neutron_plugin_configure_service {
39 39 
 }
40 40
41 41 
 # Restore xtrace
42 
-$EMBR_XTRACE
42 
+$_XTRACE_NEUTRON_EMBR
43 
+
lib/neutron_plugins/linuxbridge_agent
History View file @ f95c9a9
... ... 
@@ -4,7 +4,7 @@
4 4 
 # -----------------------------
5 5
6 6 
 # Save trace setting
7 
-PLUGIN_XTRACE=$(set +o | grep xtrace)
7 
+_XTRACE_NEUTRON_LB=$(set +o | grep xtrace)
8 8 
 set +o xtrace
9 9
10 10 
 function neutron_lb_cleanup {
... ... 
@@ -93,4 +93,4 @@ function neutron_plugin_check_adv_test_requirements {
93 93 
 }
94 94
95 95 
 # Restore xtrace
96 
-$PLUGIN_XTRACE
96 
+$_XTRACE_NEUTRON_LB
lib/neutron_plugins/ml2
History View file @ f95c9a9
... ... 
@@ -4,7 +4,7 @@
4 4 
 # ------------------------------
5 5
6 6 
 # Save trace setting
7 
-ML2_XTRACE=$(set +o | grep xtrace)
7 
+_XTRACE_NEUTRON_ML2=$(set +o | grep xtrace)
8 8 
 set +o xtrace
9 9
10 10 
 # Enable this to simply and quickly enable tunneling with ML2.
... ... 
@@ -137,4 +137,4 @@ function has_neutron_plugin_security_group {
137 137 
 }
138 138
139 139 
 # Restore xtrace
140 
-$ML2_XTRACE
140 
+$_XTRACE_NEUTRON_ML2
lib/neutron_plugins/nuage
History View file @ f95c9a9
... ... 
@@ -4,7 +4,7 @@
4 4 
 # ----------------------
5 5
6 6 
 # Save trace setting
7 
-NU_XTRACE=$(set +o | grep xtrace)
7 
+_XTRACE_NEUTRON_NU=$(set +o | grep xtrace)
8 8 
 set +o xtrace
9 9
10 10 
 function neutron_plugin_create_nova_conf {
... ... 
@@ -66,4 +66,4 @@ function has_neutron_plugin_security_group {
66 66 
 }
67 67
68 68 
 # Restore xtrace
69 
-$NU_XTRACE
69 
+$_XTRACE_NEUTRON_NU
lib/neutron_plugins/openvswitch
History View file @ f95c9a9
... ... 
@@ -7,7 +7,7 @@
7 7 
 # which has been removed in Juno.
8 8
9 9 
 # Save trace setting
10 
-OVS_XTRACE=$(set +o | grep xtrace)
10 
+_XTRACE_NEUTRON_OVS=$(set +o | grep xtrace)
11 11 
 set +o xtrace
12 12
13 13 
 source $TOP_DIR/lib/neutron_plugins/openvswitch_agent
... ... 
@@ -56,4 +56,5 @@ function has_neutron_plugin_security_group {
56 56 
 }
57 57
58 58 
 # Restore xtrace
59 
-$OVS_XTRACE
59 
+$_XTRACE_NEUTRON_OVS
60 
+
lib/neutron_plugins/openvswitch_agent
History View file @ f95c9a9
... ... 
@@ -4,7 +4,7 @@
4 4 
 # -----------------------------
5 5
6 6 
 # Save trace setting
7 
-OVSA_XTRACE=$(set +o | grep xtrace)
7 
+_XTRACE_NEUTRON_OVSL2=$(set +o | grep xtrace)
8 8 
 set +o xtrace
9 9
10 10 
 source $TOP_DIR/lib/neutron_plugins/ovs_base
... ... 
@@ -132,4 +132,4 @@ function neutron_plugin_check_adv_test_requirements {
132 132 
 }
133 133
134 134 
 # Restore xtrace
135 
-$OVSA_XTRACE
135 
+$_XTRACE_NEUTRON_OVSL2
lib/neutron_plugins/ovs_base
History View file @ f95c9a9
... ... 
@@ -4,7 +4,7 @@
4 4 
 # -------------------------------------
5 5
6 6 
 # Save trace setting
7 
-OVSB_XTRACE=$(set +o | grep xtrace)
7 
+_XTRACE_NEUTRON_OVS_BASE=$(set +o | grep xtrace)
8 8 
 set +o xtrace
9 9
10 10 
 OVS_BRIDGE=${OVS_BRIDGE:-br-int}
... ... 
@@ -114,4 +114,4 @@ function _neutron_ovs_base_configure_nova_vif_driver {
114 114 
 }
115 115
116 116 
 # Restore xtrace
117 
-$OVSB_XTRACE
117 
+$_XTRACE_NEUTRON_OVS_BASE
lib/neutron_plugins/services/firewall
History View file @ f95c9a9
... ... 
@@ -4,7 +4,7 @@
4 4 
 # ---------------------------
5 5
6 6 
 # Save trace setting
7 
-FW_XTRACE=$(set +o | grep xtrace)
7 
+_XTRACE_NEUTRON_FIREWALL=$(set +o | grep xtrace)
8 8 
 set +o xtrace
9 9
10 10 
 FWAAS_PLUGIN=neutron_fwaas.services.firewall.fwaas_plugin.FirewallPlugin
... ... 
@@ -26,4 +26,4 @@ function neutron_fwaas_stop {
26 26 
 }
27 27
28 28 
 # Restore xtrace
29 
-$FW_XTRACE
29 
+$_XTRACE_NEUTRON_FIREWALL
lib/neutron_plugins/services/loadbalancer
History View file @ f95c9a9
... ... 
@@ -4,7 +4,7 @@
4 4 
 # ---------------------------
5 5
6 6 
 # Save trace setting
7 
-LB_XTRACE=$(set +o | grep xtrace)
7 
+_XTRACE_NEUTRON_LB=$(set +o | grep xtrace)
8 8 
 set +o xtrace
9 9
10 10
... ... 
@@ -48,4 +48,4 @@ function neutron_lbaas_stop {
48 48 
 }
49 49
50 50 
 # Restore xtrace
51 
-$LB_XTRACE
51 
+$_XTRACE_NEUTRON_LB
lib/neutron_plugins/services/metering
History View file @ f95c9a9
... ... 
@@ -4,7 +4,7 @@
4 4 
 # ---------------------------
5 5
6 6 
 # Save trace setting
7 
-METER_XTRACE=$(set +o | grep xtrace)
7 
+_XTRACE_NETURON_METER=$(set +o | grep xtrace)
8 8 
 set +o xtrace
9 9
10 10
... ... 
@@ -29,4 +29,5 @@ function neutron_metering_stop {
29 29 
 }
30 30
31 31 
 # Restore xtrace
32 
-$METER_XTRACE
32 
+$_XTRACE_NETURON_METER
33 
+
lib/neutron_plugins/services/vpn
History View file @ f95c9a9
... ... 
@@ -4,7 +4,7 @@
4 4 
 # ---------------------------
5 5
6 6 
 # Save trace setting
7 
-VPN_XTRACE=$(set +o | grep xtrace)
7 
+_XTRACE_NEUTRON_VPN=$(set +o | grep xtrace)
8 8 
 set +o xtrace
9 9
10 10
... ... 
@@ -53,4 +53,4 @@ function neutron_vpn_stop {
53 53 
 }
54 54
55 55 
 # Restore xtrace
56 
-$VPN_XTRACE
56 
+$_XTRACE_NEUTRON_VPN
lib/neutron_thirdparty/bigswitch_floodlight
History View file @ f95c9a9
... ... 
@@ -4,7 +4,7 @@
4 4 
 # ------------------------------------------
5 5
6 6 
 # Save trace setting
7 
-BS3_XTRACE=$(set +o | grep xtrace)
7 
+_XTRACE_NEUTRON_BIGSWITCH=$(set +o | grep xtrace)
8 8 
 set +o xtrace
9 9
10 10 
 BS_FL_CONTROLLERS_PORT=${BS_FL_CONTROLLERS_PORT:-localhost:80}
... ... 
@@ -51,4 +51,4 @@ function check_bigswitch_floodlight {
51 51 
 }
52 52
53 53 
 # Restore xtrace
54 
-$BS3_XTRACE
54 
+$_XTRACE_NEUTRON_BIGSWITCH
lib/nova
History View file @ f95c9a9
... ... 
@@ -25,7 +25,7 @@
25 25 
 # - cleanup_nova
26 26
27 27 
 # Save trace setting
28 
-XTRACE=$(set +o | grep xtrace)
28 
+_XTRACE_LIB_NOVA=$(set +o | grep xtrace)
29 29 
 set +o xtrace
30 30
31 31
... ... 
@@ -958,7 +958,7 @@ function stop_nova {
958 958
959 959
960 960 
 # Restore xtrace
961 
-$XTRACE
961 
+$_XTRACE_LIB_NOVA
962 962
963 963 
 # Tell emacs to use shell-script-mode
964 964 
 ## Local variables:
lib/nova_plugins/functions-libvirt
History View file @ f95c9a9
... ... 
@@ -8,7 +8,7 @@
8 8 
 # ``STACK_USER`` has to be defined
9 9
10 10 
 # Save trace setting
11 
-LV_XTRACE=$(set +o | grep xtrace)
11 
+_XTRACE_NOVA_FN_LIBVIRT=$(set +o | grep xtrace)
12 12 
 set +o xtrace
13 13
14 14 
 # Defaults
... ... 
@@ -134,7 +134,7 @@ EOF
134 134
135 135
136 136 
 # Restore xtrace
137 
-$LV_XTRACE
137 
+$_XTRACE_NOVA_FN_LIBVIRT
138 138
139 139 
 # Local variables:
140 140 
 # mode: shell-script
lib/nova_plugins/hypervisor-fake
History View file @ f95c9a9
... ... 
@@ -17,7 +17,7 @@
17 17 
 # cleanup_nova_hypervisor - remove transient data and cache
18 18
19 19 
 # Save trace setting
20 
-MY_XTRACE=$(set +o | grep xtrace)
20 
+_XTRACE_VIRTFAKE=$(set +o | grep xtrace)
21 21 
 set +o xtrace
22 22
23 23
... ... 
@@ -72,7 +72,7 @@ function stop_nova_hypervisor {
72 72
73 73
74 74 
 # Restore xtrace
75 
-$MY_XTRACE
75 
+$_XTRACE_VIRTFAKE
76 76
77 77 
 # Local variables:
78 78 
 # mode: shell-script
lib/nova_plugins/hypervisor-ironic
History View file @ f95c9a9
... ... 
@@ -17,7 +17,7 @@
17 17 
 # cleanup_nova_hypervisor - remove transient data and cache
18 18
19 19 
 # Save trace setting
20 
-MY_XTRACE=$(set +o | grep xtrace)
20 
+_XTRACE_HYP_IRONIC=$(set +o | grep xtrace)
21 21 
 set +o xtrace
22 22
23 23 
 source $TOP_DIR/lib/nova_plugins/functions-libvirt
... ... 
@@ -81,7 +81,7 @@ function stop_nova_hypervisor {
81 81
82 82
83 83 
 # Restore xtrace
84 
-$MY_XTRACE
84 
+$_XTRACE_HYP_IRONIC
85 85
86 86 
 # Local variables:
87 87 
 # mode: shell-script
lib/nova_plugins/hypervisor-libvirt
History View file @ f95c9a9
... ... 
@@ -17,7 +17,7 @@
17 17 
 # cleanup_nova_hypervisor - remove transient data and cache
18 18
19 19 
 # Save trace setting
20 
-MY_XTRACE=$(set +o | grep xtrace)
20 
+_XTRACE_NOVA_LIBVIRT=$(set +o | grep xtrace)
21 21 
 set +o xtrace
22 22
23 23 
 source $TOP_DIR/lib/nova_plugins/functions-libvirt
... ... 
@@ -105,7 +105,7 @@ function stop_nova_hypervisor {
105 105
106 106
107 107 
 # Restore xtrace
108 
-$MY_XTRACE
108 
+$_XTRACE_NOVA_LIBVIRT
109 109
110 110 
 # Local variables:
111 111 
 # mode: shell-script
lib/nova_plugins/hypervisor-openvz
History View file @ f95c9a9
... ... 
@@ -17,7 +17,7 @@
17 17 
 # cleanup_nova_hypervisor - remove transient data and cache
18 18
19 19 
 # Save trace setting
20 
-MY_XTRACE=$(set +o | grep xtrace)
20 
+_XTRACE_OPENVZ=$(set +o | grep xtrace)
21 21 
 set +o xtrace
22 22
23 23
... ... 
@@ -62,7 +62,7 @@ function stop_nova_hypervisor {
62 62
63 63
64 64 
 # Restore xtrace
65 
-$MY_XTRACE
65 
+$_XTRACE_OPENVZ
66 66
67 67 
 # Local variables:
68 68 
 # mode: shell-script
lib/nova_plugins/hypervisor-vsphere
History View file @ f95c9a9
... ... 
@@ -17,7 +17,7 @@
17 17 
 # cleanup_nova_hypervisor - remove transient data and cache
18 18
19 19 
 # Save trace setting
20 
-MY_XTRACE=$(set +o | grep xtrace)
20 
+_XTRACE_NOVA_VSPHERE=$(set +o | grep xtrace)
21 21 
 set +o xtrace
22 22
23 23
... ... 
@@ -64,7 +64,7 @@ function stop_nova_hypervisor {
64 64
65 65
66 66 
 # Restore xtrace
67 
-$MY_XTRACE
67 
+$_XTRACE_NOVA_VSPHERE
68 68
69 69 
 # Local variables:
70 70 
 # mode: shell-script
lib/nova_plugins/hypervisor-xenserver
History View file @ f95c9a9
... ... 
@@ -17,7 +17,7 @@
17 17 
 # cleanup_nova_hypervisor - remove transient data and cache
18 18
19 19 
 # Save trace setting
20 
-MY_XTRACE=$(set +o | grep xtrace)
20 
+_XTRACE_XENSERVER=$(set +o | grep xtrace)
21 21 
 set +o xtrace
22 22
23 23
... ... 
@@ -111,7 +111,7 @@ function stop_nova_hypervisor {
111 111
112 112
113 113 
 # Restore xtrace
114 
-$MY_XTRACE
114 
+$_XTRACE_XENSERVER
115 115
116 116 
 # Local variables:
117 117 
 # mode: shell-script
lib/oslo
History View file @ f95c9a9
... ... 
@@ -16,7 +16,7 @@
16 16 
 # - install_oslo
17 17
18 18 
 # Save trace setting
19 
-XTRACE=$(set +o | grep xtrace)
19 
+_XTRACE_LIB_OSLO=$(set +o | grep xtrace)
20 20 
 set +o xtrace
21 21
22 22
... ... 
@@ -95,7 +95,7 @@ function install_oslo {
95 95 
 }
96 96
97 97 
 # Restore xtrace
98 
-$XTRACE
98 
+$_XTRACE_LIB_OSLO
99 99
100 100 
 # Tell emacs to use shell-script-mode
101 101 
 ## Local variables:
lib/rpc_backend
History View file @ f95c9a9
... ... 
@@ -21,7 +21,7 @@
21 21 
 # of this file which is a standard interface.
22 22
23 23 
 # Save trace setting
24 
-XTRACE=$(set +o | grep xtrace)
24 
+_XTRACE_RPC_BACKEND=$(set +o | grep xtrace)
25 25 
 set +o xtrace
26 26
27 27 
 # Functions
... ... 
@@ -141,7 +141,7 @@ function rabbit_setuser {
141 141 
 }
142 142
143 143 
 # Restore xtrace
144 
-$XTRACE
144 
+$_XTRACE_RPC_BACKEND
145 145
146 146 
 # Tell emacs to use shell-script-mode
147 147 
 ## Local variables:
lib/swift
History View file @ f95c9a9
... ... 
@@ -24,7 +24,7 @@
24 24 
 # - _cleanup_swift_apache_wsgi
25 25
26 26 
 # Save trace setting
27 
-XTRACE=$(set +o | grep xtrace)
27 
+_XTRACE_LIB_SWIFT=$(set +o | grep xtrace)
28 28 
 set +o xtrace
29 29
30 30
... ... 
@@ -823,7 +823,7 @@ function swift_configure_tempurls {
823 823 
 }
824 824
825 825 
 # Restore xtrace
826 
-$XTRACE
826 
+$_XTRACE_LIB_SWIFT
827 827
828 828 
 # Tell emacs to use shell-script-mode
829 829 
 ## Local variables:
lib/tempest
History View file @ f95c9a9
... ... 
@@ -38,7 +38,7 @@
38 38 
 # - init_tempest
39 39
40 40 
 # Save trace setting
41 
-XTRACE=$(set +o | grep xtrace)
41 
+_XTRACE_TEMPEST=$(set +o | grep xtrace)
42 42 
 set +o xtrace
43 43
44 44
... ... 
@@ -649,7 +649,7 @@ function init_tempest {
649 649 
 }
650 650
651 651 
 # Restore xtrace
652 
-$XTRACE
652 
+$_XTRACE_TEMPEST
653 653
654 654 
 # Tell emacs to use shell-script-mode
655 655 
 ## Local variables:
lib/template
History View file @ f95c9a9
... ... 
@@ -21,7 +21,7 @@
21 21 
 # - cleanup_XXXX
22 22
23 23 
 # Save trace setting
24 
-XTRACE=$(set +o | grep xtrace)
24 
+_XTRACE_TEMPLATE=$(set +o | grep xtrace)
25 25 
 set +o xtrace
26 26
27 27
... ... 
@@ -92,7 +92,7 @@ function stop_XXXX {
92 92 
 }
93 93
94 94 
 # Restore xtrace
95 
-$XTRACE
95 
+$_XTRACE_TEMPLATE
96 96
97 97 
 # Tell emacs to use shell-script-mode
98 98 
 ## Local variables:
stack.sh
History View file @ f95c9a9
... ... 
@@ -573,7 +573,8 @@ run_phase source
573 573
574 574 
 # Generic helper to configure passwords
575 575 
 function read_password {
576 
-    XTRACE=$(set +o | grep xtrace)
576 
+    local xtrace
577 
+    xtrace=$(set +o | grep xtrace)
577 578 
     set +o xtrace
578 579 
     var=$1; msg=$2
579 580 
     pw=${!var}
... ... 
@@ -616,7 +617,9 @@ function read_password {
616 616 
         eval "$var=$pw"
617 617 
         echo "$var=$pw" >> $localrc
618 618 
     fi
619 
-    $XTRACE
619 
+
620 
+    # restore previous xtrace value
621 
+    $xtrace
620 622 
 }
621 623
622 624