diff --git a/ansible/kolla-openstack.yml b/ansible/kolla-openstack.yml
index c7b9d56a7..a1de1df1f 100644
--- a/ansible/kolla-openstack.yml
+++ b/ansible/kolla-openstack.yml
@@ -60,6 +60,7 @@
   vars:
     switch_type_to_device_type:
       arista: netmiko_arista_eos
+      cisco-nxos: netmiko_cisco_nxos
       dellos9: netmiko_dell_force10
       dellos10: netmiko_dell_os10
       dell-powerconnect: netmiko_dell_powerconnect
diff --git a/releasenotes/notes/ngs-cisco-switch-types-8ec4b0f0cff4dc0b.yaml b/releasenotes/notes/ngs-cisco-switch-types-8ec4b0f0cff4dc0b.yaml
new file mode 100644
index 000000000..aa5f323f9
--- /dev/null
+++ b/releasenotes/notes/ngs-cisco-switch-types-8ec4b0f0cff4dc0b.yaml
@@ -0,0 +1,7 @@
+---
+features:
+  - |
+    Adds support for Cisco NX-OS switches in the Neutron ``genericswitch`` ML2
+    mechanism driver configuration generated from
+    ``kolla_neutron_ml2_generic_switch_hosts``. Set ``switch_type`` to
+    ``cisco-nxos`` to use the ``netmiko_cisco_nxos`` device type.