Allow services to be both internal and external again.

Reverting part of 887518ce on Sunil's advice:

    An assumption made for the sake of simple API is that all
    externally available services are also available internally. They
    are not mutually exclusive.

    Your change will enable a service only if it is not externally
    available. For example, HTTPS is externally available. It will no
    longer be made internally available. Which is not right.

    We should either revert this line or introduce a way to mark all
    the services as internal as well and write code handle that
    properly.
This commit is contained in:
Nick Daly 2014-04-28 22:50:45 -05:00
parent 0cf051bd69
commit 9b3543c764

View File

@ -171,8 +171,7 @@ a service is automatically disabled in the firewall.</em></p>'''
service = service_module.SERVICES[service_id]
for port in service.ports:
if enabled:
if (not service.is_external and
port not in internal_enabled_services):
if port not in internal_enabled_services:
self.add_service(port, zone='internal')
if (service.is_external and