rhtyd closed pull request #2979: vr: defer was broken in VR because of json
name change
URL: https://github.com/apache/cloudstack/pull/2979
This is a PR merged from a forked repository.
As GitHub hides the original diff on merge, it is displayed below for
the sake of provenance:
As this is a foreign pull request (from a fork), the diff is supplied
below (as it won't show otherwise due to GitHub magic):
diff --git a/systemvm/debian/opt/cloud/bin/update_config.py
b/systemvm/debian/opt/cloud/bin/update_config.py
index 02161b662e5..77008afb794 100755
--- a/systemvm/debian/opt/cloud/bin/update_config.py
+++ b/systemvm/debian/opt/cloud/bin/update_config.py
@@ -52,7 +52,7 @@ def process_file():
qf.setFile(sys.argv[1])
qf.load(None)
# 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')):
+ if not (os.environ.get('DEFER_CONFIG', False) and ('vm_dhcp_entry.json' in
sys.argv[1] or 'vm_metadata.json' in sys.argv[1])):
# Converge
finish_config()
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org
With regards,
Apache Git Services
