Merge pull request #25311 from ruzarowski/2015.8-Add-ability-to-attac…

…h-existing-interface [cloud:EC2] Add ability to attach an existing eni
saltstack · Jul 13, 2015 · b16d86a · b16d86a
2 parents 2fe94b7 + 2c72bd8
commit b16d86a
Showing 1 changed file with 4 additions and 0 deletions.
diff --git a/salt/cloud/clouds/ec2.py b/salt/cloud/clouds/ec2.py
@@ -1141,6 +1141,10 @@ def _create_eni_if_necessary(interface):
     '''
     Create an Elastic Interface if necessary and return a Network Interface Specification
     '''
+    if 'NetworkInterfaceId' in interface and interface['NetworkInterfaceId'] is not None:
+        return {'DeviceIndex': interface['DeviceIndex'],
+                'NetworkInterfaceId': interface['NetworkInterfaceId']}
+
     params = {'Action': 'DescribeSubnets'}
     subnet_query = aws.query(params,
                              return_root=True,