Revision a3acfc5b
b/snf-cyclades-app/synnefo/logic/backend.py | ||
---|---|---|
857 | 857 |
subnet6 = _subnet.cidr |
858 | 858 |
gateway6 = _subnet.gateway |
859 | 859 |
|
860 |
conflicts_check = False |
|
860 | 861 |
if network.public: |
861 |
conflicts_check = True |
|
862 | 862 |
tags.append('public') |
863 |
if subnet is not None: |
|
864 |
conflicts_check = True |
|
863 | 865 |
else: |
864 |
conflicts_check = False |
|
865 | 866 |
tags.append('private') |
866 | 867 |
|
867 | 868 |
# Use a dummy network subnet for IPv6 only networks. Currently Ganeti does |
... | ... | |
893 | 894 |
"""Connect a network to nodegroups.""" |
894 | 895 |
log.debug("Connecting network %s to backend %s", network, backend) |
895 | 896 |
|
896 |
if network.public: |
|
897 |
conflicts_check = False |
|
898 |
if network.public and (network.subnet4 is not None): |
|
897 | 899 |
conflicts_check = True |
898 |
else: |
|
899 |
conflicts_check = False |
|
900 | 900 |
|
901 | 901 |
depends = create_job_dependencies(depends) |
902 | 902 |
with pooled_rapi_client(backend) as client: |
Also available in: Unified diff