diff --git a/inventory/group_vars/all/all.yml b/inventory/group_vars/all/all.yml
index b2c1d8132a..bf8027011d 100644
--- a/inventory/group_vars/all/all.yml
+++ b/inventory/group_vars/all/all.yml
@@ -104,10 +104,6 @@ service_ldap_backend_enabled: "{{ keystone_ldap is defined and keystone_ldap.Def
 ## Base venv configuration
 venv_tag: "{{ openstack_release }}"
 
-## Gnocchi
-# Used in both Gnocchi and Swift roles.
-gnocchi_service_project_name: "{{ (gnocchi_storage_driver is defined and gnocchi_storage_driver == 'swift') | ternary('gnocchi_swift', 'service') }}"
-
 ## OpenStack Openrc
 openrc_os_auth_url: "{{ keystone_service_internalurl }}"
 openrc_os_password: "{{ keystone_auth_admin_password }}"
diff --git a/inventory/group_vars/all/nova.yml b/inventory/group_vars/all/nova.yml
index b8c270effd..bbd379c824 100644
--- a/inventory/group_vars/all/nova.yml
+++ b/inventory/group_vars/all/nova.yml
@@ -17,8 +17,18 @@
 nova_metadata_port: 8775
 nova_metadata_protocol: "{{ openstack_service_internaluri_proto | default('http') }}"
 nova_metadata_insecure: "{{ keystone_service_internaluri_insecure | default(False) }}"
-nova_service_region: "{{ service_region }}"
-nova_service_user_name: nova
-nova_service_project_name: service
-nova_service_project_domain_id: default
-nova_service_user_domain_id: default
+
+# Consumed by haproxy endpoints
+nova_consoles:
+  spice:
+    port: "{{ nova_spice_html5proxy_base_port | default('6082') }}"
+    path: "/spice_auto.html"
+  novnc:
+    port: "{{ nova_novncproxy_port | default('6080') }}"
+    path: "/vnc.html"
+  serial:
+    port: "{{ nova_serialconsoleproxy_port | default('6083') }}"
+    path: "/"
+nova_console_type: "{{ (ansible_architecture == 'aarch64') | ternary('serialconsole', 'novnc') }}"
+nova_console_port: "{{ nova_consoles[nova_console_type]['port'] }}"
+nova_console_path: "{{ nova_consoles[nova_console_type]['path'] }}"
diff --git a/inventory/group_vars/aodh_all.yml b/inventory/group_vars/aodh_all.yml
deleted file mode 100644
index 260d09e24d..0000000000
--- a/inventory/group_vars/aodh_all.yml
+++ /dev/null
@@ -1,21 +0,0 @@
----
-# Copyright 2016, Rackspace US, Inc.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-aodh_service_region: "{{ service_region }}"
-
-aodh_service_in_ldap: "{{ service_ldap_backend_enabled }}"
-
-# Ensure that the package state matches the global setting
-aodh_package_state: "{{ package_state }}"
diff --git a/inventory/group_vars/barbican_all.yml b/inventory/group_vars/barbican_all.yml
deleted file mode 100644
index 740e23525d..0000000000
--- a/inventory/group_vars/barbican_all.yml
+++ /dev/null
@@ -1,20 +0,0 @@
----
-# Copyright 2016, Rackspace US, Inc.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-barbican_service_region: "{{ service_region }}"
-barbican_service_in_ldap: "{{ service_ldap_backend_enabled }}"
-barbican_package_state: "{{ package_state }}"
-barbican_keystone_auth: yes
-barbican_ceilometer_enabled: "{{ (groups['ceilometer_all'] is defined) and (groups['ceilometer_all'] | length > 0) }}"
diff --git a/inventory/group_vars/blazar_all.yml b/inventory/group_vars/blazar_all.yml
deleted file mode 100644
index e5174fdb7b..0000000000
--- a/inventory/group_vars/blazar_all.yml
+++ /dev/null
@@ -1,20 +0,0 @@
----
-# Copyright 2018, taseer94@gmail.com
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-blazar_service_region: "{{ service_region }}"
-blazar_service_in_ldap: "{{ service_ldap_backend_enabled }}"
-
-# Ensure that the package state matches the global setting
-blazar_package_state: "{{ package_state }}"
diff --git a/inventory/group_vars/ceilometer_all.yml b/inventory/group_vars/ceilometer_all.yml
index 0f854fb6e4..adf6f34f1d 100644
--- a/inventory/group_vars/ceilometer_all.yml
+++ b/inventory/group_vars/ceilometer_all.yml
@@ -13,21 +13,6 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-ceilometer_service_user_name: "{{ hostvars['localhost']['ceilometer_service_user_name'] }}"
-ceilometer_service_tenant_name: "{{ hostvars['localhost']['ceilometer_service_tenant_name'] }}"
-
-ceilometer_service_port: 8777
-ceilometer_service_proto: http
-ceilometer_service_publicuri: "{{ openstack_service_publicuri_proto|default(ceilometer_service_proto) }}://{{ external_lb_vip_address }}:{{ ceilometer_service_port }}"
-ceilometer_service_region: "{{ service_region }}"
-ceilometer_service_in_ldap: "{{ service_ldap_backend_enabled }}"
-
-ceilometer_aodh_enabled: "{{ groups['aodh_all'] is defined and groups['aodh_all'] | length > 0 }}"
-ceilometer_gnocchi_enabled: "{{ groups['gnocchi_all'] is defined and groups['gnocchi_all'] | length > 0 }}"
-
-# Ensure that the package state matches the global setting
-ceilometer_package_state: "{{ package_state }}"
-
 # Swift vars used when swift is enabled
 swift_system_user_name: "{{ hostvars['localhost']['swift_system_user_name'] }}"
 swift_system_shell: "{{ hostvars['localhost']['swift_system_shell'] }}"
diff --git a/inventory/group_vars/cinder_all.yml b/inventory/group_vars/cinder_all.yml
index 70e6fa150f..d1f958b69e 100644
--- a/inventory/group_vars/cinder_all.yml
+++ b/inventory/group_vars/cinder_all.yml
@@ -13,22 +13,15 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-cinder_service_region: "{{ service_region }}"
 # If there are Swift hosts in the environment, then enable cinder backups to it
 cinder_service_backup_program_enabled: "{{ hostvars['localhost']['cinder_service_backup_program_enabled'] }}"
 
 # These are here rather than in cinder_all because
 # both the os_ceilometer and os_cinder roles require them
 
-# If there are any Ceilometer hosts in the environment, then enable its usage
-cinder_ceilometer_enabled: "{{ (groups['cinder_all'] is defined) and (groups['cinder_all'] | length > 0) and (groups['ceilometer_all'] is defined) and (groups['ceilometer_all'] | length > 0) }}"
-
 # The address used to listen for communications
 cinder_management_address: "{{ ansible_host }}"
 
-# The address used for communications with the glance service
-cinder_glance_host: "{{ internal_lb_vip_address }}"
-
 # If there are Swift hosts in the environment, then use it as the default Glance store
 # This is specifically duplicated from glance_all for the cinder_glance_api_version
 # setting below.
@@ -36,13 +29,3 @@ glance_default_store: "{{ ((groups['swift_all'] is defined) and (groups['swift_a
 
 # cinder_backend_lvm_inuse: True if current host has an lvm backend
 cinder_backend_lvm_inuse: '{{ (cinder_backends|default("")|to_json).find("cinder.volume.drivers.lvm.LVMVolumeDriver") != -1 }}'
-cinder_service_in_ldap: "{{ service_ldap_backend_enabled }}"
-
-# Ensure that the package state matches the global setting
-cinder_package_state: "{{ package_state }}"
-
-# The system user for all cinder services
-cinder_system_user_name: cinder
-
-# If there are any Barbican hosts in the environment, then enable its usage
-cinder_barbican_enabled: "{{ (groups['barbican_all'] is defined) and (groups['barbican_all'] | length > 0) }}"
diff --git a/inventory/group_vars/designate_all.yml b/inventory/group_vars/designate_all.yml
deleted file mode 100644
index 331fb2e985..0000000000
--- a/inventory/group_vars/designate_all.yml
+++ /dev/null
@@ -1,20 +0,0 @@
----
-# Copyright 2016 Internet Solutions (Pty) Ltd
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-# If there are any Ceilometer hosts in the environment, then enable its usage
-designate_ceilometer_enabled: "{{ (groups['designate_all'] is defined) and (groups['designate_all'] | length > 0) and (groups['ceilometer_all'] is defined) and (groups['ceilometer_all'] | length > 0) }}"
-
-# Ensure that the package state matches the global setting
-designate_package_state: "{{ package_state }}"
diff --git a/inventory/group_vars/glance_all.yml b/inventory/group_vars/glance_all.yml
index 2bc91f8db6..89d6df925a 100644
--- a/inventory/group_vars/glance_all.yml
+++ b/inventory/group_vars/glance_all.yml
@@ -13,18 +13,9 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-# If there are any Ceilometer hosts in the environment, then enable its usage
-glance_ceilometer_enabled: "{{ (groups['ceilometer_all'] is defined) and (groups['ceilometer_all'] | length > 0) }}"
-
-glance_service_region: "{{ service_region }}"
-glance_service_in_ldap: "{{ service_ldap_backend_enabled }}"
-
 # If there are Swift hosts in the environment, then use it as the default Glance store
 glance_default_store: "{{ ((groups['swift_all'] is defined) and (groups['swift_all'] | length > 0)) | ternary('swift', 'file') }}"
 
-# Ensure that the package state matches the global setting
-glance_package_state: "{{ package_state }}"
-
 # glance default list of bind mounts
 glance_container_bind_mounts:
   - bind_dir_path: "/var/lib/glance/images"
diff --git a/inventory/group_vars/gnocchi_all.yml b/inventory/group_vars/gnocchi_all.yml
index 93398d2208..f91ea9bbe9 100644
--- a/inventory/group_vars/gnocchi_all.yml
+++ b/inventory/group_vars/gnocchi_all.yml
@@ -13,15 +13,6 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-gnocchi_ssl_external: "{{ openstack_external_ssl }}"
-gnocchi_service_region: "{{ service_region }}"
-
-# Ensure that the package state matches the global setting
-gnocchi_package_state: "{{ package_state }}"
-
-# Ensure that keystone authentication is enabled for gnocchi
-gnocchi_keystone_auth: "{{ (groups['keystone_all'] is defined) and (groups['keystone_all'] | length > 0) }}"
-
 # Gnocchi default list of bind mounts
 gnocchi_container_bind_mounts:
   - bind_dir_path: "/var/lib/gnocchi"
diff --git a/inventory/group_vars/haproxy/haproxy.yml b/inventory/group_vars/haproxy/haproxy.yml
index d401673759..6454fa8f5f 100644
--- a/inventory/group_vars/haproxy/haproxy.yml
+++ b/inventory/group_vars/haproxy/haproxy.yml
@@ -347,15 +347,13 @@ haproxy_nova_console_service:
   haproxy_backend_nodes: "{{ groups['nova_console'] | default([]) }}"
   haproxy_ssl: "{{ haproxy_ssl }}"
   haproxy_ssl_all_vips: "{{ haproxy_ssl_all_vips }}"
-  haproxy_port: "{{ hostvars[(groups['nova_console'] | default(['localhost']))[0] | default('localhost')]['nova_console_port'] | default(6082) }}"
+  haproxy_port: "{{ nova_console_port }}"
   haproxy_balance_type: "{{ haproxy_nova_console_http_mode | ternary('http', 'tcp') }}"
   haproxy_timeout_client: 60m
   haproxy_timeout_server: 60m
   haproxy_balance_alg: source
-  haproxy_backend_options: "{{ haproxy_nova_console_http_mode
-                               | ternary(['httpchk HEAD ' + hostvars[(groups['nova_console'] | default(['localhost']))[0] | default('localhost')]['nova_console_path'] | default('/spice_auto.html') + ' HTTP/1.0\\r\\nUser-agent:\\ osa-haproxy-healthcheck'], []) }}"
-  haproxy_backend_httpcheck_options: "{{ haproxy_nova_console_http_mode
-                                         | ternary(['expect status 200'], []) }}"
+  haproxy_backend_options: "{{ haproxy_nova_console_http_mode | ternary(['httpchk HEAD ' + nova_console_path + ' HTTP/1.0\\r\\nUser-agent:\\ osa-haproxy-healthcheck'], []) }}"
+  haproxy_backend_httpcheck_options: "{{ haproxy_nova_console_http_mode | ternary(['expect status 200'], []) }}"
   haproxy_service_enabled: "{{ groups['nova_console'] is defined and groups['nova_console'] | length > 0 }}"
 
 haproxy_octavia_service:
diff --git a/inventory/group_vars/heat_all.yml b/inventory/group_vars/heat_all.yml
index 0bc5870c92..ee1067c563 100644
--- a/inventory/group_vars/heat_all.yml
+++ b/inventory/group_vars/heat_all.yml
@@ -13,15 +13,6 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-# If there are any Ceilometer hosts in the environment, then enable its usage
-heat_ceilometer_enabled: "{{ (groups['ceilometer_all'] is defined) and (groups['ceilometer_all'] | length > 0) }}"
-
-heat_service_region: "{{ service_region }}"
-heat_service_in_ldap: "{{ service_ldap_backend_enabled }}"
-
-# Ensure that the package state matches the global setting
-heat_package_state: "{{ package_state }}"
-
 # Only enable the heat cinder backups functionality if the cinder backup
 # service is enabled.
 heat_cinder_backups_enabled: "{{ hostvars['localhost']['cinder_service_backup_program_enabled'] }}"
diff --git a/inventory/group_vars/horizon_all.yml b/inventory/group_vars/horizon_all.yml
index 3f31a41400..27ddf762b6 100644
--- a/inventory/group_vars/horizon_all.yml
+++ b/inventory/group_vars/horizon_all.yml
@@ -13,31 +13,5 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-horizon_external_ssl: "{{ openstack_external_ssl }}"
-horizon_service_region: "{{ service_region }}"
 horizon_enable_cinder_backup: "{{ hostvars['localhost']['cinder_service_backup_program_enabled'] }}"
-horizon_enable_cloudkitty_ui: "{{ (groups['cloudkitty_all'] is defined) and (groups['cloudkitty_all'] | length > 0) }}"
-horizon_enable_adjutant_ui: "{{ (groups['adjutant_all'] is defined) and (groups['adjutant_all'] | length > 0) }}"
-horizon_enable_blazar_ui: "{{ (groups['blazar_all'] is defined) and (groups['blazar_all'] | length > 0) }}"
-horizon_enable_heat_ui: "{{ (groups['heat_all'] is defined) and (groups['heat_all'] | length > 0) }}"
-horizon_enable_ironic_ui: "{{ (groups['ironic_all'] is defined) and (groups['ironic_all'] | length > 0) }}"
-horizon_enable_magnum_ui: "{{ (groups['magnum_all'] is defined) and (groups['magnum_all'] | length > 0) }}"
-horizon_enable_manila_ui: "{{ (groups['manila_all'] is defined) and (groups['manila_all'] | length > 0) }}"
-horizon_enable_masakari_ui: "{{ (groups['masakari_all'] is defined) and (groups['masakari_all'] | length > 0) }}"
-horizon_enable_mistral_ui: "{{ (groups['mistral_all'] is defined) and (groups['mistral_all'] | length > 0) }}"
-horizon_enable_murano_ui: "{{ (groups['murano_all'] is defined) and (groups['murano_all'] | length > 0) }}"
-horizon_enable_designate_ui: "{{ (groups['designate_all'] is defined) and (groups['designate_all'] | length > 0) }}"
-horizon_enable_octavia_ui: "{{ (groups['octavia-infra_all'] is defined) and (groups['octavia-infra_all'] | length > 0) }}"
-horizon_enable_neutron_fwaas: "{{ neutron_plugin_base is defined and (neutron_plugin_base | intersect(['firewall', 'firewall_v2']) | length > 0) }}"
-horizon_enable_neutron_vpnaas: "{{ neutron_plugin_base is defined and 'vpnaas' in neutron_plugin_base }}"
-horizon_enable_senlin_ui: "{{ (groups['senlin_all'] is defined) and (groups['senlin_all'] | length > 0) }}"
-horizon_enable_zun_ui: "{{ (groups['zun_all'] is defined) and (groups['zun_all'] | length > 0) }}"
 horizon_enable_ha_router: "{{ neutron_plugin_type.split('.')[0] == 'ml2' and (groups['neutron_l3_agent'] | length >= 2) }}"
-
-# Ensure that the package state matches the global setting
-horizon_package_state: "{{ package_state }}"
-
-# If there are any Sahara hosts in the environment, then enable sahara-dashboard
-horizon_enable_sahara_ui: "{{ (groups['sahara_all'] is defined) and (groups['sahara_all'] | length > 0) }}"
-# If there are any Trove hosts in the environment, then enable trove-dashboard
-horizon_enable_trove_ui: "{{ (groups['trove_all'] is defined) and (groups['trove_all'] | length > 0) }}"
diff --git a/inventory/group_vars/ironic_all.yml b/inventory/group_vars/ironic_all.yml
deleted file mode 100644
index 742f5cf817..0000000000
--- a/inventory/group_vars/ironic_all.yml
+++ /dev/null
@@ -1,19 +0,0 @@
----
-# Copyright 2016, Rackspace US, Inc.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-ironic_service_region: "{{ service_region }}"
-
-# Ensure that the package state matches the global setting
-ironic_package_state: "{{ package_state }}"
diff --git a/inventory/group_vars/keystone_all.yml b/inventory/group_vars/keystone_all.yml
index bcb2f69194..694b2a3007 100644
--- a/inventory/group_vars/keystone_all.yml
+++ b/inventory/group_vars/keystone_all.yml
@@ -16,20 +16,5 @@
 # These are here rather than in keystone_all because
 # both the os_ceilometer and os_keystone roles require them
 
-# If there are any Ceilometer hosts in the environment, then enable its usage
-keystone_ceilometer_enabled: "{{ (groups['ceilometer_all'] is defined) and (groups['ceilometer_all'] | length > 0) }}"
-
-# The system user for all keystone services
-keystone_system_user_name: keystone
-
-keystone_external_ssl: "{{ openstack_external_ssl }}"
-
-keystone_cache_servers: "{{ memcached_servers.split(',') }}"
-
-keystone_service_in_ldap: "{{ service_ldap_backend_enabled }}"
-
 # Hosts allowed to override remote IP with X-Forwarded-For
 keystone_set_real_ip_from: "{{ groups['haproxy'] | map('extract', hostvars, 'container_address') | list }}"
-
-# Ensure that the package state matches the global setting
-keystone_package_state: "{{ package_state }}"
diff --git a/inventory/group_vars/magnum_all.yml b/inventory/group_vars/magnum_all.yml
deleted file mode 100644
index 8a6854ed98..0000000000
--- a/inventory/group_vars/magnum_all.yml
+++ /dev/null
@@ -1,19 +0,0 @@
----
-# Copyright 2016 Internet Solutions (Pty) Ltd
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-magnum_service_region: "{{ service_region }}"
-
-# Ensure that the package state matches the global setting
-magnum_package_state: "{{ package_state }}"
diff --git a/inventory/group_vars/manila_all.yml b/inventory/group_vars/manila_all.yml
deleted file mode 100644
index b085165bae..0000000000
--- a/inventory/group_vars/manila_all.yml
+++ /dev/null
@@ -1,32 +0,0 @@
----
-# Copyright 2019, Rackspace US, Inc.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-# Set the available protocol list
-manila_enabled_share_protocols:
-  - NFS
-  - CEPHFS
-
-_manila_default_share_type: "{{ (manila_backends | default({})).keys() | list }}"
-manila_default_share_type: "{{ ((_manila_default_share_type | length) > 0) | ternary(_manila_default_share_type[0], null) }}"
-
-# manila_backend_lvm_inuse: True if current host has an lvm backend
-manila_backend_lvm_inuse: "{{ (manila_backends | default({}) | to_json).find('lvm') != -1 }}"
-# manila_backend_rbd_inuse: True if the current host has an rbd backend
-manila_backend_rbd_inuse: "{{ (manila_backends | default({}) | to_json).find('manila.share.drivers.cephfs') != -1 }}"
-
-manila_package_state: "{{ package_state }}"
-
-# Region
-manila_service_region: "{{ service_region }}"
diff --git a/inventory/group_vars/masakari_all.yml b/inventory/group_vars/masakari_all.yml
deleted file mode 100644
index 0c32e8b60f..0000000000
--- a/inventory/group_vars/masakari_all.yml
+++ /dev/null
@@ -1,17 +0,0 @@
----
-# Copyright 2020, Jonathan Rosser BBC R&D
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-masakari_service_region: "{{ service_region }}"
-masakari_package_state: "{{ package_state }}"
diff --git a/inventory/group_vars/mistral_all.yml b/inventory/group_vars/mistral_all.yml
deleted file mode 100644
index bdd8f1f042..0000000000
--- a/inventory/group_vars/mistral_all.yml
+++ /dev/null
@@ -1,17 +0,0 @@
----
-# Copyright 2019, VEXXHOST, Inc.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-mistral_package_state: "{{ package_state }}"
-mistral_service_region: "{{ service_region }}"
diff --git a/inventory/group_vars/murano_all.yml b/inventory/group_vars/murano_all.yml
deleted file mode 100644
index 462324f18d..0000000000
--- a/inventory/group_vars/murano_all.yml
+++ /dev/null
@@ -1,17 +0,0 @@
----
-# Copyright 2019, VEXXHOST, Inc.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-murano_package_state: "{{ package_state }}"
-murano_service_region: "{{ service_region }}"
diff --git a/inventory/group_vars/neutron_all.yml b/inventory/group_vars/neutron_all.yml
deleted file mode 100644
index 8cca0d19ad..0000000000
--- a/inventory/group_vars/neutron_all.yml
+++ /dev/null
@@ -1,27 +0,0 @@
----
-# Copyright 2016, Rackspace US, Inc.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-neutron_service_region: "{{ service_region }}"
-
-# If there are any Designate hosts in the environment, then enable its usage
-neutron_designate_enabled: "{{ hostvars['localhost']['neutron_designate_enabled'] }}"
-# If there are any Ceilometer hosts in the environment, then enable its usage
-neutron_ceilometer_enabled: "{{ hostvars['localhost']['neutron_ceilometer_enabled'] }}"
-
-neutron_dns_domain: "{{ dhcp_domain }}"
-neutron_service_in_ldap: "{{ service_ldap_backend_enabled }}"
-
-# Ensure that the package state matches the global setting
-neutron_package_state: "{{ package_state }}"
diff --git a/inventory/group_vars/nova_all.yml b/inventory/group_vars/nova_all.yml
index 82a6a9e95d..1db815051d 100644
--- a/inventory/group_vars/nova_all.yml
+++ b/inventory/group_vars/nova_all.yml
@@ -13,51 +13,4 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-
-nova_console_type: novnc
-nova_console_agent_enabled: "{{ ansible_facts['architecture'] != 'aarch64' }}"
-nova_novncproxy_port: 6080
-nova_spice_html5proxy_base_port: 6082
-nova_serialconsoleproxy_port: 6083
-nova_consoles:
-  spice:
-    port: "{{ nova_spice_html5proxy_base_port }}"
-    path: "/spice_auto.html"
-  novnc:
-    port: "{{ nova_novncproxy_port }}"
-    path: "/vnc.html"
-  serial:
-    port: "{{ nova_serialconsoleproxy_port }}"
-    path: "/"
-
-nova_console_port: "{{ nova_consoles[nova_console_type]['port'] }}"
-nova_console_path: "{{ nova_consoles[nova_console_type]['path'] }}"
-
-# These are here rather than in nova_all because
-# both the os_ceilometer and os_nova roles require them
-
-# 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
-nova_ceilometer_enabled: "{{ (groups['ceilometer_all'] is defined) and (groups['ceilometer_all'] | length > 0) }}"
-# If there are any Barbican hosts in the environment, then enable its usage
-nova_barbican_enabled: "{{ hostvars['localhost']['nova_barbican_enabled'] }}"
-
-nova_external_ssl: "{{ openstack_external_ssl }}"
 nova_ceph_client_uuid: '{{ cinder_ceph_client_uuid | default() }}'
-nova_dhcp_domain: "{{ dhcp_domain }}"
-nova_service_in_ldap: "{{ service_ldap_backend_enabled }}"
-
-# Ensure that the package state matches the global setting
-nova_package_state: "{{ package_state }}"
-
-# The system user for all nova services
-nova_system_user_name: nova
-
-# TODO: (andymccr) remove this once https://review.openstack.org/#/c/428120/ merges
-nova_reserved_host_disk_mb: 0
-
-# If there are any Designate hosts in the environment, then enable its usage
-neutron_designate_enabled: "{{ hostvars['localhost']['neutron_designate_enabled'] }}"
-# If there are any Ceilometer hosts in the environment, then enable its usage
-neutron_ceilometer_enabled: "{{ hostvars['localhost']['neutron_ceilometer_enabled'] }}"
diff --git a/inventory/group_vars/octavia_all.yml b/inventory/group_vars/octavia_all.yml
deleted file mode 100644
index 11e9ec5388..0000000000
--- a/inventory/group_vars/octavia_all.yml
+++ /dev/null
@@ -1,21 +0,0 @@
----
-# Copyright 2017, Rackspace US, Inc.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-# If there are any Ceilometer hosts in the environment, then enable its usage
-octavia_ceilometer_enabled: "{{ (groups['ceilometer_all'] is defined) and (groups['ceilometer_all'] | length > 0) }}"
-octavia_barbican_enabled: "{{ (groups['barbican_all'] is defined) and (groups['barbican_all'] | length > 0) }}"
-
-octavia_service_region: "{{ service_region }}"
-octavia_package_state: "{{ package_state }}"
diff --git a/inventory/group_vars/panko_all.yml b/inventory/group_vars/panko_all.yml
deleted file mode 100644
index 9a329305d9..0000000000
--- a/inventory/group_vars/panko_all.yml
+++ /dev/null
@@ -1,21 +0,0 @@
----
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-
-panko_service_in_ldap: "{{ service_ldap_backend_enabled }}"
-panko_service_publicuri: "{{ openstack_service_publicuri_proto|default(panko_service_proto) }}://{{ external_lb_vip_address }}:{{ panko_service_port }}"
-
-# Ensure that the package state matches the global setting
-panko_package_state: "{{ package_state }}"
-panko_service_region: "{{ service_region }}"
diff --git a/inventory/group_vars/placement_all.yml b/inventory/group_vars/placement_all.yml
deleted file mode 100644
index 61cbf4b4ec..0000000000
--- a/inventory/group_vars/placement_all.yml
+++ /dev/null
@@ -1,24 +0,0 @@
----
-# Copyright 2019, VEXXHOST, Inc.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-placement_service_port: 8780
-placement_service_proto: http
-placement_service_publicuri_proto: "{{ openstack_service_publicuri_proto | default(placement_service_proto) }}"
-placement_service_publicurl: "{{ placement_service_publicuri_proto }}://{{ external_lb_vip_address }}:{{ placement_service_port }}"
-placement_service_internaluri_proto: "{{ openstack_service_internaluri_proto | default(placement_service_proto) }}"
-placement_service_internalurl: "{{ placement_service_internaluri_proto }}://{{ internal_lb_vip_address }}:{{ placement_service_port }}"
-placement_service_adminuri_proto: "{{ openstack_service_adminuri_proto | default(placement_service_proto) }}"
-placement_service_adminurl: "{{ placement_service_adminuri_proto }}://{{ internal_lb_vip_address }}:{{ placement_service_port }}"
-placement_service_region: "{{ service_region }}"
diff --git a/inventory/group_vars/sahara_all.yml b/inventory/group_vars/sahara_all.yml
deleted file mode 100644
index f2c34b7395..0000000000
--- a/inventory/group_vars/sahara_all.yml
+++ /dev/null
@@ -1,18 +0,0 @@
----
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-# If there are any Ceilometer and Sahara hosts in the environment, then enable its usage
-sahara_ceilometer_enabled: "{{ (groups['ceilometer_all'] is defined) and (groups['sahara_all'] is defined) and (groups['ceilometer_all'] | length > 0) and (groups['sahara_all'] | length > 0) }}"
-
-sahara_service_region: "{{ service_region }}"
-sahara_service_in_ldap: "{{ service_ldap_backend_enabled }}"
diff --git a/inventory/group_vars/swift_all.yml b/inventory/group_vars/swift_all.yml
index dcbe139687..07b2a6a11f 100644
--- a/inventory/group_vars/swift_all.yml
+++ b/inventory/group_vars/swift_all.yml
@@ -18,19 +18,3 @@ swift_system_user_name: "{{ hostvars['localhost']['swift_system_user_name'] }}"
 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'] }}"
-
-# If there are any Ceilometer and Swift hosts in the environment, then enable its usage
-swift_ceilometer_enabled: "{{ (groups['ceilometer_all'] is defined) and (groups['swift_proxy'] is defined) and (groups['ceilometer_all'] | length > 0) and (groups['swift_proxy'] | length > 0) }}"
-
-swift_service_region: "{{ service_region }}"
-swift_service_in_ldap: "{{ service_ldap_backend_enabled }}"
-
-# Ensure that the package state matches the global setting
-swift_package_state: "{{ package_state }}"
-
-# Used to optionally filter Gnocchi-originated traffic in Ceilometermiddleware
-swift_gnocchi_enabled: "{{ (groups['gnocchi_all'] is defined and groups['gnocchi_all'] | length > 0) }}"
-
-# Ceilometer vars used when ceilometer is enabled
-ceilometer_service_user_name: "{{ hostvars['localhost']['ceilometer_service_user_name'] }}"
-ceilometer_service_tenant_name: "{{ hostvars['localhost']['ceilometer_service_tenant_name'] }}"
diff --git a/inventory/group_vars/tacker_all.yml b/inventory/group_vars/tacker_all.yml
deleted file mode 100644
index f9c06d1f07..0000000000
--- a/inventory/group_vars/tacker_all.yml
+++ /dev/null
@@ -1,28 +0,0 @@
----
-# Copyright 2017, SUSE LINUX GmbH
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-tacker_service_user_name: tacker
-tacker_service_tenant_name: service
-
-tacker_service_publicuri: "{{ openstack_service_publicuri_proto|default(tacker_service_proto) }}://{{ external_lb_vip_address }}:{{ tacker_service_port }}"
-tacker_service_adminurl: "{{ tacker_service_adminuri }}/"
-tacker_service_region: "{{ service_region }}"
-tacker_service_in_ldap: "{{ service_ldap_backend_enabled }}"
-
-tacker_aodh_enabled: "{{ groups['aodh_all'] is defined and groups['aodh_all'] | length > 0 }}"
-tacker_gnocchi_enabled: "{{ groups['gnocchi_all'] is defined and groups['gnocchi_all'] | length > 0 }}"
-
-# Ensure that the package state matches the global setting
-tacker_package_state: "{{ package_state }}"
diff --git a/inventory/group_vars/trove_all.yml b/inventory/group_vars/trove_all.yml
index deec9049b4..5b090aa94c 100644
--- a/inventory/group_vars/trove_all.yml
+++ b/inventory/group_vars/trove_all.yml
@@ -14,11 +14,3 @@
 # limitations under the License.
 
 swift_proxy_port: "{{ hostvars['localhost']['swift_proxy_port'] }}"
-
-trove_service_region: "{{ service_region }}"
-
-# If there are any Ceilometer hosts in the environment, then enable its usage
-trove_ceilometer_enabled: "{{ (groups['trove_all'] is defined) and (groups['trove_all'] | length > 0) and (groups['ceilometer_all'] is defined) and (groups['ceilometer_all'] | length > 0) }}"
-
-# Ensure that the package state matches the global setting
-trove_package_state: "{{ package_state }}"
diff --git a/inventory/host_vars/localhost/ceilometer.yml b/inventory/host_vars/localhost/ceilometer.yml
deleted file mode 100644
index 74d963f648..0000000000
--- a/inventory/host_vars/localhost/ceilometer.yml
+++ /dev/null
@@ -1,17 +0,0 @@
----
-# Copyright 2017, Rackspace US, Inc.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-ceilometer_service_user_name: ceilometer
-ceilometer_service_tenant_name: service
diff --git a/inventory/host_vars/localhost/neutron.yml b/inventory/host_vars/localhost/neutron.yml
deleted file mode 100644
index 255407fba2..0000000000
--- a/inventory/host_vars/localhost/neutron.yml
+++ /dev/null
@@ -1,20 +0,0 @@
----
-# Copyright 2017, Logan Vig <logan2211@gmail.com>
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-# Nova and Neutron roles both consume these
-# If there are any Designate hosts in the environment, then enable its usage
-neutron_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
-neutron_ceilometer_enabled: "{{ (groups['ceilometer_all'] is defined) and (groups['ceilometer_all'] | length > 0) }}"
diff --git a/inventory/host_vars/localhost/nova.yml b/inventory/host_vars/localhost/nova.yml
deleted file mode 100644
index 6fbef3b31f..0000000000
--- a/inventory/host_vars/localhost/nova.yml
+++ /dev/null
@@ -1,17 +0,0 @@
----
-# Copyright 2017, Logan Vig <logan2211@gmail.com>
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-# Enable barbican if the group is populated. repo and nova use this.
-nova_barbican_enabled: "{{ (groups['barbican_all'] is defined) and (groups['barbican_all'] | length > 0) }}"
diff --git a/playbooks/os-cinder-install.yml b/playbooks/os-cinder-install.yml
index 05e99f20c8..25cdef3af4 100644
--- a/playbooks/os-cinder-install.yml
+++ b/playbooks/os-cinder-install.yml
@@ -178,7 +178,7 @@
     - name: Perform online data migrations
       command: "{{ cinder_bin }}/cinder-manage db online_data_migrations"
       become: yes
-      become_user: "{{ cinder_system_user_name }}"
+      become_user: "{{ cinder_system_user_name | default('cinder') }}"
       when:
         - "cinder_all_software_updated | bool"
         - "ansible_local['openstack_ansible']['cinder']['need_online_data_migrations'] | bool"
diff --git a/playbooks/os-gnocchi-install.yml b/playbooks/os-gnocchi-install.yml
index 2e8c9fe937..86899a28eb 100644
--- a/playbooks/os-gnocchi-install.yml
+++ b/playbooks/os-gnocchi-install.yml
@@ -42,13 +42,4 @@
       when:
         - hostvars['localhost']['resolvconf_enabled'] | bool
   roles:
-    - role: "ceph_client"
-      openstack_service_system_user: "{{ gnocchi_system_user_name }}"
-      openstack_service_venv_bin: ""
-      when:
-        - inventory_hostname in groups['gnocchi_api']
-        - (gnocchi_storage_driver | default('none') | lower == 'ceph')
-      tags:
-        - ceph
-
     - role: "os_gnocchi"
diff --git a/playbooks/os-keystone-install.yml b/playbooks/os-keystone-install.yml
index 66510ba56f..82679ed4a9 100644
--- a/playbooks/os-keystone-install.yml
+++ b/playbooks/os-keystone-install.yml
@@ -135,7 +135,7 @@
     - name: Perform a Keystone DB sync contract
       command: "{{ keystone_bin }}/keystone-manage db_sync --contract"
       become: yes
-      become_user: "{{ keystone_system_user_name }}"
+      become_user: "{{ keystone_system_user_name | default('keystone') }}"
       when:
         - "keystone_all_software_updated | bool"
         - "ansible_local['openstack_ansible']['keystone']['need_db_contract'] | bool"
diff --git a/playbooks/os-nova-install.yml b/playbooks/os-nova-install.yml
index 1544bc042f..2db2f24740 100644
--- a/playbooks/os-nova-install.yml
+++ b/playbooks/os-nova-install.yml
@@ -145,7 +145,7 @@
     - name: Perform online data migrations
       command: "{{ nova_bin }}/nova-manage db online_data_migrations"
       become: yes
-      become_user: "{{ nova_system_user_name }}"
+      become_user: "{{ nova_system_user_name | default('nova') }}"
       when:
         - "nova_all_software_updated | bool"
         - "ansible_local['openstack_ansible']['nova']['need_online_data_migrations'] | bool"