Commit c37c0c12 authored by Morten Knutsen's avatar Morten Knutsen

Merge branch 'library_group_changes' into 'master'

Also regenerate iptables ruleset when library groups change

See merge request !10
parents 245f1285 b75073e7
...@@ -353,8 +353,9 @@ class Generator(object): ...@@ -353,8 +353,9 @@ class Generator(object):
waitIndex=index+1, timeout=0) waitIndex=index+1, timeout=0)
index = data.etcd_index # pylint: disable=E1101 index = data.etcd_index # pylint: disable=E1101
key = data.key # pylint: disable=E1101,E1103 key = data.key # pylint: disable=E1101,E1103
if not key.startswith("/nova/iaas/instances") and not \ if not key.startswith("/nova/iaas/instances") and \
key.startswith("/nova/iaas/security_group"): not key.startswith("/nova/iaas/security_group") and \
not key.startswith("/nova/iaas/library_group"):
continue continue
time.sleep(1) time.sleep(1)
logging.debug("new config index %d", index) logging.debug("new config index %d", index)
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment