From e69b530bc0a0d3a46a542df04f015f288d8621fc Mon Sep 17 00:00:00 2001
From: Andrew Smith <ansmith@redhat.com>
Date: Fri, 18 May 2018 11:21:45 -0400
Subject: [PATCH] Restore namespace per service for oslo.messaging update

Change-Id: If4326a6848d2d32af284fdbb94798eb0b03734d5
---
 inventory/group_vars/all/neutron.yml    | 17 ++++-
 inventory/group_vars/aodh_all.yml       | 18 +++++-
 inventory/group_vars/barbican_all.yml   | 18 +++++-
 inventory/group_vars/ceilometer_all.yml | 85 ++++++++++++++++++++++++-
 inventory/group_vars/cinder_all.yml     | 18 +++++-
 inventory/group_vars/designate_all.yml  | 18 +++++-
 inventory/group_vars/glance_all.yml     | 18 +++++-
 inventory/group_vars/heat_all.yml       | 18 +++++-
 inventory/group_vars/ironic_all.yml     | 18 +++++-
 inventory/group_vars/keystone_all.yml   | 18 +++++-
 inventory/group_vars/magnum_all.yml     | 18 +++++-
 inventory/group_vars/neutron_all.yml    | 17 ++++-
 inventory/group_vars/nova_all.yml       | 28 ++++++--
 inventory/group_vars/octavia_all.yml    | 18 +++++-
 inventory/group_vars/sahara_all.yml     | 18 +++++-
 inventory/group_vars/swift_all.yml      | 13 +++-
 inventory/group_vars/tacker_all.yml     | 18 +++++-
 inventory/group_vars/trove_all.yml      | 18 +++++-
 playbooks/os-aodh-install.yml           |  4 +-
 playbooks/os-barbican-install.yml       |  4 +-
 playbooks/os-ceilometer-install.yml     |  4 +-
 playbooks/os-cinder-install.yml         |  4 +-
 playbooks/os-designate-install.yml      |  4 +-
 playbooks/os-glance-install.yml         |  4 +-
 playbooks/os-heat-install.yml           |  4 +-
 playbooks/os-ironic-install.yml         |  2 +-
 playbooks/os-keystone-install.yml       |  4 +-
 playbooks/os-magnum-install.yml         |  2 +-
 playbooks/os-neutron-install.yml        |  4 +-
 playbooks/os-nova-install.yml           |  4 +-
 playbooks/os-octavia-install.yml        |  2 +-
 playbooks/os-sahara-install.yml         |  4 +-
 playbooks/os-tacker-install.yml         |  2 +-
 playbooks/os-trove-install.yml          |  4 +-
 34 files changed, 381 insertions(+), 69 deletions(-)

diff --git a/inventory/group_vars/all/neutron.yml b/inventory/group_vars/all/neutron.yml
index 785f3a01af..a3f2f72b9c 100644
--- a/inventory/group_vars/all/neutron.yml
+++ b/inventory/group_vars/all/neutron.yml
@@ -26,14 +26,27 @@ neutron_service_region: "{{ service_region }}"
 # Horizon consumes this var so it must be in the global vars namespace
 neutron_plugin_type: ml2.lxb
 
-# TODO(ansmith): remove rabbitmq vars once service file is updated
-# to use oslomsg vars
 # Oslo Messaging
+# RPC
 neutron_oslomsg_rpc_userid: neutron
 neutron_oslomsg_rpc_vhost: /neutron
+neutron_oslomsg_rpc_transport: "{{ oslomsg_rpc_transport }}"
+neutron_oslomsg_rpc_port: "{{ oslomsg_rpc_port }}"
+neutron_oslomsg_rpc_servers: "{{ oslomsg_rpc_servers }}"
+neutron_oslomsg_rpc_use_ssl: "{{ oslomsg_rpc_use_ssl }}"
+neutron_oslomsg_rpc_host_group: "{{ oslomsg_rpc_host_group }}"
+
+# Notify
 neutron_oslomsg_notify_userid: neutron
 neutron_oslomsg_notify_vhost: /neutron
+neutron_oslomsg_notify_transport: "{{ oslomsg_notify_transport }}"
+neutron_oslomsg_notify_port: "{{ oslomsg_notify_port }}"
+neutron_oslomsg_notify_servers: "{{ oslomsg_notify_servers }}"
+neutron_oslomsg_notify_use_ssl: "{{ oslomsg_notify_use_ssl }}"
+neutron_oslomsg_notify_host_group: "{{ oslomsg_notify_host_group }}"
 
+# TODO(ansmith): remove rabbitmq vars once service file is updated
+# to use oslomsg vars
 # RPC - for Octavia event streamer.
 neutron_rabbitmq_userid: neutron
 neutron_rabbitmq_vhost: /neutron
diff --git a/inventory/group_vars/aodh_all.yml b/inventory/group_vars/aodh_all.yml
index 0959f1c423..d296063cb9 100644
--- a/inventory/group_vars/aodh_all.yml
+++ b/inventory/group_vars/aodh_all.yml
@@ -19,13 +19,27 @@ aodh_galera_database: aodh
 aodh_galera_address: "{{ internal_lb_vip_address }}"
 aodh_connection_string: "mysql+pymysql://{{ aodh_galera_user }}:{{ aodh_container_db_password }}@{{ aodh_galera_address }}/{{ aodh_galera_database }}?charset=utf8"
 
-# TODO(ansmith): remove rabbitmq vars once service file is updated
-# to use oslomsg vars
+# Oslo Messaging
+# RPC
 aodh_oslomsg_rpc_userid: aodh
 aodh_oslomsg_rpc_vhost: /aodh
+aodh_oslomsg_rpc_transport: "{{ oslomsg_rpc_transport }}"
+aodh_oslomsg_rpc_port: "{{ oslomsg_rpc_port }}"
+aodh_oslomsg_rpc_servers: "{{ oslomsg_rpc_servers }}"
+aodh_oslomsg_rpc_use_ssl: "{{ oslomsg_rpc_use_ssl }}"
+aodh_oslomsg_rpc_host_group: "{{ oslomsg_rpc_host_group }}"
+
+# Notify
 aodh_oslomsg_notify_userid: aodh
 aodh_oslomsg_notify_vhost: /aodh
+aodh_oslomsg_notify_transport: "{{ oslomsg_notify_transport }}"
+aodh_oslomsg_notify_port: "{{ oslomsg_notify_port }}"
+aodh_oslomsg_notify_servers: "{{ oslomsg_notify_servers }}"
+aodh_oslomsg_notify_use_ssl: "{{ oslomsg_notify_use_ssl }}"
+aodh_oslomsg_notify_host_group: "{{ oslomsg_notify_host_group }}"
 
+# TODO(ansmith): remove rabbitmq vars once service file is updated
+# to use oslomsg vars
 aodh_rabbitmq_host_group: "{{ rabbitmq_host_group }}"
 
 aodh_service_in_ldap: "{{ service_ldap_backend_enabled }}"
diff --git a/inventory/group_vars/barbican_all.yml b/inventory/group_vars/barbican_all.yml
index 18f7af194e..0b6c046c0a 100644
--- a/inventory/group_vars/barbican_all.yml
+++ b/inventory/group_vars/barbican_all.yml
@@ -21,13 +21,27 @@ barbican_galera_address: "{{ galera_address }}"
 barbican_galera_database: barbican
 barbican_galera_user: barbican
 
-# TODO(ansmith): remove rabbitmq vars once service file is updated
-# to use oslomsg vars
+# Oslo Messaging
+# RPC
 barbican_oslomsg_rpc_userid: barbican
 barbican_oslomsg_rpc_vhost: /barbican
+barbican_oslomsg_rpc_transport: "{{ oslomsg_rpc_transport }}"
+barbican_oslomsg_rpc_port: "{{ oslomsg_rpc_port }}"
+barbican_oslomsg_rpc_servers: "{{ oslomsg_rpc_servers }}"
+barbican_oslomsg_rpc_use_ssl: "{{ oslomsg_rpc_use_ssl }}"
+barbican_oslomsg_rpc_host_group: "{{ oslomsg_rpc_host_group }}"
+
+# Notify
 barbican_oslomsg_notify_userid: barbican
 barbican_oslomsg_notify_vhost: /barbican
+barbican_oslomsg_notify_transport: "{{ oslomsg_notify_transport }}"
+barbican_oslomsg_notify_port: "{{ oslomsg_notify_port }}"
+barbican_oslomsg_notify_servers: "{{ oslomsg_notify_servers }}"
+barbican_oslomsg_notify_use_ssl: "{{ oslomsg_notify_use_ssl }}"
+barbican_oslomsg_notify_host_group: "{{ oslomsg_notify_host_group }}"
 
+# TODO(ansmith): remove rabbitmq vars once service file is updated
+# to use oslomsg vars
 barbican_rabbitmq_host_group: "{{ rabbitmq_host_group }}"
 barbican_rabbitmq_port: "{{ rabbitmq_port }}"
 barbican_rabbitmq_servers: "{{ rabbitmq_servers }}"
diff --git a/inventory/group_vars/ceilometer_all.yml b/inventory/group_vars/ceilometer_all.yml
index 3ad09c4d6c..340be3f5fb 100644
--- a/inventory/group_vars/ceilometer_all.yml
+++ b/inventory/group_vars/ceilometer_all.yml
@@ -16,13 +16,27 @@
 ceilometer_service_user_name: "{{ hostvars['localhost']['ceilometer_service_user_name'] }}"
 ceilometer_service_tenant_name: "{{ hostvars['localhost']['ceilometer_service_tenant_name'] }}"
 
-# TODO(ansmith): remove rabbitmq vars once service file is updated
-# to use oslomsg vars
+# Oslo Messaging
+# RPC
 ceilometer_oslomsg_rpc_userid: ceilometer
 ceilometer_oslomsg_rpc_vhost: /ceilometer
+ceilometer_oslomsg_rpc_transport: "{{ oslomsg_rpc_transport }}"
+ceilometer_oslomsg_rpc_port: "{{ oslomsg_rpc_port }}"
+ceilometer_oslomsg_rpc_servers: "{{ oslomsg_rpc_servers }}"
+ceilometer_oslomsg_rpc_use_ssl: "{{ oslomsg_rpc_use_ssl }}"
+ceilometer_oslomsg_rpc_host_group: "{{ oslomsg_rpc_host_group }}"
+
+# Notify
 ceilometer_oslomsg_notify_userid: ceilometer
 ceilometer_oslomsg_notify_vhost: /ceilometer
+ceilometer_oslomsg_notify_transport: "{{ oslomsg_notify_transport }}"
+ceilometer_oslomsg_notify_port: "{{ oslomsg_notify_port }}"
+ceilometer_oslomsg_notify_servers: "{{ oslomsg_notify_servers }}"
+ceilometer_oslomsg_notify_use_ssl: "{{ oslomsg_notify_use_ssl }}"
+ceilometer_oslomsg_notify_host_group: "{{ oslomsg_notify_host_group }}"
 
+# TODO(ansmith): remove rabbitmq vars once service file is updated
+# to use oslomsg vars
 # These are here rather than in ceilometer_all because
 # both the os_ceilometer and os_swift roles require them
 ceilometer_rabbitmq_userid: ceilometer
@@ -60,6 +74,73 @@ swift_system_shell: "{{ hostvars['localhost']['swift_system_shell'] }}"
 swift_system_comment: "{{ hostvars['localhost']['swift_system_comment'] }}"
 swift_system_home_folder: "{{ hostvars['localhost']['swift_system_home_folder'] }}"
 
+# Oslo.messaging notifications for telemetry
+glance_oslomsg_notify_userid: glance
+glance_oslomsg_notify_vhost: /glance
+glance_oslomsg_notify_password: "{{ glance_oslomsg_notify_password }}"
+glance_oslomsg_notify_transport: "{{ oslomsg_notify_transport }}"
+glance_oslomsg_notify_port: "{{ oslomsg_notify_port }}"
+glance_oslomsg_notify_use_ssl: "{{ oslomsg_notify_use_ssl }}"
+glance_oslomsg_notify_host_group: "{{ oslomsg_notify_host_group }}"
+
+cinder_oslomsg_notify_userid: cinder
+cinder_oslomsg_notify_vhost: /cinder
+cinder_oslomsg_notify_password: "{{ cinder_oslomsg_notify_password }}"
+cinder_oslomsg_notify_transport: "{{ oslomsg_notify_transport }}"
+cinder_oslomsg_notify_port: "{{ oslomsg_notify_port }}"
+cinder_oslomsg_notify_use_ssl: "{{ oslomsg_notify_use_ssl }}"
+cinder_oslomsg_notify_host_group: "{{ oslomsg_notify_host_group }}"
+
+nova_oslomsg_notify_userid: nova
+nova_oslomsg_notify_vhost: /nova
+nova_oslomsg_notify_password: "{{ nova_oslomsg_notify_password }}"
+nova_oslomsg_notify_transport: "{{ oslomsg_notify_transport }}"
+nova_oslomsg_notify_port: "{{ oslomsg_notify_port }}"
+nova_oslomsg_notify_use_ssl: "{{ oslomsg_notify_use_ssl }}"
+nova_oslomsg_notify_host_group: "{{ oslomsg_notify_host_group }}"
+
+heat_oslomsg_notify_userid: heat
+heat_oslomsg_notify_vhost: /heat
+heat_oslomsg_notify_password: "{{ heat_oslomsg_notify_password }}"
+heat_oslomsg_notify_transport: "{{ oslomsg_notify_transport }}"
+heat_oslomsg_notify_port: "{{ oslomsg_notify_port }}"
+heat_oslomsg_notify_use_ssl: "{{ oslomsg_notify_use_ssl }}"
+heat_oslomsg_notify_host_group: "{{ oslomsg_notify_host_group }}"
+
+keystone_oslomsg_notify_userid: keystone
+keystone_oslomsg_notify_vhost: /keystone
+keystone_oslomsg_notify_password: "{{ keystone_oslomsg_notify_password }}"
+keystone_oslomsg_notify_transport: "{{ oslomsg_notify_transport }}"
+keystone_oslomsg_notify_port: "{{ oslomsg_notify_port }}"
+keystone_oslomsg_notify_use_ssl: "{{ oslomsg_notify_use_ssl }}"
+keystone_oslomsg_notify_host_group: "{{ oslomsg_notify_host_group }}"
+
+neutron_oslomsg_notify_userid: neutron
+neutron_oslomsg_notify_vhost: /neutron
+neutron_oslomsg_notify_password: "{{ neutron_oslomsg_notify_password }}"
+neutron_oslomsg_notify_transport: "{{ oslomsg_notify_transport }}"
+neutron_oslomsg_notify_port: "{{ oslomsg_notify_port }}"
+neutron_oslomsg_notify_use_ssl: "{{ oslomsg_notify_use_ssl }}"
+neutron_oslomsg_notify_host_group: "{{ oslomsg_notify_host_group }}"
+
+swift_oslomsg_notify_userid: swift
+swift_oslomsg_notify_vhost: /swift
+swift_oslomsg_notify_password: "{{ swift_oslomsg_notify_password }}"
+swift_oslomsg_notify_transport: "{{ oslomsg_notify_transport }}"
+swift_oslomsg_notify_port: "{{ oslomsg_notify_port }}"
+swift_oslomsg_notify_use_ssl: "{{ oslomsg_notify_use_ssl }}"
+swift_oslomsg_notify_host_group: "{{ oslomsg_notify_host_group }}"
+
+sahara_oslomsg_notify_userid: sahara
+sahara_oslomsg_notify_vhost: /sahara
+sahara_oslomsg_notify_password: "{{ sahara_oslomsg_notify_password }}"
+sahara_oslomsg_notify_transport: "{{ oslomsg_notify_transport }}"
+sahara_oslomsg_notify_port: "{{ oslomsg_notify_port }}"
+sahara_oslomsg_notify_use_ssl: "{{ oslomsg_notify_use_ssl }}"
+sahara_oslomsg_notify_host_group: "{{ oslomsg_notify_host_group }}"
+
+# TODO(ansmith): remove rabbitmq vars once service file is updated
+# to use oslomsg vars
 # Telemetry notifications
 glance_rabbitmq_telemetry_host_group: "{{ rabbitmq_host_group }}"
 glance_rabbitmq_telemetry_userid: glance
diff --git a/inventory/group_vars/cinder_all.yml b/inventory/group_vars/cinder_all.yml
index 8a0b2cecee..0b711a9e31 100644
--- a/inventory/group_vars/cinder_all.yml
+++ b/inventory/group_vars/cinder_all.yml
@@ -20,13 +20,27 @@ cinder_service_backup_program_enabled: "{{ hostvars['localhost']['cinder_service
 # These are here rather than in cinder_all because
 # both the os_ceilometer and os_cinder roles require them
 
-# TODO(ansmith): remove rabbitmq vars once service file is updated
-# to use oslomsg vars
+# Oslo Messaging
+# RPC
 cinder_oslomsg_rpc_userid: cinder
 cinder_oslomsg_rpc_vhost: /cinder
+cinder_oslomsg_rpc_transport: "{{ oslomsg_rpc_transport }}"
+cinder_oslomsg_rpc_port: "{{ oslomsg_rpc_port }}"
+cinder_oslomsg_rpc_servers: "{{ oslomsg_rpc_servers }}"
+cinder_oslomsg_rpc_use_ssl: "{{ oslomsg_rpc_use_ssl }}"
+cinder_oslomsg_rpc_host_group: "{{ oslomsg_rpc_host_group }}"
+
+# Notify
 cinder_oslomsg_notify_userid: cinder
 cinder_oslomsg_notify_vhost: /cinder
+cinder_oslomsg_notify_transport: "{{ oslomsg_notify_transport }}"
+cinder_oslomsg_notify_port: "{{ oslomsg_notify_port }}"
+cinder_oslomsg_notify_servers: "{{ oslomsg_notify_servers }}"
+cinder_oslomsg_notify_use_ssl: "{{ oslomsg_notify_use_ssl }}"
+cinder_oslomsg_notify_host_group: "{{ oslomsg_notify_host_group }}"
 
+# TODO(ansmith): remove rabbitmq vars once service file is updated
+# to use oslomsg vars
 # RPC
 cinder_rabbitmq_userid: cinder
 cinder_rabbitmq_vhost: /cinder
diff --git a/inventory/group_vars/designate_all.yml b/inventory/group_vars/designate_all.yml
index 93243cac30..26a3e220d6 100644
--- a/inventory/group_vars/designate_all.yml
+++ b/inventory/group_vars/designate_all.yml
@@ -18,13 +18,27 @@ designate_galera_address: "{{ galera_address }}"
 designate_galera_user: designate
 designate_galera_database_name: designate
 
-# TODO(ansmith): remove rabbitmq vars once service file is updated
-# to use oslomsg vars
+# Oslo Messaging
+# RPC
 designate_oslomsg_rpc_userid: designate
 designate_oslomsg_rpc_vhost: /designate
+designate_oslomsg_rpc_transport: "{{ oslomsg_rpc_transport }}"
+designate_oslomsg_rpc_port: "{{ oslomsg_rpc_port }}"
+designate_oslomsg_rpc_servers: "{{ oslomsg_rpc_servers }}"
+designate_oslomsg_rpc_use_ssl: "{{ oslomsg_rpc_use_ssl }}"
+designate_oslomsg_rpc_host_group: "{{ oslomsg_rpc_host_group }}"
+
+# Notify
 designate_oslomsg_notify_userid: designate
 designate_oslomsg_notify_vhost: /designate
+designate_oslomsg_notify_transport: "{{ oslomsg_notify_transport }}"
+designate_oslomsg_notify_port: "{{ oslomsg_notify_port }}"
+designate_oslomsg_notify_servers: "{{ oslomsg_notify_servers }}"
+designate_oslomsg_notify_use_ssl: "{{ oslomsg_notify_use_ssl }}"
+designate_oslomsg_notify_host_group: "{{ oslomsg_notify_host_group }}"
 
+# TODO(ansmith): remove rabbitmq vars once service file is updated
+# to use oslomsg vars
 # RPC
 designate_rabbitmq_userid: designate
 designate_rabbitmq_vhost: /designate
diff --git a/inventory/group_vars/glance_all.yml b/inventory/group_vars/glance_all.yml
index 4f726319f9..130a1c7fec 100644
--- a/inventory/group_vars/glance_all.yml
+++ b/inventory/group_vars/glance_all.yml
@@ -13,13 +13,27 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-# TODO(ansmith): remove rabbitmq vars once service file is updated
-# to use oslomsg vars
+# Oslo Messaging
+# RPC
 glance_oslomsg_rpc_userid: glance
 glance_oslomsg_rpc_vhost: /glance
+glance_oslomsg_rpc_transport: "{{ oslomsg_rpc_transport }}"
+glance_oslomsg_rpc_port: "{{ oslomsg_rpc_port }}"
+glance_oslomsg_rpc_servers: "{{ oslomsg_rpc_servers }}"
+glance_oslomsg_rpc_use_ssl: "{{ oslomsg_rpc_use_ssl }}"
+glance_oslomsg_rpc_host_group: "{{ oslomsg_rpc_host_group }}"
+
+# Notify
 glance_oslomsg_notify_userid: glance
 glance_oslomsg_notify_vhost: /glance
+glance_oslomsg_notify_transport: "{{ oslomsg_notify_transport }}"
+glance_oslomsg_notify_port: "{{ oslomsg_notify_port }}"
+glance_oslomsg_notify_servers: "{{ oslomsg_notify_servers }}"
+glance_oslomsg_notify_use_ssl: "{{ oslomsg_notify_use_ssl }}"
+glance_oslomsg_notify_host_group: "{{ oslomsg_notify_host_group }}"
 
+# TODO(ansmith): remove rabbitmq vars once service file is updated
+# to use oslomsg vars
 # RPC
 glance_rabbitmq_userid: glance
 glance_rabbitmq_vhost: /glance
diff --git a/inventory/group_vars/heat_all.yml b/inventory/group_vars/heat_all.yml
index c01d763328..f267c81d38 100644
--- a/inventory/group_vars/heat_all.yml
+++ b/inventory/group_vars/heat_all.yml
@@ -13,13 +13,27 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-# TODO(ansmith): remove rabbitmq vars once service file is updated
-# to use oslomsg vars
+# Oslo Messaging
+# RPC
 heat_oslomsg_rpc_userid: heat
 heat_oslomsg_rpc_vhost: /heat
+heat_oslomsg_rpc_transport: "{{ oslomsg_rpc_transport }}"
+heat_oslomsg_rpc_port: "{{ oslomsg_rpc_port }}"
+heat_oslomsg_rpc_servers: "{{ oslomsg_rpc_servers }}"
+heat_oslomsg_rpc_use_ssl: "{{ oslomsg_rpc_use_ssl }}"
+heat_oslomsg_rpc_host_group: "{{ oslomsg_rpc_host_group }}"
+
+# Notify
 heat_oslomsg_notify_userid: heat
 heat_oslomsg_notify_vhost: /heat
+heat_oslomsg_notify_transport: "{{ oslomsg_notify_transport }}"
+heat_oslomsg_notify_port: "{{ oslomsg_notify_port }}"
+heat_oslomsg_notify_servers: "{{ oslomsg_notify_servers }}"
+heat_oslomsg_notify_use_ssl: "{{ oslomsg_notify_use_ssl }}"
+heat_oslomsg_notify_host_group: "{{ oslomsg_notify_host_group }}"
 
+# TODO(ansmith): remove rabbitmq vars once service file is updated
+# to use oslomsg vars
 # RPC
 heat_rabbitmq_userid: heat
 heat_rabbitmq_vhost: /heat
diff --git a/inventory/group_vars/ironic_all.yml b/inventory/group_vars/ironic_all.yml
index 6ff7a81a5b..ee6dea173d 100644
--- a/inventory/group_vars/ironic_all.yml
+++ b/inventory/group_vars/ironic_all.yml
@@ -13,13 +13,27 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-# TODO(ansmith): remove rabbitmq vars once service file is updated
-# to use oslomsg vars
+# Oslo Messaging
+# RPC
 ironic_oslomsg_rpc_userid: ironic
 ironic_oslomsg_rpc_vhost: /ironic
+ironic_oslomsg_rpc_transport: "{{ oslomsg_rpc_transport }}"
+ironic_oslomsg_rpc_port: "{{ oslomsg_rpc_port }}"
+ironic_oslomsg_rpc_servers: "{{ oslomsg_rpc_servers }}"
+ironic_oslomsg_rpc_use_ssl: "{{ oslomsg_rpc_use_ssl }}"
+ironic_oslomsg_rpc_host_group: "{{ oslomsg_rpc_host_group }}"
+
+# Notify
 ironic_oslomsg_notify_userid: ironic
 ironic_oslomsg_notify_vhost: /ironic
+ironic_oslomsg_notify_transport: "{{ oslomsg_notify_transport }}"
+ironic_oslomsg_notify_port: "{{ oslomsg_notify_port }}"
+ironic_oslomsg_notify_servers: "{{ oslomsg_notify_servers }}"
+ironic_oslomsg_notify_use_ssl: "{{ oslomsg_notify_use_ssl }}"
+ironic_oslomsg_notify_host_group: "{{ oslomsg_notify_host_group }}"
 
+# TODO(ansmith): remove rabbitmq vars once service file is updated
+# to use oslomsg vars
 ironic_rabbitmq_userid: ironic
 ironic_rabbitmq_vhost: /ironic
 ironic_rabbitmq_port: "{{ rabbitmq_port }}"
diff --git a/inventory/group_vars/keystone_all.yml b/inventory/group_vars/keystone_all.yml
index a72610fccb..ab83be3571 100644
--- a/inventory/group_vars/keystone_all.yml
+++ b/inventory/group_vars/keystone_all.yml
@@ -16,13 +16,27 @@
 # These are here rather than in keystone_all because
 # both the os_ceilometer and os_keystone roles require them
 
-# TODO(ansmith): remove rabbitmq vars once service file is updated
-# to use oslomsg vars
+# Oslo Messaging
+# RPC
 keystone_oslomsg_rpc_userid: keystone
 keystone_oslomsg_rpc_vhost: /keystone
+keystone_oslomsg_rpc_transport: "{{ oslomsg_rpc_transport }}"
+keystone_oslomsg_rpc_port: "{{ oslomsg_rpc_port }}"
+keystone_oslomsg_rpc_servers: "{{ oslomsg_rpc_servers }}"
+keystone_oslomsg_rpc_use_ssl: "{{ oslomsg_rpc_use_ssl }}"
+keystone_oslomsg_rpc_host_group: "{{ oslomsg_rpc_host_group }}"
+
+# Notify
 keystone_oslomsg_notify_userid: keystone
 keystone_oslomsg_notify_vhost: /keystone
+keystone_oslomsg_notify_transport: "{{ oslomsg_notify_transport }}"
+keystone_oslomsg_notify_port: "{{ oslomsg_notify_port }}"
+keystone_oslomsg_notify_servers: "{{ oslomsg_notify_servers }}"
+keystone_oslomsg_notify_use_ssl: "{{ oslomsg_notify_use_ssl }}"
+keystone_oslomsg_notify_host_group: "{{ oslomsg_notify_host_group }}"
 
+# TODO(ansmith): remove rabbitmq vars once service file is updated
+# to use oslomsg vars
 # RPC
 keystone_rabbitmq_userid: keystone
 keystone_rabbitmq_vhost: /keystone
diff --git a/inventory/group_vars/magnum_all.yml b/inventory/group_vars/magnum_all.yml
index f31d0ab9f7..01bb4b1310 100644
--- a/inventory/group_vars/magnum_all.yml
+++ b/inventory/group_vars/magnum_all.yml
@@ -27,13 +27,27 @@ magnum_galera_user: magnum
 magnum_galera_database_name: magnum_service
 magnum_galera_address: "{{ galera_address }}"
 
-# TODO(ansmith): remove rabbitmq vars once service file is updated
-# to use oslomsg vars
+# Oslo Messaging
+# RPC
 magnum_oslomsg_rpc_userid: magnum
 magnum_oslomsg_rpc_vhost: /magnum
+magnum_oslomsg_rpc_transport: "{{ oslomsg_rpc_transport }}"
+magnum_oslomsg_rpc_port: "{{ oslomsg_rpc_port }}"
+magnum_oslomsg_rpc_servers: "{{ oslomsg_rpc_servers }}"
+magnum_oslomsg_rpc_use_ssl: "{{ oslomsg_rpc_use_ssl }}"
+magnum_oslomsg_rpc_host_group: "{{ oslomsg_rpc_host_group }}"
+
+# Notify
 magnum_oslomsg_notify_userid: magnum
 magnum_oslomsg_notify_vhost: /magnum
+magnum_oslomsg_notify_transport: "{{ oslomsg_notify_transport }}"
+magnum_oslomsg_notify_port: "{{ oslomsg_notify_port }}"
+magnum_oslomsg_notify_servers: "{{ oslomsg_notify_servers }}"
+magnum_oslomsg_notify_use_ssl: "{{ oslomsg_notify_use_ssl }}"
+magnum_oslomsg_notify_host_group: "{{ oslomsg_notify_host_group }}"
 
+# TODO(ansmith): remove rabbitmq vars once service file is updated
+# to use oslomsg vars
 magnum_rabbitmq_userid: magnum
 magnum_rabbitmq_vhost: /magnum
 magnum_rabbitmq_port: "{{ rabbitmq_port }}"
diff --git a/inventory/group_vars/neutron_all.yml b/inventory/group_vars/neutron_all.yml
index 9675eed92e..73a4b8b26a 100644
--- a/inventory/group_vars/neutron_all.yml
+++ b/inventory/group_vars/neutron_all.yml
@@ -16,14 +16,27 @@
 # These are here rather than in neutron_all because
 # both the os_ceilometer and os_neutron roles require them
 
-# TODO(ansmith): remove rabbitmq vars once service file is updated
-# to use oslomsg vars
 # Oslo Messaging
+# RPC
 neutron_oslomsg_rpc_userid: neutron
 neutron_oslomsg_rpc_vhost: /neutron
+neutron_oslomsg_rpc_transport: "{{ oslomsg_rpc_transport }}"
+neutron_oslomsg_rpc_port: "{{ oslomsg_rpc_port }}"
+neutron_oslomsg_rpc_servers: "{{ oslomsg_rpc_servers }}"
+neutron_oslomsg_rpc_use_ssl: "{{ oslomsg_rpc_use_ssl }}"
+neutron_oslomsg_rpc_host_group: "{{ oslomsg_rpc_host_group }}"
+
+# Notify
 neutron_oslomsg_notify_userid: neutron
 neutron_oslomsg_notify_vhost: /neutron
+neutron_oslomsg_notify_transport: "{{ oslomsg_notify_transport }}"
+neutron_oslomsg_notify_port: "{{ oslomsg_notify_port }}"
+neutron_oslomsg_notify_servers: "{{ oslomsg_notify_servers }}"
+neutron_oslomsg_notify_use_ssl: "{{ oslomsg_notify_use_ssl }}"
+neutron_oslomsg_notify_host_group: "{{ oslomsg_notify_host_group }}"
 
+# TODO(ansmith): remove rabbitmq vars once service file is updated
+# to use oslomsg vars
 # Telemetry notifications
 neutron_rabbitmq_telemetry_userid: "{{ neutron_rabbitmq_userid }}"
 neutron_rabbitmq_telemetry_password: "{{ neutron_rabbitmq_password }}"
diff --git a/inventory/group_vars/nova_all.yml b/inventory/group_vars/nova_all.yml
index d4e504671c..31fd7ab8af 100644
--- a/inventory/group_vars/nova_all.yml
+++ b/inventory/group_vars/nova_all.yml
@@ -29,6 +29,27 @@ nova_console_port: "{% if nova_console_type == 'spice' %}{{ nova_spice_html5prox
 # These are here rather than in nova_all because
 # both the os_ceilometer and os_nova roles require them
 
+# Oslo Messaging
+# RPC
+nova_oslomsg_rpc_userid: nova
+nova_oslomsg_rpc_vhost: /nova
+nova_oslomsg_rpc_transport: "{{ oslomsg_rpc_transport }}"
+nova_oslomsg_rpc_port: "{{ oslomsg_rpc_port }}"
+nova_oslomsg_rpc_servers: "{{ oslomsg_rpc_servers }}"
+nova_oslomsg_rpc_use_ssl: "{{ oslomsg_rpc_use_ssl }}"
+nova_oslomsg_rpc_host_group: "{{ oslomsg_rpc_host_group }}"
+
+# Notify
+nova_oslomsg_notify_userid: nova
+nova_oslomsg_notify_vhost: /nova
+nova_oslomsg_notify_transport: "{{ oslomsg_notify_transport }}"
+nova_oslomsg_notify_port: "{{ oslomsg_notify_port }}"
+nova_oslomsg_notify_servers: "{{ oslomsg_notify_servers }}"
+nova_oslomsg_notify_use_ssl: "{{ oslomsg_notify_use_ssl }}"
+nova_oslomsg_notify_host_group: "{{ oslomsg_notify_host_group }}"
+
+# TODO(ansmith): remove rabbitmq vars once service file is updated
+# to use oslomsg vars
 # RPC
 nova_rabbitmq_userid: nova
 nova_rabbitmq_vhost: /nova
@@ -46,13 +67,6 @@ nova_rabbitmq_telemetry_servers: "{{ nova_rabbitmq_servers }}"
 nova_rabbitmq_telemetry_use_ssl: "{{ nova_rabbitmq_use_ssl }}"
 nova_rabbitmq_telemetry_host_group: "{{ nova_rabbitmq_host_group }}"
 
-# TODO(ansmith): remove rabbitmq vars once service file is updated
-# to use oslomsg vars
-nova_oslomsg_rpc_userid: nova
-nova_oslomsg_rpc_vhost: /nova
-nova_oslomsg_notify_userid: nova
-nova_oslomsg_notify_vhost: /nova
-
 # If there are any Designate hosts in the environment, then enable its usage
 nova_designate_enabled: "{{ (groups['designate_all'] is defined) and (groups['designate_all'] | length > 0) }}"
 # If there are any Ceilometer hosts in the environment, then enable its usage
diff --git a/inventory/group_vars/octavia_all.yml b/inventory/group_vars/octavia_all.yml
index 734d628794..4a8438e2c5 100644
--- a/inventory/group_vars/octavia_all.yml
+++ b/inventory/group_vars/octavia_all.yml
@@ -16,13 +16,27 @@
 octavia_service_internalurl: "{{ octavia_service_internaluri }}/v1/%(project_id)s"
 octavia_service_user_name: octavia
 
-# TODO(ansmith): remove rabbitmq vars once service file is updated
-# to use oslomsg vars
+# Oslo Messaging
+# RPC
 octavia_oslomsg_rpc_userid: octavia
 octavia_oslomsg_rpc_vhost: /octavia
+octavia_oslomsg_rpc_transport: "{{ oslomsg_rpc_transport }}"
+octavia_oslomsg_rpc_port: "{{ oslomsg_rpc_port }}"
+octavia_oslomsg_rpc_servers: "{{ oslomsg_rpc_servers }}"
+octavia_oslomsg_rpc_use_ssl: "{{ oslomsg_rpc_use_ssl }}"
+octavia_oslomsg_rpc_host_group: "{{ oslomsg_rpc_host_group }}"
+
+# Notify
 octavia_oslomsg_notify_userid: octavia
 octavia_oslomsg_notify_vhost: /octavia
+octavia_oslomsg_notify_transport: "{{ oslomsg_notify_transport }}"
+octavia_oslomsg_notify_port: "{{ oslomsg_notify_port }}"
+octavia_oslomsg_notify_servers: "{{ oslomsg_notify_servers }}"
+octavia_oslomsg_notify_use_ssl: "{{ oslomsg_notify_use_ssl }}"
+octavia_oslomsg_notify_host_group: "{{ oslomsg_notify_host_group }}"
 
+# TODO(ansmith): remove rabbitmq vars once service file is updated
+# to use oslomsg vars
 # RPC
 octavia_rabbitmq_userid: octavia
 octavia_rabbitmq_vhost: /octavia
diff --git a/inventory/group_vars/sahara_all.yml b/inventory/group_vars/sahara_all.yml
index 38f681ae9e..5cd78d7b8e 100644
--- a/inventory/group_vars/sahara_all.yml
+++ b/inventory/group_vars/sahara_all.yml
@@ -11,13 +11,27 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-# TODO(ansmith): remove rabbitmq vars once service file is updated
-# to use oslomsg vars
+# Oslo Messaging
+# RPC
 sahara_oslomsg_rpc_userid: sahara
 sahara_oslomsg_rpc_vhost: /sahara
+sahara_oslomsg_rpc_transport: "{{ oslomsg_rpc_transport }}"
+sahara_oslomsg_rpc_port: "{{ oslomsg_rpc_port }}"
+sahara_oslomsg_rpc_servers: "{{ oslomsg_rpc_servers }}"
+sahara_oslomsg_rpc_use_ssl: "{{ oslomsg_rpc_use_ssl }}"
+sahara_oslomsg_rpc_host_group: "{{ oslomsg_rpc_host_group }}"
+
+# Notify
 sahara_oslomsg_notify_userid: sahara
 sahara_oslomsg_notify_vhost: /sahara
+sahara_oslomsg_notify_transport: "{{ oslomsg_notify_transport }}"
+sahara_oslomsg_notify_port: "{{ oslomsg_notify_port }}"
+sahara_oslomsg_notify_servers: "{{ oslomsg_notify_servers }}"
+sahara_oslomsg_notify_use_ssl: "{{ oslomsg_notify_use_ssl }}"
+sahara_oslomsg_notify_host_group: "{{ oslomsg_notify_host_group }}"
 
+# TODO(ansmith): remove rabbitmq vars once service file is updated
+# to use oslomsg vars
 #RPC
 sahara_rabbitmq_userid: sahara
 sahara_rabbitmq_vhost: /sahara
diff --git a/inventory/group_vars/swift_all.yml b/inventory/group_vars/swift_all.yml
index e253a0ad52..605530390e 100644
--- a/inventory/group_vars/swift_all.yml
+++ b/inventory/group_vars/swift_all.yml
@@ -19,13 +19,22 @@ swift_system_shell: "{{ hostvars['localhost']['swift_system_shell'] }}"
 swift_system_comment: "{{ hostvars['localhost']['swift_system_comment'] }}"
 swift_system_home_folder: "{{ hostvars['localhost']['swift_system_home_folder'] }}"
 
-# TODO(ansmith): remove rabbitmq vars once service file is updated
-# to use oslomsg vars
+# Oslo Messaging
+# RPC
 swift_oslomsg_rpc_userid: swift
 swift_oslomsg_rpc_vhost: /swift
+
+# Notify
 swift_oslomsg_notify_userid: swift
 swift_oslomsg_notify_vhost: /swift
+swift_oslomsg_notify_transport: "{{ oslomsg_notify_transport }}"
+swift_oslomsg_notify_port: "{{ oslomsg_notify_port }}"
+swift_oslomsg_notify_servers: "{{ oslomsg_notify_servers }}"
+swift_oslomsg_notify_use_ssl: "{{ oslomsg_notify_use_ssl }}"
+swift_oslomsg_notify_host_group: "{{ oslomsg_notify_host_group }}"
 
+# TODO(ansmith): remove rabbitmq vars once service file is updated
+# to use oslomsg vars
 # Swift Telemetry notifications
 swift_rabbitmq_telemetry_userid: "swift"
 swift_rabbitmq_telemetry_vhost: "/swift"
diff --git a/inventory/group_vars/tacker_all.yml b/inventory/group_vars/tacker_all.yml
index 6378d20f79..1ce4aa69f7 100644
--- a/inventory/group_vars/tacker_all.yml
+++ b/inventory/group_vars/tacker_all.yml
@@ -16,13 +16,27 @@
 tacker_service_user_name: tacker
 tacker_service_tenant_name: service
 
-# TODO(ansmith): remove rabbitmq vars once service file is updated
-# to use oslomsg vars
+# Oslo Messaging
+# RPC
 tacker_oslomsg_rpc_userid: tacker
 tacker_oslomsg_rpc_vhost: /tacker
+tacker_oslomsg_rpc_transport: "{{ oslomsg_rpc_transport }}"
+tacker_oslomsg_rpc_port: "{{ oslomsg_rpc_port }}"
+tacker_oslomsg_rpc_servers: "{{ oslomsg_rpc_servers }}"
+tacker_oslomsg_rpc_use_ssl: "{{ oslomsg_rpc_use_ssl }}"
+tacker_oslomsg_rpc_host_group: "{{ oslomsg_rpc_host_group }}"
+
+# Notify
 tacker_oslomsg_notify_userid: tacker
 tacker_oslomsg_notify_vhost: /tacker
+tacker_oslomsg_notify_transport: "{{ oslomsg_notify_transport }}"
+tacker_oslomsg_notify_port: "{{ oslomsg_notify_port }}"
+tacker_oslomsg_notify_servers: "{{ oslomsg_notify_servers }}"
+tacker_oslomsg_notify_use_ssl: "{{ oslomsg_notify_use_ssl }}"
+tacker_oslomsg_notify_host_group: "{{ oslomsg_notify_host_group }}"
 
+# TODO(ansmith): remove rabbitmq vars once service file is updated
+# to use oslomsg vars
 tacker_rabbitmq_userid: tacker
 tacker_rabbitmq_vhost: /tacker
 tacker_rabbitmq_port: "{{ rabbitmq_port }}"
diff --git a/inventory/group_vars/trove_all.yml b/inventory/group_vars/trove_all.yml
index fa7fc34af3..c9cb9e754f 100644
--- a/inventory/group_vars/trove_all.yml
+++ b/inventory/group_vars/trove_all.yml
@@ -20,13 +20,27 @@ trove_galera_user: trove
 trove_galera_database_name: trove_service
 trove_galera_address: "{{ galera_address }}"
 
-# TODO(ansmith): remove rabbitmq vars once service file is updated
-# to use oslomsg vars
+# Oslo Messaging
+# RPC
 trove_oslomsg_rpc_userid: trove
 trove_oslomsg_rpc_vhost: /trove
+trove_oslomsg_rpc_transport: "{{ oslomsg_rpc_transport }}"
+trove_oslomsg_rpc_port: "{{ oslomsg_rpc_port }}"
+trove_oslomsg_rpc_servers: "{{ oslomsg_rpc_servers }}"
+trove_oslomsg_rpc_use_ssl: "{{ oslomsg_rpc_use_ssl }}"
+trove_oslomsg_rpc_host_group: "{{ oslomsg_rpc_host_group }}"
+
+# Notify
 trove_oslomsg_notify_userid: trove
 trove_oslomsg_notify_vhost: /trove
+trove_oslomsg_notify_transport: "{{ oslomsg_notify_transport }}"
+trove_oslomsg_notify_port: "{{ oslomsg_notify_port }}"
+trove_oslomsg_notify_servers: "{{ oslomsg_notify_servers }}"
+trove_oslomsg_notify_use_ssl: "{{ oslomsg_notify_use_ssl }}"
+trove_oslomsg_notify_host_group: "{{ oslomsg_notify_host_group }}"
 
+# TODO(ansmith): remove rabbitmq vars once service file is updated
+# to use oslomsg vars
 # RPC
 trove_rabbitmq_userid: trove
 trove_rabbitmq_vhost: /trove
diff --git a/playbooks/os-aodh-install.yml b/playbooks/os-aodh-install.yml
index 654e6e0c1b..37d1cb1d1b 100644
--- a/playbooks/os-aodh-install.yml
+++ b/playbooks/os-aodh-install.yml
@@ -38,7 +38,7 @@
         rpc_vhost: "{{ aodh_oslomsg_rpc_vhost }}"
       when:
         - inventory_hostname == groups['aodh_api'][0]
-        - groups[oslomsg_rpc_host_group] | length > 0
+        - groups[aodh_oslomsg_rpc_host_group] | length > 0
     - include: common-tasks/oslomsg-notify-vhost-user.yml
       static: no
       vars:
@@ -47,7 +47,7 @@
         notify_vhost: "{{ aodh_oslomsg_notify_vhost }}"
       when:
         - inventory_hostname == groups['aodh_api'][0]
-        - groups[oslomsg_notify_host_group] | length > 0
+        - groups[aodh_oslomsg_notify_host_group] | length > 0
 
     - include: common-tasks/os-log-dir-setup.yml
       vars:
diff --git a/playbooks/os-barbican-install.yml b/playbooks/os-barbican-install.yml
index d87ba9c68a..24a5b22fc0 100644
--- a/playbooks/os-barbican-install.yml
+++ b/playbooks/os-barbican-install.yml
@@ -38,7 +38,7 @@
         rpc_vhost: "{{ barbican_oslomsg_rpc_vhost }}"
       when:
         - inventory_hostname == groups['barbican_api'][0]
-        - groups[oslomsg_rpc_host_group] | length > 0
+        - groups[barbican_oslomsg_rpc_host_group] | length > 0
     - include: common-tasks/oslomsg-notify-vhost-user.yml
       static: no
       vars:
@@ -47,7 +47,7 @@
         notify_vhost: "{{ barbican_oslomsg_notify_vhost }}"
       when:
         - inventory_hostname == groups['barbican_api'][0]
-        - groups[oslomsg_notify_host_group] | length > 0
+        - groups[barbican_oslomsg_notify_host_group] | length > 0
 
     - include: common-tasks/os-log-dir-setup.yml
       vars:
diff --git a/playbooks/os-ceilometer-install.yml b/playbooks/os-ceilometer-install.yml
index 24e65a9846..6a15b34960 100644
--- a/playbooks/os-ceilometer-install.yml
+++ b/playbooks/os-ceilometer-install.yml
@@ -38,7 +38,7 @@
         rpc_vhost: "{{ ceilometer_oslomsg_rpc_vhost }}"
       when:
         - inventory_hostname == groups['ceilometer_central_container'][0]
-        - groups[oslomsg_rpc_host_group] | length > 0
+        - groups[ceilometer_oslomsg_rpc_host_group] | length > 0
     - include: common-tasks/oslomsg-notify-vhost-user.yml
       static: no
       vars:
@@ -47,7 +47,7 @@
         notify_vhost: "{{ ceilometer_oslomsg_notify_vhost }}"
       when:
         - inventory_hostname == groups['ceilometer_central_container'][0]
-        - groups[oslomsg_notify_host_group] | length > 0
+        - groups[ceilometer_oslomsg_notify_host_group] | length > 0
 
     - include: common-tasks/os-log-dir-setup.yml
       vars:
diff --git a/playbooks/os-cinder-install.yml b/playbooks/os-cinder-install.yml
index 53e77007f5..21a97e0f38 100644
--- a/playbooks/os-cinder-install.yml
+++ b/playbooks/os-cinder-install.yml
@@ -53,7 +53,7 @@
         rpc_password: "{{ cinder_oslomsg_rpc_password }}"
         rpc_vhost: "{{ cinder_oslomsg_rpc_vhost }}"
       when:
-        - groups[oslomsg_rpc_host_group] | length > 0
+        - groups[cinder_oslomsg_rpc_host_group] | length > 0
       run_once: yes
     - include: common-tasks/oslomsg-notify-vhost-user.yml
       static: no
@@ -63,7 +63,7 @@
         notify_vhost: "{{ cinder_oslomsg_notify_vhost }}"
       when:
         - "cinder_ceilometer_enabled | bool"
-        - groups[oslomsg_notify_host_group] | length > 0
+        - groups[cinder_oslomsg_notify_host_group] | length > 0
       run_once: yes
 
     - name: Configure MySQL user
diff --git a/playbooks/os-designate-install.yml b/playbooks/os-designate-install.yml
index ee9086bd95..c4eeb5d524 100644
--- a/playbooks/os-designate-install.yml
+++ b/playbooks/os-designate-install.yml
@@ -54,7 +54,7 @@
         rpc_vhost: "{{ designate_oslomsg_rpc_vhost }}"
       when:
         - inventory_hostname == groups['designate_all'][0]
-        - groups[oslomsg_rpc_host_group] | length > 0
+        - groups[designate_oslomsg_rpc_host_group] | length > 0
     - include: common-tasks/oslomsg-notify-vhost-user.yml
       static: no
       vars:
@@ -64,7 +64,7 @@
       when:
         - designate_ceilometer_enabled | bool
         - inventory_hostname == groups['designate_all'][0]
-        - groups[oslomsg_notify_host_group] | length > 0
+        - groups[designate_oslomsg_notify_host_group] | length > 0
 
     - include: common-tasks/os-log-dir-setup.yml
       vars:
diff --git a/playbooks/os-glance-install.yml b/playbooks/os-glance-install.yml
index a40018e0fe..afefefd728 100644
--- a/playbooks/os-glance-install.yml
+++ b/playbooks/os-glance-install.yml
@@ -53,7 +53,7 @@
         rpc_password: "{{ glance_oslomsg_rpc_password }}"
         rpc_vhost: "{{ glance_oslomsg_rpc_vhost }}"
       when:
-        - groups[oslomsg_rpc_host_group] | length > 0
+        - groups[glance_oslomsg_rpc_host_group] | length > 0
     - include: common-tasks/oslomsg-notify-vhost-user.yml
       static: no
       vars:
@@ -62,7 +62,7 @@
         notify_vhost: "{{ glance_oslomsg_notify_vhost }}"
       when:
         - glance_ceilometer_enabled | bool
-        - groups[oslomsg_notify_host_group] | length > 0
+        - groups[glance_oslomsg_notify_host_group] | length > 0
 
 
 
diff --git a/playbooks/os-heat-install.yml b/playbooks/os-heat-install.yml
index 38039d81d6..9152c0464b 100644
--- a/playbooks/os-heat-install.yml
+++ b/playbooks/os-heat-install.yml
@@ -51,7 +51,7 @@
         rpc_vhost: "{{ heat_oslomsg_rpc_vhost }}"
       when:
         - inventory_hostname == groups['heat_all'][0]
-        - groups[oslomsg_rpc_host_group] | length > 0
+        - groups[heat_oslomsg_rpc_host_group] | length > 0
     - include: common-tasks/oslomsg-notify-vhost-user.yml
       static: no
       vars:
@@ -61,7 +61,7 @@
       when:
         - heat_ceilometer_enabled | bool
         - inventory_hostname == groups['heat_all'][0]
-        - groups[oslomsg_notify_host_group] | length > 0
+        - groups[heat_oslomsg_notify_host_group] | length > 0
 
     - include: common-tasks/os-log-dir-setup.yml
       vars:
diff --git a/playbooks/os-ironic-install.yml b/playbooks/os-ironic-install.yml
index 99dcdd1ec7..fad77266fb 100644
--- a/playbooks/os-ironic-install.yml
+++ b/playbooks/os-ironic-install.yml
@@ -38,7 +38,7 @@
         rpc_vhost: "{{ ironic_oslomsg_rpc_vhost }}"
       when:
         - inventory_hostname == groups['ironic_all'][0]
-        - groups[oslomsg_rpc_host_group] | length > 0
+        - groups[ironic_oslomsg_rpc_host_group] | length > 0
 
     - include: common-tasks/mysql-db-user.yml
       static: no
diff --git a/playbooks/os-keystone-install.yml b/playbooks/os-keystone-install.yml
index c0dc8c7dc2..acfb8ae48d 100644
--- a/playbooks/os-keystone-install.yml
+++ b/playbooks/os-keystone-install.yml
@@ -69,7 +69,7 @@
         rpc_password: "{{ keystone_oslomsg_rpc_password }}"
         rpc_vhost: "{{ keystone_oslomsg_rpc_vhost }}"
       when:
-        - groups[oslomsg_rpc_host_group] | length > 0
+        - groups[keystone_oslomsg_rpc_host_group] | length > 0
       run_once: yes
 
     - include: common-tasks/oslomsg-notify-vhost-user.yml
@@ -80,7 +80,7 @@
         notify_vhost: "{{ keystone_oslomsg_notify_vhost }}"
       when:
         - "keystone_ceilometer_enabled | bool"
-        - groups[oslomsg_notify_host_group] | length > 0
+        - groups[keystone_oslomsg_notify_host_group] | length > 0
       run_once: yes
 
     - name: Configure MySQL user
diff --git a/playbooks/os-magnum-install.yml b/playbooks/os-magnum-install.yml
index b03dbc6b7f..bfd1f3d7dc 100644
--- a/playbooks/os-magnum-install.yml
+++ b/playbooks/os-magnum-install.yml
@@ -49,7 +49,7 @@
         rpc_vhost: "{{ magnum_oslomsg_rpc_vhost }}"
       when:
         - inventory_hostname == groups['magnum_all'][0]
-        - groups[oslomsg_rpc_host_group] | length > 0
+        - groups[magnum_oslomsg_rpc_host_group] | length > 0
 
     - include: common-tasks/mysql-db-user.yml
       static: no
diff --git a/playbooks/os-neutron-install.yml b/playbooks/os-neutron-install.yml
index 25fe5f2139..977fad2c63 100644
--- a/playbooks/os-neutron-install.yml
+++ b/playbooks/os-neutron-install.yml
@@ -67,7 +67,7 @@
         rpc_password: "{{ neutron_oslomsg_rpc_password }}"
         rpc_vhost: "{{ neutron_oslomsg_rpc_vhost }}"
       when:
-        - groups[oslomsg_rpc_host_group] | length > 0
+        - groups[neutron_oslomsg_rpc_host_group] | length > 0
       run_once: yes
 
     - include: common-tasks/oslomsg-notify-vhost-user.yml
@@ -78,7 +78,7 @@
         notify_vhost: "{{ neutron_oslomsg_notify_vhost }}"
       when:
         - neutron_ceilometer_enabled | bool
-        - groups[oslomsg_notify_host_group] | length > 0
+        - groups[neutron_oslomsg_notify_host_group] | length > 0
       run_once: yes
 
     - name: Configure MySQL user
diff --git a/playbooks/os-nova-install.yml b/playbooks/os-nova-install.yml
index 28fa20fc2b..caa827dacd 100644
--- a/playbooks/os-nova-install.yml
+++ b/playbooks/os-nova-install.yml
@@ -54,7 +54,7 @@
         rpc_password: "{{ nova_oslomsg_rpc_password }}"
         rpc_vhost: "{{ nova_oslomsg_rpc_vhost }}"
       when:
-        - groups[oslomsg_rpc_host_group] | length > 0
+        - groups[nova_oslomsg_rpc_host_group] | length > 0
       run_once: yes
 
     - include: common-tasks/oslomsg-notify-vhost-user.yml
@@ -65,7 +65,7 @@
         notify_vhost: "{{ nova_oslomsg_notify_vhost }}"
       when:
         - nova_ceilometer_enabled | bool
-        - groups[oslomsg_notify_host_group] | length > 0
+        - groups[nova_oslomsg_notify_host_group] | length > 0
       run_once: yes
 
     - name: Configure MySQL user (nova)
diff --git a/playbooks/os-octavia-install.yml b/playbooks/os-octavia-install.yml
index da1fe334b2..26dc7ec8a7 100644
--- a/playbooks/os-octavia-install.yml
+++ b/playbooks/os-octavia-install.yml
@@ -39,7 +39,7 @@
         rpc_vhost: "{{ octavia_oslomsg_rpc_vhost }}"
       when:
         - inventory_hostname == groups['octavia_all'][0]
-        - groups[oslomsg_rpc_host_group] | length > 0
+        - groups[octavia_oslomsg_rpc_host_group] | length > 0
 
     - include: common-tasks/os-log-dir-setup.yml
       vars:
diff --git a/playbooks/os-sahara-install.yml b/playbooks/os-sahara-install.yml
index 3e89dd66fb..3062361a79 100644
--- a/playbooks/os-sahara-install.yml
+++ b/playbooks/os-sahara-install.yml
@@ -49,7 +49,7 @@
         rpc_vhost: "{{ sahara_oslomsg_rpc_vhost }}"
       when:
         - inventory_hostname == groups['sahara_all'][0]
-        - groups[oslomsg_rpc_host_group] | length > 0
+        - groups[sahara_oslomsg_rpc_host_group] | length > 0
     - include: common-tasks/oslomsg-notify-vhost-user.yml
       static: no
       vars:
@@ -59,7 +59,7 @@
       when:
         - sahara_ceilometer_enabled | bool
         - inventory_hostname == groups['sahara_all'][0]
-        - groups[oslomsg_notify_host_group] | length > 0
+        - groups[sahara_oslomsg_notify_host_group] | length > 0
 
     - include: common-tasks/os-log-dir-setup.yml
       vars:
diff --git a/playbooks/os-tacker-install.yml b/playbooks/os-tacker-install.yml
index 114c7afd63..b96f68a5c6 100644
--- a/playbooks/os-tacker-install.yml
+++ b/playbooks/os-tacker-install.yml
@@ -38,7 +38,7 @@
         rpc_vhost: "{{ tacker_oslomsg_rpc_vhost }}"
       when:
         - inventory_hostname == groups['tacker_all'][0]
-        - groups[oslomsg_rpc_host_group] | length > 0
+        - groups[tacker_oslomsg_rpc_host_group] | length > 0
 
     - include: common-tasks/os-log-dir-setup.yml
       vars:
diff --git a/playbooks/os-trove-install.yml b/playbooks/os-trove-install.yml
index 122e68e8dc..473742771a 100644
--- a/playbooks/os-trove-install.yml
+++ b/playbooks/os-trove-install.yml
@@ -54,7 +54,7 @@
         rpc_vhost: "{{ trove_oslomsg_rpc_vhost }}"
       when:
         - inventory_hostname == groups['trove_all'][0]
-        - groups[oslomsg_rpc_host_group] | length > 0
+        - groups[trove_oslomsg_rpc_host_group] | length > 0
     - include: common-tasks/oslomsg-notify-vhost-user.yml
       static: no
       vars:
@@ -64,7 +64,7 @@
       when:
         - trove_ceilometer_enabled | bool
         - inventory_hostname == groups['trove_all'][0]
-        - groups[oslomsg_notify_host_group] | length > 0
+        - groups[trove_oslomsg_notify_host_group] | length > 0
 
     - include: common-tasks/os-log-dir-setup.yml
       vars: