diff --git a/hooks/pg_gw_utils.py b/hooks/pg_gw_utils.py index 98ad4a4..5f216ee 100644 --- a/hooks/pg_gw_utils.py +++ b/hooks/pg_gw_utils.py @@ -92,7 +92,7 @@ def configure_pg_sources(): sources.truncate() sources.close() except IOError: - raise IOError('Unable to access /etc/apt/sources.list') + log('Unable to update /etc/apt/sources.list') def determine_packages(): @@ -285,22 +285,12 @@ def get_gw_interfaces(): Gateway node can have multiple interfaces. This function parses json provided in config to get all gateway interfaces for this node. ''' - node_interfaces = [] - try: - all_interfaces = json.loads(config('external-interfaces')) - except ValueError: - raise ValueError("Invalid json provided for gateway interfaces") - hostname = get_unit_hostname() - if hostname in all_interfaces: - node_interfaces = all_interfaces[hostname].split(',') - elif 'DEFAULT' in all_interfaces: - node_interfaces = all_interfaces['DEFAULT'].split(',') - for interface in node_interfaces: - if not interface_exists(interface): - log('Provided gateway interface %s does not exist' - % interface) - raise ValueError('Provided gateway interface does not exist') - return node_interfaces + interface = config('external-interfaces') + if not interface_exists(interface): + log('Provided gateway interface %s does not exist' + % interface) + raise ValueError('Provided gateway interface does not exist') + return interface def ensure_mtu(): diff --git a/templates/kilo/ifcs.conf b/templates/kilo/ifcs.conf index e7535cb..88c7091 100644 --- a/templates/kilo/ifcs.conf +++ b/templates/kilo/ifcs.conf @@ -4,4 +4,3 @@ {{ dev }} = access_phys {% endfor -%} {% endif -%} -