diff --git a/group_vars/all/neutron.yml b/group_vars/all/neutron.yml
index d85f257ae0..0294b99840 100644
--- a/group_vars/all/neutron.yml
+++ b/group_vars/all/neutron.yml
@@ -25,3 +25,11 @@ neutron_service_region: "{{ service_region }}"
 
 # Horizon consumes this var so it must be in the global vars namespace
 neutron_plugin_type: ml2.lxb
+
+# RPC - for Octavia event streamer.
+neutron_rabbitmq_userid: neutron
+neutron_rabbitmq_vhost: /neutron
+neutron_rabbitmq_port: "{{ rabbitmq_port }}"
+neutron_rabbitmq_servers: "{{ rabbitmq_servers }}"
+neutron_rabbitmq_use_ssl: "{{ rabbitmq_use_ssl }}"
+neutron_rabbitmq_host_group: "{{ rabbitmq_host_group }}"
diff --git a/group_vars/neutron_all.yml b/group_vars/neutron_all.yml
index ee275c02d0..fe64251ae6 100644
--- a/group_vars/neutron_all.yml
+++ b/group_vars/neutron_all.yml
@@ -16,14 +16,6 @@
 # These are here rather than in neutron_all because
 # both the os_ceilometer and os_neutron roles require them
 
-# RPC
-neutron_rabbitmq_userid: neutron
-neutron_rabbitmq_vhost: /neutron
-neutron_rabbitmq_port: "{{ rabbitmq_port }}"
-neutron_rabbitmq_servers: "{{ rabbitmq_servers }}"
-neutron_rabbitmq_use_ssl: "{{ rabbitmq_use_ssl }}"
-neutron_rabbitmq_host_group: "{{ rabbitmq_host_group }}"
-
 # Telemetry notifications
 neutron_rabbitmq_telemetry_userid: "{{ neutron_rabbitmq_userid }}"
 neutron_rabbitmq_telemetry_password: "{{ neutron_rabbitmq_password }}"