From 330a0c7f2b33dbae608680d8a1198cdd76901e3f Mon Sep 17 00:00:00 2001
From: Ronald van Zantvoort <ronald@pcextreme.nl>
Date: Wed, 7 Jun 2017 18:17:31 +0200
Subject: [PATCH] vRouter defer configure: Resolve merge conflicts

---
 .../patches/debian/config/opt/cloud/bin/update_config.py   | 7 ++++---
 systemvm/patches/debian/config/opt/cloud/bin/vr_cfg.sh     | 5 +++++
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/systemvm/patches/debian/config/opt/cloud/bin/update_config.py b/systemvm/patches/debian/config/opt/cloud/bin/update_config.py
index 620d042ef1a..172402744e9 100755
--- a/systemvm/patches/debian/config/opt/cloud/bin/update_config.py
+++ b/systemvm/patches/debian/config/opt/cloud/bin/update_config.py
@@ -52,15 +52,16 @@ def process(do_merge=True):
     qf.setFile(sys.argv[1])
     qf.do_merge = do_merge
     qf.load(None)
-
     return qf
 
 
 def process_file():
     print "[INFO] process_file"
     qf = process()
-    # Converge
-    finish_config()
+    # These can be safely deferred, dramatically speeding up loading times
+    if not (os.environ.get('DEFER_CONFIG', False) and sys.argv[1] in ('vm_dhcp_entry.json', 'vm_metadata.json')):
+        # Converge
+        finish_config()
 
 
 def process_vmpasswd():
diff --git a/systemvm/patches/debian/config/opt/cloud/bin/vr_cfg.sh b/systemvm/patches/debian/config/opt/cloud/bin/vr_cfg.sh
index ab16b40d6d3..a0be91cd341 100755
--- a/systemvm/patches/debian/config/opt/cloud/bin/vr_cfg.sh
+++ b/systemvm/patches/debian/config/opt/cloud/bin/vr_cfg.sh
@@ -32,6 +32,7 @@ while getopts 'c:' OPTION; do
         c) cfg="$OPTARG" ;;
 esac; done
 
+export DEFER_CONFIG=true
 while read line; do
     #comment
     if [[ $line == \#* ]]; then
@@ -78,6 +79,10 @@ done < $cfg
 # archive the configuration file
 mv $cfg /var/cache/cloud/processed/
 
+unset DEFER_CONFIG
+# trigger finish_config()
+/opt/cloud/bin/configure.py
+
 # Flush kernel conntrack table
 log_it "VR config: Flushing conntrack table"
 conntrackd -d 2> /dev/null