Revision 9b5b718a

b/logic/backend.py
109 109
                raise Network.DoesNotExist("NetworkLink for link='%s' not "
110 110
                    "associated with an existing Network instance." %
111 111
                    nic['link'])
112

  
113
        firewall_profile=''
114
        if 'firewall' in nic:
115
            firewall_profile = _reverse_tags.get(nic['firewall'], '')
112
        
113
        firewall = nic.get('firewall', '')
114
        firewall_profile = _reverse_tags.get(firewall, '')
115
        if not firewall_profile and net.public:
116
            firewall_profile = settings.DEFAULT_FIREWALL_PROFILE
116 117
        
117 118
        vm.nics.create(
118 119
            network=net,
b/settings.d/20-api.conf
73 73
GANETI_FIREWALL_DISABLED_TAG = 'synnefo:network:0:disabled'
74 74
GANETI_FIREWALL_PROTECTED_TAG = 'synnefo:network:0:protected'
75 75

  
76
# The default firewall profile that will be in effect if no tags are defined
77
DEFAULT_FIREWALL_PROFILE = 'DISABLED'
78

  
76 79
# our REST API would prefer to be explicit about trailing slashes
77 80
APPEND_SLASH = False
78 81

  

Also available in: Unified diff