Merge "Cleaned up obsolete network-related stuff"
This commit is contained in:
commit
b4dc4456bc
|
@ -537,13 +537,11 @@ class BooleanField(forms.BooleanField, CustomPropertiesField):
|
|||
super(BooleanField, self).__init__(*args, **kwargs)
|
||||
|
||||
|
||||
# This type of field is deprecated, in future floating ip fields should be
|
||||
# implemented using a regular BooleanField
|
||||
# TODO(ativelkov, tsufiev): add a deprecated decorator
|
||||
class FloatingIpBooleanField(BooleanField):
|
||||
@with_request
|
||||
def update(self, request, environment_id, **kwargs):
|
||||
env = api.environment_get(request, environment_id)
|
||||
network_topology = env.networking.get('topology')
|
||||
if network_topology not in ('routed', 'manual'):
|
||||
self.widget.attrs['disabled'] = True
|
||||
pass
|
||||
|
||||
|
||||
class ClusterIPField(CharField):
|
||||
|
|
|
@ -165,12 +165,3 @@ except ImportError:
|
|||
|
||||
if DEBUG:
|
||||
logging.basicConfig(level=logging.DEBUG)
|
||||
|
||||
ADVANCED_NETWORKING_CONFIG = {
|
||||
# Maximum number of environments that can be processed simultaneously
|
||||
'max_environments': 100,
|
||||
# Maximum number of VMs per environment
|
||||
'max_hosts': 250,
|
||||
# Template IP address for generating environment subnet cidrs
|
||||
'env_ip_template': '10.0.0.0'
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue