Merge "Remove config option "amp_network""

etc/octavia.conf

@@ -166,10 +166,6 @@
 #  - All networks defined in the list will be attached to each amphora
 # amp_boot_network_list =
 
-# Takes a single network id that is attached to amphorae on boot
-# Deprecated...
-# amp_network =
-
 # amp_secgroup_list =
 # client_ca = /etc/octavia/certs/ca_01.pem
 

octavia/common/config.py

@@ -239,11 +239,6 @@ controller_worker_opts = [
                 help=_('List of networks to attach to the Amphorae. '
                        'All networks defined in the list will '
                        'be attached to each amphora.')),
-    cfg.StrOpt('amp_network',
-               deprecated_for_removal=True,
-               deprecated_reason='Replaced by amp_boot_network_list.',
-               default='',
-               help=_('Network to attach to the Amphorae.')),
     cfg.ListOpt('amp_secgroup_list',
                 default='',
                 help=_('List of security groups to attach to the Amphora.')),

octavia/compute/drivers/nova_driver.py

@@ -221,10 +221,6 @@ class VirtualMachineManager(compute_base.ComputeBase):
                 if net_id in CONF.controller_worker.amp_boot_network_list:
                     lb_network_ip = interface.fixed_ips[0]['ip_address']
                     break
-                elif net_id == CONF.controller_worker.amp_network:
-                    # TODO(ptoohill) deprecated, remove this block when ready..
-                    lb_network_ip = interface.fixed_ips[0]['ip_address']
-                    break
         except Exception:
             LOG.debug('Extracting virtual interfaces through nova '
                       'os-interfaces extension failed.')

octavia/controller/worker/tasks/compute_tasks.py

@@ -55,9 +55,6 @@ class ComputeCreate(BaseComputeTask):
         """
         ports = ports or []
         network_ids = CONF.controller_worker.amp_boot_network_list[:]
-        # TODO(ptoohill) amp_network is now deprecated, remove when ready...
-        if CONF.controller_worker.amp_network:
-            network_ids.append(CONF.controller_worker.amp_network)
         config_drive_files = config_drive_files or {}
         user_data = None
         LOG.debug("Compute create execute for amphora with id %s", amphora_id)

octavia/controller/worker/tasks/network_tasks.py

@@ -49,11 +49,8 @@ class CalculateAmphoraDelta(BaseNetworkTask):
         # Figure out what networks we want
         # seed with lb network(s)
         subnet = self.network_driver.get_subnet(loadbalancer.vip.subnet_id)
-        # TODO(ptoohill): amp_network is deprecated, remove when ready...
         desired_network_ids = {subnet.network_id}.union(
             CONF.controller_worker.amp_boot_network_list)
-        if CONF.controller_worker.amp_network:
-            desired_network_ids.add(CONF.controller_worker.amp_network)
 
         for pool in loadbalancer.pools:
             member_networks = [