azure_rm_networkinterface: backport no public IP fix (#37762)

* azure_rm_networkinterface: fixed issue when public ip address should not be created (#36824)

* fixed issue when public ip address should not be created

* adding test for public ip address

* fixed samples

* another fix to sample formatting

* fixed test

* fix test

* fixed test

* another attempt to fix test

* maybe it works now

* still wrong

* improved check per customer request

* removed stupid semicolon

* updated test to match main scenario

* changed ip configurations to list

* another attempt

(cherry picked from commit 89401f13f7)

* Added changelog fragment
pull/38238/head
Jordan Borean 7 years ago committed by GitHub
parent c056b8a35c
commit 0c88f199ec
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

@ -0,0 +1,2 @@
bugfixes:
- azure_rm_networkinterface - fixed examples in module documentation and added fix to allow an IP configuration with no public IP (https://github.com/ansible/ansible/pull/36824)

@ -178,7 +178,7 @@ EXAMPLES = '''
virtual_network_name: vnet001 virtual_network_name: vnet001
subnet_name: subnet001 subnet_name: subnet001
ip_configurations: ip_configurations:
name: ipconfig1 - name: ipconfig1
public_ip_address_name: publicip001 public_ip_address_name: publicip001
primary: True primary: True
@ -189,7 +189,7 @@ EXAMPLES = '''
virtual_network_name: vnet001 virtual_network_name: vnet001
subnet_name: subnet001 subnet_name: subnet001
ip_configurations: ip_configurations:
name: ipconfig1 - name: ipconfig1
primary: True primary: True
- name: Create a network interface for use in a Windows host (opens RDP port) with custom RDP port - name: Create a network interface for use in a Windows host (opens RDP port) with custom RDP port
@ -201,7 +201,7 @@ EXAMPLES = '''
os_type: Windows os_type: Windows
rdp_port: 3399 rdp_port: 3399
ip_configurations: ip_configurations:
name: ipconfig1 - name: ipconfig1
public_ip_address_name: publicip001 public_ip_address_name: publicip001
primary: True primary: True
@ -213,7 +213,7 @@ EXAMPLES = '''
subnet_name: subnet001 subnet_name: subnet001
security_group_name: secgroup001 security_group_name: secgroup001
ip_configurations: ip_configurations:
name: ipconfig1 - name: ipconfig1
public_ip_address_name: publicip001 public_ip_address_name: publicip001
primary: True primary: True
@ -536,6 +536,10 @@ class AzureRMNetworkInterface(AzureRMModuleBase):
def get_or_create_public_ip_address(self, ip_config): def get_or_create_public_ip_address(self, ip_config):
name = ip_config.get('public_ip_address_name') name = ip_config.get('public_ip_address_name')
if not (self.public_ip and name):
return None
pip = self.get_public_ip_address(name) pip = self.get_public_ip_address(name)
if not pip: if not pip:
params = self.network_models.PublicIPAddress( params = self.network_models.PublicIPAddress(

@ -134,6 +134,22 @@
- not output.state.ip_configuration - not output.state.ip_configuration
- output.state.ip_configurations | length == 2 - output.state.ip_configurations | length == 2
- name: IP configuration without public IP
azure_rm_networkinterface:
resource_group: "{{ resource_group }}"
name: testnic001noip
security_group: testnic001
virtual_network: "{{ vn.state.id }}"
subnet: testnic001
ip_configurations:
- name: ipconfig1
primary: True
register: output
- assert:
that:
- output.state.ip_configurations[0].public_ip_address == None
- name: Delete the NIC (check mode) - name: Delete the NIC (check mode)
azure_rm_networkinterface: azure_rm_networkinterface:
resource_group: "{{ resource_group }}" resource_group: "{{ resource_group }}"

Loading…
Cancel
Save