Merge "Remove support for OpenStack MetaData version 2012-08-10"

playbooks/roles/bifrost-configdrives-dynamic/defaults/main.yml

@@ -22,9 +22,6 @@ network_mtu: 1500
 # Default ISO generation utility
 iso_gen_utility: "mkisofs"
 
-# Deprecated, remove in Queens release
-node_network_info: {}
-
 # Ensure that Ansible is using python interpreter and dependencies inside the bifrost virtual environment
 bifrost_venv_dir: "{{ lookup('env', 'VENV') or '/opt/stack/bifrost' }}"
 ansible_python_interpreter: "{{ bifrost_venv_dir + '/bin/python3' }}"

playbooks/roles/bifrost-configdrives-dynamic/tasks/main.yml

@@ -48,7 +48,7 @@
     vlan_id: "{{ vlan_id | default('') }}"
     network_mtu: "{{ network_mtu | default('1500') }}"
     nics: "{{ node_info.node.nics | default(omit) }}"
-    node_network_data: "{{ node_network_data | default(node_network_info) }}"
+    node_network_data: "{{ node_network_data | default(omit) }}"
   when: addressing_mode is undefined or "dhcp" not in addressing_mode
 
 - name: "Place network data template in each openstack/<version> folder"
@@ -57,20 +57,6 @@
     dest: "{{ variable_configdrive_location.path }}/{{ uuid }}/openstack/{{ item }}/network_data.json"
   loop: "{{ metadata_versions }}"
   when:
-    - item in metadata_versions_supporting_network_data
-    - addressing_mode is undefined or "dhcp" not in addressing_mode
-
-# TODO(TheJulia): Deprecation removal of the old network_info file name
-# should likely take place after an elongated deprecation cycle.
-# Begin deprecated in the Ocata release suggests Queens as the point
-# in which we should remove it.
-- name: "Place deprecated network info file location in each openstack/<version> folder"
-  template:
-    src: network_data.json.j2
-    dest: "{{ variable_configdrive_location.path }}/{{ uuid }}/openstack/{{ item }}/network_info.json"
-  loop: "{{ metadata_versions }}"
-  when:
-    - item in metadata_versions_supporting_network_data
     - addressing_mode is undefined or "dhcp" not in addressing_mode
 
 - name: "Make metadata folder - /openstack/content"

playbooks/roles/bifrost-configdrives-dynamic/vars/main.yml

@@ -1,9 +1,4 @@
 ---
 metadata_versions:
-  - "2012-08-10"
-  - "2015-10-15"
-  - "latest"
-
-metadata_versions_supporting_network_data:
   - "2015-10-15"
   - "latest"

releasenotes/notes/old-network-info-33a853faf6d6c6d0.yaml

@@ -0,0 +1,8 @@
+---
+upgrade:
+  - |
+    Support for the OpenStack MetaData version 2012-08-10 has been removed from
+    the ``bifrost-configdrives-dynamic`` role. The newest supported metadata
+    version is now 2015-10-15.
+  - The deprecated parameter ``node_network_info`` has been removed, use
+    ``node_network_data`` instead.

scripts/test-bifrost.sh

@@ -21,7 +21,7 @@ BOOT_MODE=${BOOT_MODE:-}
 # for the default and DHCP tests are to drive the use of Cirros as the
 # deployed operating system, and as such sets the test user to cirros,
 # and writes a debian style interfaces file out to the configuration
-# drive as cirros does not support the network_info.json format file
+# drive as cirros does not support the network_data.json format file
 # placed in the configuration drive. The "build image" test does not
 # use cirros.