Merge "Fixes:ISSU support for contrail-networking Description: Reloca…

…tion and daemonization of ISSU changes ClosesBug:1534873" into R3.1
Juniper · Sep 3, 2016 · 874be3d · 874be3d
2 parents 5639491 + 90548be
commit 874be3d
Show file tree

Hide file tree

Showing 9 changed files with 13 additions and 0 deletions.
diff --git a/src/config/SConscript b/src/config/SConscript
@@ -37,6 +37,7 @@ subdirs=[
     'utils',
     'uve',
     'vnc_openstack',
+    'contrail-issu',
 ]
 
 CfgmEnv.SConscript(dirs=subdirs, exports='CfgmEnv', duplicate = 0)

diff --git a/src/config/contrail_issu/contrail_issu/__init__.py b/src/config/contrail_issu/contrail_issu/__init__.py
diff --git a/src/config/utils/issu_contrail_common.py → ...ssu/contrail_issu/issu_contrail_common.py b/src/config/utils/issu_contrail_common.py → ...ssu/contrail_issu/issu_contrail_common.py
diff --git a/src/config/utils/issu_contrail_config.py → ...ssu/contrail_issu/issu_contrail_config.py b/src/config/utils/issu_contrail_config.py → ...ssu/contrail_issu/issu_contrail_config.py
diff --git a/src/config/utils/issu_contrail_post_sync.py → .../contrail_issu/issu_contrail_post_sync.py b/src/config/utils/issu_contrail_post_sync.py → .../contrail_issu/issu_contrail_post_sync.py
diff --git a/src/config/utils/issu_contrail_pre_sync.py → ...u/contrail_issu/issu_contrail_pre_sync.py b/src/config/utils/issu_contrail_pre_sync.py → ...u/contrail_issu/issu_contrail_pre_sync.py
diff --git a/src/config/utils/issu_contrail_run_sync.py → ...u/contrail_issu/issu_contrail_run_sync.py b/src/config/utils/issu_contrail_run_sync.py → ...u/contrail_issu/issu_contrail_run_sync.py
diff --git a/src/config/utils/issu_contrail_zk_sync.py → ...su/contrail_issu/issu_contrail_zk_sync.py b/src/config/utils/issu_contrail_zk_sync.py → ...su/contrail_issu/issu_contrail_zk_sync.py
diff --git a/src/config/contrail_issu/requirements.txt b/src/config/contrail_issu/requirements.txt
@@ -0,0 +1,12 @@
+lxml>=2.3.3
+gevent==1.1a2
+geventhttpclient==1.0a
+pycassa>=1.7.2
+netaddr>=0.7.5
+bitarray>=0.8.0
+psutil>=0.4.1
+python-novaclient
+kombu
+netifaces
+bottle
+stevedore