Merge "refactor sources/users to separate files"

3 files changed, 705 insertions, 683 deletions

diff --git a/kolla/common/config.py b/kolla/common/config.py
index eac675eeb..f4ef4925a 100755
--- a/kolla/common/config.py
+++ b/kolla/common/config.py
@@ -16,6 +16,8 @@ import os
 from oslo_config import cfg
 from oslo_config import types
 
+from kolla.common.sources import SOURCES
+from kolla.common.users import USERS
 from kolla.version import version_info as version
 
 
@@ -284,689 +286,6 @@ _BASE_OPTS = [
 ]
 
 
-SOURCES = {
-    'openstack-base': {
-        'type': 'url',
-        'location': ('$tarballs_base/openstack/requirements/'
-                     'requirements-${openstack_branch}.tar.gz')},
-    'aodh-base': {
-        'type': 'url',
-        'location': ('$tarballs_base/openstack/aodh/'
-                     'aodh-${openstack_branch}.tar.gz')},
-    'barbican-base': {
-        'type': 'url',
-        'location': ('$tarballs_base/openstack/barbican/'
-                     'barbican-${openstack_branch}.tar.gz')},
-    'bifrost-base': {
-        'type': 'url',
-        'location': ('$tarballs_base/openstack/bifrost/'
-                     'bifrost-${openstack_branch}.tar.gz')},
-    'blazar-base': {
-        'type': 'url',
-        'location': ('$tarballs_base/openstack/blazar/'
-                     'blazar-${openstack_branch}.tar.gz')},
-    'ceilometer-base': {
-        'type': 'url',
-        'location': ('$tarballs_base/openstack/ceilometer/'
-                     'ceilometer-${openstack_branch}.tar.gz')},
-    'cinder-base': {
-        'type': 'url',
-        'location': ('$tarballs_base/openstack/cinder/'
-                     'cinder-${openstack_branch}.tar.gz')},
-    'cloudkitty-base': {
-        'type': 'url',
-        'location': ('$tarballs_base/openstack/cloudkitty/'
-                     'cloudkitty-${openstack_branch}.tar.gz')},
-    'cyborg-base': {
-        'type': 'url',
-        'location': ('$tarballs_base/openstack/cyborg/'
-                     'cyborg-${openstack_branch}.tar.gz')},
-    'designate-base': {
-        'type': 'url',
-        'location': ('$tarballs_base/openstack/designate/'
-                     'designate-${openstack_branch}.tar.gz')},
-    'freezer-api': {
-        'type': 'url',
-        'location': ('$tarballs_base/openstack/freezer-api/'
-                     'freezer-api-${openstack_branch}.tar.gz')},
-    'freezer-base': {
-        'type': 'url',
-        'location': ('$tarballs_base/openstack/freezer/'
-                     'freezer-${openstack_branch}.tar.gz')},
-    'glance-base': {
-        'type': 'url',
-        'location': ('$tarballs_base/openstack/glance/'
-                     'glance-${openstack_branch}.tar.gz')},
-    'gnocchi-base': {
-        'type': 'git',
-        'reference': '4.4.1',
-        'location': ('https://github.com/gnocchixyz/'
-                     'gnocchi.git')},
-    'heat-base': {
-        'type': 'url',
-        'location': ('$tarballs_base/openstack/heat/'
-                     'heat-${openstack_branch}.tar.gz')},
-    'horizon': {
-        'type': 'url',
-        'location': ('$tarballs_base/openstack/horizon/'
-                     'horizon-${openstack_branch}.tar.gz')},
-    'horizon-plugin-blazar-dashboard': {
-        'type': 'url',
-        'location': ('$tarballs_base/openstack/blazar-dashboard/'
-                     'blazar-dashboard-${openstack_branch}.tar.gz')},
-    'horizon-plugin-cloudkitty-dashboard': {
-        'type': 'url',
-        'location': ('$tarballs_base/openstack/cloudkitty-dashboard/'
-                     'cloudkitty-dashboard-${openstack_branch}.tar.gz')},
-    'horizon-plugin-designate-dashboard': {
-        'type': 'url',
-        'location': ('$tarballs_base/openstack/designate-dashboard/'
-                     'designate-dashboard-${openstack_branch}.tar.gz')},
-    'horizon-plugin-freezer-web-ui': {
-        'type': 'url',
-        'location': ('$tarballs_base/openstack/freezer-web-ui/'
-                     'freezer-web-ui-${openstack_branch}.tar.gz')},
-    'horizon-plugin-heat-dashboard': {
-        'type': 'url',
-        'location': ('$tarballs_base/openstack/heat-dashboard/'
-                     'heat-dashboard-${openstack_branch}.tar.gz')},
-    'horizon-plugin-ironic-ui': {
-        'type': 'url',
-        'location': ('$tarballs_base/openstack/ironic-ui/'
-                     'ironic-ui-${openstack_branch}.tar.gz')},
-    'horizon-plugin-magnum-ui': {
-        'type': 'url',
-        'location': ('$tarballs_base/openstack/magnum-ui/'
-                     'magnum-ui-${openstack_branch}.tar.gz')},
-    'horizon-plugin-manila-ui': {
-        'type': 'url',
-        'location': ('$tarballs_base/openstack/manila-ui/'
-                     'manila-ui-${openstack_branch}.tar.gz')},
-    'horizon-plugin-masakari-dashboard': {
-        'type': 'url',
-        'location': ('$tarballs_base/openstack/masakari-dashboard/'
-                     'masakari-dashboard-${openstack_branch}.tar.gz')},
-    'horizon-plugin-mistral-dashboard': {
-        'type': 'url',
-        'location': ('$tarballs_base/openstack/mistral-dashboard/'
-                     'mistral-dashboard-${openstack_branch}.tar.gz')},
-    'horizon-plugin-monasca-ui': {
-        'type': 'url',
-        'location': ('$tarballs_base/openstack/monasca-ui/'
-                     'monasca-ui-${openstack_branch}.tar.gz')},
-    'horizon-plugin-murano-dashboard': {
-        'type': 'url',
-        'location': ('$tarballs_base/openstack/murano-dashboard/'
-                     'murano-dashboard-${openstack_branch}.tar.gz')},
-    'horizon-plugin-neutron-vpnaas-dashboard': {
-        'type': 'url',
-        'location': ('$tarballs_base/openstack/neutron-vpnaas-dashboard/'
-                     'neutron-vpnaas-dashboard-${openstack_branch}.tar.gz')},
-    'horizon-plugin-octavia-dashboard': {
-        'type': 'url',
-        'location': ('$tarballs_base/openstack/octavia-dashboard/'
-                     'octavia-dashboard-${openstack_branch}.tar.gz')},
-    'horizon-plugin-sahara-dashboard': {
-        'type': 'url',
-        'location': ('$tarballs_base/openstack/sahara-dashboard/'
-                     'sahara-dashboard-${openstack_branch}.tar.gz')},
-    'horizon-plugin-senlin-dashboard': {
-        'type': 'url',
-        'location': ('$tarballs_base/openstack/senlin-dashboard/'
-                     'senlin-dashboard-${openstack_branch}.tar.gz')},
-    'horizon-plugin-solum-dashboard': {
-        'type': 'url',
-        'location': ('$tarballs_base/openstack/solum-dashboard/'
-                     'solum-dashboard-${openstack_branch}.tar.gz')},
-    'horizon-plugin-tacker-dashboard': {
-        'type': 'url',
-        'location': ('$tarballs_base/openstack/tacker-horizon/'
-                     'tacker-horizon-${openstack_branch}.tar.gz')},
-    'horizon-plugin-trove-dashboard': {
-        'type': 'url',
-        'location': ('$tarballs_base/openstack/trove-dashboard/'
-                     'trove-dashboard-${openstack_branch}.tar.gz')},
-    'horizon-plugin-vitrage-dashboard': {
-        'type': 'url',
-        'location': ('$tarballs_base/openstack/vitrage-dashboard/'
-                     'vitrage-dashboard-${openstack_branch}.tar.gz')},
-    'horizon-plugin-watcher-dashboard': {
-        'type': 'url',
-        'location': ('$tarballs_base/openstack/watcher-dashboard/'
-                     'watcher-dashboard-${openstack_branch}.tar.gz')},
-    'horizon-plugin-zun-ui': {
-        'type': 'url',
-        'location': ('$tarballs_base/openstack/zun-ui/'
-                     'zun-ui-${openstack_branch}.tar.gz')},
-    'ironic-base': {
-        'type': 'url',
-        'location': ('$tarballs_base/openstack/ironic/'
-                     'ironic-${openstack_branch}.tar.gz')},
-    'ironic-inspector': {
-        'type': 'url',
-        'location': ('$tarballs_base/openstack/ironic-inspector/'
-                     'ironic-inspector-${openstack_branch}.tar.gz')},
-    'keystone-base': {
-        'type': 'url',
-        'location': ('$tarballs_base/openstack/keystone/'
-                     'keystone-${openstack_branch}.tar.gz')},
-    'kuryr-base': {
-        'type': 'url',
-        'location': ('$tarballs_base/openstack/kuryr/'
-                     'kuryr-${openstack_branch}.tar.gz')},
-    'kuryr-libnetwork': {
-        'type': 'url',
-        'location': ('$tarballs_base/openstack/kuryr-libnetwork/'
-                     'kuryr-libnetwork-${openstack_branch}.tar.gz')},
-    'magnum-base': {
-        'type': 'url',
-        'location': ('$tarballs_base/openstack/magnum/'
-                     'magnum-${openstack_branch}.tar.gz')},
-    'manila-base': {
-        'type': 'url',
-        'location': ('$tarballs_base/openstack/manila/'
-                     'manila-${openstack_branch}.tar.gz')},
-    'masakari-base': {
-        'type': 'url',
-        'location': ('$tarballs_base/openstack/masakari/'
-                     'masakari-${openstack_branch}.tar.gz')},
-    'masakari-monitors': {
-        'type': 'url',
-        'location': ('$tarballs_base/openstack/masakari-monitors/'
-                     'masakari-monitors-${openstack_branch}.tar.gz')},
-    'mistral-base': {
-        'type': 'url',
-        'location': ('$tarballs_base/openstack/mistral/'
-                     'mistral-${openstack_branch}.tar.gz')},
-    'mistral-base-plugin-tacker': {
-        'type': 'url',
-        'location': ('$tarballs_base/openstack/tacker/'
-                     'tacker-${openstack_branch}.tar.gz')},
-    'monasca-agent': {
-        'type': 'url',
-        'location': ('$tarballs_base/openstack/monasca-agent/'
-                     'monasca-agent-${openstack_branch}.tar.gz')},
-    'monasca-api': {
-        'type': 'url',
-        'location': ('$tarballs_base/openstack/monasca-api/'
-                     'monasca-api-${openstack_branch}.tar.gz')},
-    'monasca-notification': {
-        'type': 'url',
-        'location': ('$tarballs_base/openstack/monasca-notification/'
-                     'monasca-notification-${openstack_branch}.tar.gz')},
-    'monasca-persister': {
-        'type': 'url',
-        'location': ('$tarballs_base/openstack/monasca-persister/'
-                     'monasca-persister-${openstack_branch}.tar.gz')},
-    'monasca-statsd': {
-        'type': 'url',
-        'location': ('$tarballs_base/openstack/monasca-statsd/'
-                     'monasca-statsd-${openstack_branch}.tar.gz')},
-    # FIXME(dszumski): Use openstack tar when infra is fixed
-    'monasca-thresh': {
-        'type': 'url',
-        'location': ('https://github.com/openstack/monasca-thresh/archive/'
-                     '${openstack_branch_slashed}.tar.gz')},
-    'monasca-thresh-additions-monasca-common': {
-        'type': 'url',
-        'location': ('$tarballs_base/openstack/monasca-common/'
-                     'monasca-common-${openstack_branch}.tar.gz')},
-    'murano-base': {
-        'type': 'url',
-        'location': ('$tarballs_base/openstack/murano/'
-                     'murano-${openstack_branch}.tar.gz')},
-    'neutron-base': {
-        'type': 'url',
-        'location': ('$tarballs_base/openstack/neutron/'
-                     'neutron-${openstack_branch}.tar.gz')},
-    'neutron-base-plugin-networking-baremetal': {
-        'type': 'url',
-        'location': ('$tarballs_base/openstack/networking-baremetal/'
-                     'networking-baremetal-${openstack_branch}.tar.gz')},
-    'neutron-base-plugin-networking-generic-switch': {
-        'type': 'url',
-        'location': ('$tarballs_base/openstack/networking-generic-switch/'
-                     'networking-generic-switch-${openstack_branch}.tar.gz')},
-    'neutron-base-plugin-networking-sfc': {
-        'type': 'url',
-        'location': ('$tarballs_base/openstack/networking-sfc/'
-                     'networking-sfc-${openstack_branch}.tar.gz')},
-    'neutron-base-plugin-vpnaas-agent': {
-        'type': 'url',
-        'location': ('$tarballs_base/openstack/neutron-vpnaas/'
-                     'neutron-vpnaas-${openstack_branch}.tar.gz')},
-    'neutron-bgp-dragent': {
-        'type': 'url',
-        'location': ('$tarballs_base/openstack/neutron-dynamic-routing/'
-                     'neutron-dynamic-routing-${openstack_branch}.tar.gz')},
-    'neutron-server-plugin-neutron-dynamic-routing': {
-        'type': 'url',
-        'location': ('$tarballs_base/openstack/neutron-dynamic-routing/'
-                     'neutron-dynamic-routing-${openstack_branch}.tar.gz')},
-    'neutron-vpnaas-agent': {
-        'type': 'url',
-        'location': ('$tarballs_base/openstack/neutron-vpnaas/'
-                     'neutron-vpnaas-${openstack_branch}.tar.gz')},
-    'nova-base': {
-        'type': 'url',
-        'location': ('$tarballs_base/openstack/nova/'
-                     'nova-${openstack_branch}.tar.gz')},
-    'nova-base-plugin-blazar': {
-        'type': 'url',
-        'location': ('$tarballs_base/openstack/blazar-nova/'
-                     'blazar-nova-${openstack_branch}.tar.gz')},
-    'octavia-base': {
-        'type': 'url',
-        'location': ('$tarballs_base/openstack/octavia/'
-                     'octavia-${openstack_branch}.tar.gz')},
-    'octavia-api-plugin-ovn-octavia-provider': {
-        'type': 'url',
-        'location': ('$tarballs_base/openstack/ovn-octavia-provider/'
-                     'ovn-octavia-provider-${openstack_branch}.tar.gz')},
-    'octavia-driver-agent-plugin-ovn-octavia-provider': {
-        'type': 'url',
-        'location': ('$tarballs_base/openstack/ovn-octavia-provider/'
-                     'ovn-octavia-provider-${openstack_branch}.tar.gz')},
-    'placement-base': {
-        'type': 'url',
-        'location': ('$tarballs_base/openstack/placement/'
-                     'placement-${openstack_branch}.tar.gz')},
-    'sahara-base': {
-        'type': 'url',
-        'location': ('$tarballs_base/openstack/sahara/'
-                     'sahara-${openstack_branch}.tar.gz')},
-    'sahara-base-plugin-ambari': {
-        'type': 'url',
-        'location': ('$tarballs_base/openstack/sahara-plugin-ambari/'
-                     'sahara-plugin-ambari-${openstack_branch}.tar.gz')},
-    'sahara-base-plugin-cdh': {
-        'type': 'url',
-        'location': ('$tarballs_base/openstack/sahara-plugin-cdh/'
-                     'sahara-plugin-cdh-${openstack_branch}.tar.gz')},
-    'sahara-base-plugin-mapr': {
-        'type': 'url',
-        'location': ('$tarballs_base/openstack/sahara-plugin-mapr/'
-                     'sahara-plugin-mapr-${openstack_branch}.tar.gz')},
-    'sahara-base-plugin-spark': {
-        'type': 'url',
-        'location': ('$tarballs_base/openstack/sahara-plugin-spark/'
-                     'sahara-plugin-spark-${openstack_branch}.tar.gz')},
-    'sahara-base-plugin-storm': {
-        'type': 'url',
-        'location': ('$tarballs_base/openstack/sahara-plugin-storm/'
-                     'sahara-plugin-storm-${openstack_branch}.tar.gz')},
-    'sahara-base-plugin-vanilla': {
-        'type': 'url',
-        'location': ('$tarballs_base/openstack/sahara-plugin-vanilla/'
-                     'sahara-plugin-vanilla-${openstack_branch}.tar.gz')},
-    'senlin-base': {
-        'type': 'url',
-        'location': ('$tarballs_base/openstack/senlin/'
-                     'senlin-${openstack_branch}.tar.gz')},
-    'solum-base': {
-        'type': 'url',
-        'location': ('$tarballs_base/openstack/solum/'
-                     'solum-${openstack_branch}.tar.gz')},
-    'swift-base': {
-        'type': 'url',
-        'location': ('$tarballs_base/openstack/swift/'
-                     'swift-${openstack_branch}.tar.gz')},
-    'tacker-base': {
-        'type': 'url',
-        'location': ('$tarballs_base/openstack/tacker/'
-                     'tacker-${openstack_branch}.tar.gz')},
-    'tacker-base-plugin-networking-sfc': {
-        'type': 'url',
-        'location': ('$tarballs_base/openstack/networking-sfc/'
-                     'networking-sfc-${openstack_branch}.tar.gz')},
-    'trove-base': {
-        'type': 'url',
-        'location': ('$tarballs_base/openstack/trove/'
-                     'trove-${openstack_branch}.tar.gz')},
-    # FIXME(mgoddard): Revert to ${openstack_branch} when a stable-yoga tarball
-    # exists.
-    'venus-base': {
-        'type': 'url',
-        'location': ('$tarballs_base/openstack/venus/'
-                     'venus-master.tar.gz')},
-    'vitrage-base': {
-        'type': 'url',
-        'location': ('$tarballs_base/openstack/vitrage/'
-                     'vitrage-${openstack_branch}.tar.gz')},
-    'watcher-base': {
-        'type': 'url',
-        'location': ('$tarballs_base/openstack/watcher/'
-                     'watcher-${openstack_branch}.tar.gz')},
-    'zun-base': {
-        'type': 'url',
-        'location': ('$tarballs_base/openstack/zun/'
-                     'zun-${openstack_branch}.tar.gz')}
-}
-
-
-# NOTE(SamYaple): Only increment the UID. Never reuse old or removed UIDs.
-#     Starting point 42400+ was chosen arbitrarily to ensure no conflicts
-USERS = {
-    'kolla-user': {
-        'uid': 42400,
-        'gid': 42400,
-    },
-    'ansible-user': {
-        'uid': 42401,
-        'gid': 42401,
-    },
-    'aodh-user': {
-        'uid': 42402,
-        'gid': 42402,
-    },
-    'barbican-user': {
-        'uid': 42403,
-        'gid': 42403,
-    },
-    'bifrost-user': {
-        'uid': 42404,
-        'gid': 42404,
-    },
-    'ceilometer-user': {
-        'uid': 42405,
-        'gid': 42405,
-    },
-    'cinder-user': {
-        'uid': 42407,
-        'gid': 42407,
-    },
-    'cloudkitty-user': {
-        'uid': 42408,
-        'gid': 42408,
-    },
-    'collectd-user': {
-        'uid': 42409,
-        'gid': 42409,
-    },
-    'congress-user': {  # unused user (congress dropped)
-        'uid': 42410,
-        'gid': 42410,
-    },
-    'designate-user': {
-        'uid': 42411,
-        'gid': 42411,
-    },
-    'elasticsearch-user': {
-        'uid': 42412,
-        'gid': 42412,
-    },
-    'etcd-user': {
-        'uid': 42413,
-        'gid': 42413,
-    },
-    'freezer-user': {
-        'uid': 42414,
-        'gid': 42414,
-    },
-    'glance-user': {
-        'uid': 42415,
-        'gid': 42415,
-    },
-    'gnocchi-user': {
-        'uid': 42416,
-        'gid': 42416,
-    },
-    'grafana-user': {
-        'uid': 42417,
-        'gid': 42417,
-    },
-    'heat-user': {
-        'uid': 42418,
-        'gid': 42418,
-    },
-    'horizon-user': {
-        'uid': 42420,
-        'gid': 42420,
-    },
-    'influxdb-user': {
-        'uid': 42421,
-        'gid': 42421,
-    },
-    'ironic-user': {
-        'uid': 42422,
-        'gid': 42422,
-    },
-    'kafka-user': {
-        'uid': 42423,
-        'gid': 42423,
-    },
-    'keystone-user': {
-        'uid': 42425,
-        'gid': 42425,
-    },
-    'kibana-user': {
-        'uid': 42426,
-        'gid': 42426,
-    },
-    'qemu-user': {
-        'uid': 42427,
-        'gid': 42427,
-    },
-    'magnum-user': {
-        'uid': 42428,
-        'gid': 42428,
-    },
-    'manila-user': {
-        'uid': 42429,
-        'gid': 42429,
-    },
-    'mistral-user': {
-        'uid': 42430,
-        'gid': 42430,
-    },
-    'monasca-user': {
-        'uid': 42431,
-        'gid': 42431,
-    },
-    'mongodb-user': {  # unused user (mongodb dropped)
-        'uid': 42432,
-        'gid': 42432,
-    },
-    'murano-user': {
-        'uid': 42433,
-        'gid': 42433,
-    },
-    'mysql-user': {
-        'uid': 42434,
-        'gid': 42434,
-    },
-    'neutron-user': {
-        'uid': 42435,
-        'gid': 42435,
-    },
-    'nova-user': {
-        'uid': 42436,
-        'gid': 42436,
-    },
-    'octavia-user': {
-        'uid': 42437,
-        'gid': 42437,
-    },
-    'rabbitmq-user': {
-        'uid': 42439,
-        'gid': 42439,
-    },
-    'rally-user': {  # unused user (rally dropped)
-        'uid': 42440,
-        'gid': 42440,
-    },
-    'sahara-user': {
-        'uid': 42441,
-        'gid': 42441,
-    },
-    'senlin-user': {
-        'uid': 42443,
-        'gid': 42443,
-    },
-    'solum-user': {
-        'uid': 42444,
-        'gid': 42444,
-    },
-    'swift-user': {
-        'uid': 42445,
-        'gid': 42445,
-    },
-    'tacker-user': {
-        'uid': 42446,
-        'gid': 42446,
-    },
-    'td-agent-user': {
-        'uid': 42447,
-        'gid': 42447,
-    },
-    'telegraf-user': {
-        'uid': 42448,
-        'gid': 42448,
-    },
-    'trove-user': {
-        'uid': 42449,
-        'gid': 42449,
-    },
-    'vmtp-user': {  # unused user (vmtp dropped)
-        'uid': 42450,
-        'gid': 42450,
-    },
-    'watcher-user': {
-        'uid': 42451,
-        'gid': 42451,
-    },
-    'zookeeper-user': {
-        'uid': 42453,
-        'gid': 42453,
-    },
-    'haproxy-user': {
-        'uid': 42454,
-        'gid': 42454,
-    },
-    'memcached-user': {
-        'uid': 42457,
-        'gid': 42457,
-    },
-    'vitrage-user': {
-        'uid': 42459,
-        'gid': 42459,
-    },
-    'redis-user': {
-        'uid': 42460,
-        'gid': 42460,
-    },
-    'ironic-inspector-user': {
-        'uid': 42461,
-        'gid': 42461,
-    },
-    'odl-user': {
-        'uid': 42462,
-        'gid': 42462,
-    },
-    'zun-user': {
-        'uid': 42463,
-        'gid': 42463,
-    },
-    'dragonflow-user': {  # unused user (dragonflow dropped)
-        'uid': 42464,
-        'gid': 42464,
-    },
-    'qdrouterd-user': {   # unused user (qdrouterd dropped)
-        'uid': 42465,
-        'gid': 42465,
-    },
-    'ec2api-user': {
-        'uid': 42466,
-        'gid': 42466,
-    },
-    'sensu-user': {  # unused used (sensu dropped)
-        'uid': 42467,
-        'gid': 42467,
-    },
-    'skydive-user': {
-        'uid': 42468,
-        'gid': 42468,
-    },
-    'kuryr-user': {
-        'uid': 42469,
-        'gid': 42469,
-    },
-    'blazar-user': {
-        'uid': 42471,
-        'gid': 42471,
-    },
-    'prometheus-user': {
-        'uid': 42472,
-        'gid': 42472,
-    },
-    'libvirt-user': {
-        'uid': 42473,  # unused user, but we need the group for socket access
-        'gid': 42473,
-    },
-    'fluentd-user': {
-        'uid': 42474,
-        'gid': 42474,
-    },
-    'almanach-user': {  # unused user (almanach dropped)
-        'uid': 42475,
-        'gid': 42475,
-    },
-    'openvswitch-user': {
-        'uid': 42476,  # unused user
-        'gid': 42476,
-    },
-    'hugetlbfs-user': {
-        'uid': 42477,  # unused user, but we need the group for vhost socket
-        'gid': 42477,
-    },
-    'logstash-user': {
-        'uid': 42478,
-        'gid': 42478,
-    },
-    'storm-user': {
-        'uid': 42479,
-        'gid': 42479,
-    },
-    'tempest-user': {  # unused user (tempest dropped)
-        'uid': 42480,
-        'gid': 42480,
-    },
-    'nfast-user': {
-        'uid': 42481,  # unused user, but we need the group for thales hsm
-        'gid': 42481,
-    },
-    'placement-user': {
-        'uid': 42482,
-        'gid': 42482,
-    },
-    'cyborg-user': {
-        'uid': 42483,
-        'gid': 42483,
-    },
-    'masakari-user': {
-        'uid': 42485,
-        'gid': 42485,
-    },
-    'hacluster-user': {
-        'uid': 42486,
-        'gid': 42486,
-        'group': 'haclient',
-    },
-    'proxysql-user': {
-        'uid': 42487,
-        'gid': 42487,
-    },
-    'letsencrypt-user': {
-        'uid': 42488,
-        'gid': 42488,
-    },
-    'venus-user': {
-        'uid': 42489,
-        'gid': 42489,
-    }
-}
-
-
 def get_source_opts(type_=None, location=None, reference=None, enabled=True):
     return [cfg.StrOpt('type', choices=['local', 'git', 'url'],
                        default=type_,
diff --git a/kolla/common/sources.py b/kolla/common/sources.py
new file mode 100644
index 000000000..cfc428da9
--- /dev/null
+++ b/kolla/common/sources.py
@@ -0,0 +1,370 @@
+# 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.
+
+SOURCES = {
+    'openstack-base': {
+        'type': 'url',
+        'location': ('$tarballs_base/openstack/requirements/'
+                     'requirements-${openstack_branch}.tar.gz')},
+    'aodh-base': {
+        'type': 'url',
+        'location': ('$tarballs_base/openstack/aodh/'
+                     'aodh-${openstack_branch}.tar.gz')},
+    'barbican-base': {
+        'type': 'url',
+        'location': ('$tarballs_base/openstack/barbican/'
+                     'barbican-${openstack_branch}.tar.gz')},
+    'bifrost-base': {
+        'type': 'url',
+        'location': ('$tarballs_base/openstack/bifrost/'
+                     'bifrost-${openstack_branch}.tar.gz')},
+    'blazar-base': {
+        'type': 'url',
+        'location': ('$tarballs_base/openstack/blazar/'
+                     'blazar-${openstack_branch}.tar.gz')},
+    'ceilometer-base': {
+        'type': 'url',
+        'location': ('$tarballs_base/openstack/ceilometer/'
+                     'ceilometer-${openstack_branch}.tar.gz')},
+    'cinder-base': {
+        'type': 'url',
+        'location': ('$tarballs_base/openstack/cinder/'
+                     'cinder-${openstack_branch}.tar.gz')},
+    'cloudkitty-base': {
+        'type': 'url',
+        'location': ('$tarballs_base/openstack/cloudkitty/'
+                     'cloudkitty-${openstack_branch}.tar.gz')},
+    'cyborg-base': {
+        'type': 'url',
+        'location': ('$tarballs_base/openstack/cyborg/'
+                     'cyborg-${openstack_branch}.tar.gz')},
+    'designate-base': {
+        'type': 'url',
+        'location': ('$tarballs_base/openstack/designate/'
+                     'designate-${openstack_branch}.tar.gz')},
+    'freezer-api': {
+        'type': 'url',
+        'location': ('$tarballs_base/openstack/freezer-api/'
+                     'freezer-api-${openstack_branch}.tar.gz')},
+    'freezer-base': {
+        'type': 'url',
+        'location': ('$tarballs_base/openstack/freezer/'
+                     'freezer-${openstack_branch}.tar.gz')},
+    'glance-base': {
+        'type': 'url',
+        'location': ('$tarballs_base/openstack/glance/'
+                     'glance-${openstack_branch}.tar.gz')},
+    'gnocchi-base': {
+        'type': 'git',
+        'reference': '4.4.1',
+        'location': ('https://github.com/gnocchixyz/'
+                     'gnocchi.git')},
+    'heat-base': {
+        'type': 'url',
+        'location': ('$tarballs_base/openstack/heat/'
+                     'heat-${openstack_branch}.tar.gz')},
+    'horizon': {
+        'type': 'url',
+        'location': ('$tarballs_base/openstack/horizon/'
+                     'horizon-${openstack_branch}.tar.gz')},
+    'horizon-plugin-blazar-dashboard': {
+        'type': 'url',
+        'location': ('$tarballs_base/openstack/blazar-dashboard/'
+                     'blazar-dashboard-${openstack_branch}.tar.gz')},
+    'horizon-plugin-cloudkitty-dashboard': {
+        'type': 'url',
+        'location': ('$tarballs_base/openstack/cloudkitty-dashboard/'
+                     'cloudkitty-dashboard-${openstack_branch}.tar.gz')},
+    'horizon-plugin-designate-dashboard': {
+        'type': 'url',
+        'location': ('$tarballs_base/openstack/designate-dashboard/'
+                     'designate-dashboard-${openstack_branch}.tar.gz')},
+    'horizon-plugin-freezer-web-ui': {
+        'type': 'url',
+        'location': ('$tarballs_base/openstack/freezer-web-ui/'
+                     'freezer-web-ui-${openstack_branch}.tar.gz')},
+    'horizon-plugin-heat-dashboard': {
+        'type': 'url',
+        'location': ('$tarballs_base/openstack/heat-dashboard/'
+                     'heat-dashboard-${openstack_branch}.tar.gz')},
+    'horizon-plugin-ironic-ui': {
+        'type': 'url',
+        'location': ('$tarballs_base/openstack/ironic-ui/'
+                     'ironic-ui-${openstack_branch}.tar.gz')},
+    'horizon-plugin-magnum-ui': {
+        'type': 'url',
+        'location': ('$tarballs_base/openstack/magnum-ui/'
+                     'magnum-ui-${openstack_branch}.tar.gz')},
+    'horizon-plugin-manila-ui': {
+        'type': 'url',
+        'location': ('$tarballs_base/openstack/manila-ui/'
+                     'manila-ui-${openstack_branch}.tar.gz')},
+    'horizon-plugin-masakari-dashboard': {
+        'type': 'url',
+        'location': ('$tarballs_base/openstack/masakari-dashboard/'
+                     'masakari-dashboard-${openstack_branch}.tar.gz')},
+    'horizon-plugin-mistral-dashboard': {
+        'type': 'url',
+        'location': ('$tarballs_base/openstack/mistral-dashboard/'
+                     'mistral-dashboard-${openstack_branch}.tar.gz')},
+    'horizon-plugin-monasca-ui': {
+        'type': 'url',
+        'location': ('$tarballs_base/openstack/monasca-ui/'
+                     'monasca-ui-${openstack_branch}.tar.gz')},
+    'horizon-plugin-murano-dashboard': {
+        'type': 'url',
+        'location': ('$tarballs_base/openstack/murano-dashboard/'
+                     'murano-dashboard-${openstack_branch}.tar.gz')},
+    'horizon-plugin-neutron-vpnaas-dashboard': {
+        'type': 'url',
+        'location': ('$tarballs_base/openstack/neutron-vpnaas-dashboard/'
+                     'neutron-vpnaas-dashboard-${openstack_branch}.tar.gz')},
+    'horizon-plugin-octavia-dashboard': {
+        'type': 'url',
+        'location': ('$tarballs_base/openstack/octavia-dashboard/'
+                     'octavia-dashboard-${openstack_branch}.tar.gz')},
+    'horizon-plugin-sahara-dashboard': {
+        'type': 'url',
+        'location': ('$tarballs_base/openstack/sahara-dashboard/'
+                     'sahara-dashboard-${openstack_branch}.tar.gz')},
+    'horizon-plugin-senlin-dashboard': {
+        'type': 'url',
+        'location': ('$tarballs_base/openstack/senlin-dashboard/'
+                     'senlin-dashboard-${openstack_branch}.tar.gz')},
+    'horizon-plugin-solum-dashboard': {
+        'type': 'url',
+        'location': ('$tarballs_base/openstack/solum-dashboard/'
+                     'solum-dashboard-${openstack_branch}.tar.gz')},
+    'horizon-plugin-tacker-dashboard': {
+        'type': 'url',
+        'location': ('$tarballs_base/openstack/tacker-horizon/'
+                     'tacker-horizon-${openstack_branch}.tar.gz')},
+    'horizon-plugin-trove-dashboard': {
+        'type': 'url',
+        'location': ('$tarballs_base/openstack/trove-dashboard/'
+                     'trove-dashboard-${openstack_branch}.tar.gz')},
+    'horizon-plugin-vitrage-dashboard': {
+        'type': 'url',
+        'location': ('$tarballs_base/openstack/vitrage-dashboard/'
+                     'vitrage-dashboard-${openstack_branch}.tar.gz')},
+    'horizon-plugin-watcher-dashboard': {
+        'type': 'url',
+        'location': ('$tarballs_base/openstack/watcher-dashboard/'
+                     'watcher-dashboard-${openstack_branch}.tar.gz')},
+    'horizon-plugin-zun-ui': {
+        'type': 'url',
+        'location': ('$tarballs_base/openstack/zun-ui/'
+                     'zun-ui-${openstack_branch}.tar.gz')},
+    'ironic-base': {
+        'type': 'url',
+        'location': ('$tarballs_base/openstack/ironic/'
+                     'ironic-${openstack_branch}.tar.gz')},
+    'ironic-inspector': {
+        'type': 'url',
+        'location': ('$tarballs_base/openstack/ironic-inspector/'
+                     'ironic-inspector-${openstack_branch}.tar.gz')},
+    'keystone-base': {
+        'type': 'url',
+        'location': ('$tarballs_base/openstack/keystone/'
+                     'keystone-${openstack_branch}.tar.gz')},
+    'kuryr-base': {
+        'type': 'url',
+        'location': ('$tarballs_base/openstack/kuryr/'
+                     'kuryr-${openstack_branch}.tar.gz')},
+    'kuryr-libnetwork': {
+        'type': 'url',
+        'location': ('$tarballs_base/openstack/kuryr-libnetwork/'
+                     'kuryr-libnetwork-${openstack_branch}.tar.gz')},
+    'magnum-base': {
+        'type': 'url',
+        'location': ('$tarballs_base/openstack/magnum/'
+                     'magnum-${openstack_branch}.tar.gz')},
+    'manila-base': {
+        'type': 'url',
+        'location': ('$tarballs_base/openstack/manila/'
+                     'manila-${openstack_branch}.tar.gz')},
+    'masakari-base': {
+        'type': 'url',
+        'location': ('$tarballs_base/openstack/masakari/'
+                     'masakari-${openstack_branch}.tar.gz')},
+    'masakari-monitors': {
+        'type': 'url',
+        'location': ('$tarballs_base/openstack/masakari-monitors/'
+                     'masakari-monitors-${openstack_branch}.tar.gz')},
+    'mistral-base': {
+        'type': 'url',
+        'location': ('$tarballs_base/openstack/mistral/'
+                     'mistral-${openstack_branch}.tar.gz')},
+    'mistral-base-plugin-tacker': {
+        'type': 'url',
+        'location': ('$tarballs_base/openstack/tacker/'
+                     'tacker-${openstack_branch}.tar.gz')},
+    'monasca-agent': {
+        'type': 'url',
+        'location': ('$tarballs_base/openstack/monasca-agent/'
+                     'monasca-agent-${openstack_branch}.tar.gz')},
+    'monasca-api': {
+        'type': 'url',
+        'location': ('$tarballs_base/openstack/monasca-api/'
+                     'monasca-api-${openstack_branch}.tar.gz')},
+    'monasca-notification': {
+        'type': 'url',
+        'location': ('$tarballs_base/openstack/monasca-notification/'
+                     'monasca-notification-${openstack_branch}.tar.gz')},
+    'monasca-persister': {
+        'type': 'url',
+        'location': ('$tarballs_base/openstack/monasca-persister/'
+                     'monasca-persister-${openstack_branch}.tar.gz')},
+    'monasca-statsd': {
+        'type': 'url',
+        'location': ('$tarballs_base/openstack/monasca-statsd/'
+                     'monasca-statsd-${openstack_branch}.tar.gz')},
+    # FIXME(dszumski): Use openstack tar when infra is fixed
+    'monasca-thresh': {
+        'type': 'url',
+        'location': ('https://github.com/openstack/monasca-thresh/archive/'
+                     '${openstack_branch_slashed}.tar.gz')},
+    'monasca-thresh-additions-monasca-common': {
+        'type': 'url',
+        'location': ('$tarballs_base/openstack/monasca-common/'
+                     'monasca-common-${openstack_branch}.tar.gz')},
+    'murano-base': {
+        'type': 'url',
+        'location': ('$tarballs_base/openstack/murano/'
+                     'murano-${openstack_branch}.tar.gz')},
+    'neutron-base': {
+        'type': 'url',
+        'location': ('$tarballs_base/openstack/neutron/'
+                     'neutron-${openstack_branch}.tar.gz')},
+    'neutron-base-plugin-networking-baremetal': {
+        'type': 'url',
+        'location': ('$tarballs_base/openstack/networking-baremetal/'
+                     'networking-baremetal-${openstack_branch}.tar.gz')},
+    'neutron-base-plugin-networking-generic-switch': {
+        'type': 'url',
+        'location': ('$tarballs_base/openstack/networking-generic-switch/'
+                     'networking-generic-switch-${openstack_branch}.tar.gz')},
+    'neutron-base-plugin-networking-sfc': {
+        'type': 'url',
+        'location': ('$tarballs_base/openstack/networking-sfc/'
+                     'networking-sfc-${openstack_branch}.tar.gz')},
+    'neutron-base-plugin-vpnaas-agent': {
+        'type': 'url',
+        'location': ('$tarballs_base/openstack/neutron-vpnaas/'
+                     'neutron-vpnaas-${openstack_branch}.tar.gz')},
+    'neutron-bgp-dragent': {
+        'type': 'url',
+        'location': ('$tarballs_base/openstack/neutron-dynamic-routing/'
+                     'neutron-dynamic-routing-${openstack_branch}.tar.gz')},
+    'neutron-server-plugin-neutron-dynamic-routing': {
+        'type': 'url',
+        'location': ('$tarballs_base/openstack/neutron-dynamic-routing/'
+                     'neutron-dynamic-routing-${openstack_branch}.tar.gz')},
+    'neutron-vpnaas-agent': {
+        'type': 'url',
+        'location': ('$tarballs_base/openstack/neutron-vpnaas/'
+                     'neutron-vpnaas-${openstack_branch}.tar.gz')},
+    'nova-base': {
+        'type': 'url',
+        'location': ('$tarballs_base/openstack/nova/'
+                     'nova-${openstack_branch}.tar.gz')},
+    'nova-base-plugin-blazar': {
+        'type': 'url',
+        'location': ('$tarballs_base/openstack/blazar-nova/'
+                     'blazar-nova-${openstack_branch}.tar.gz')},
+    'octavia-base': {
+        'type': 'url',
+        'location': ('$tarballs_base/openstack/octavia/'
+                     'octavia-${openstack_branch}.tar.gz')},
+    'octavia-api-plugin-ovn-octavia-provider': {
+        'type': 'url',
+        'location': ('$tarballs_base/openstack/ovn-octavia-provider/'
+                     'ovn-octavia-provider-${openstack_branch}.tar.gz')},
+    'octavia-driver-agent-plugin-ovn-octavia-provider': {
+        'type': 'url',
+        'location': ('$tarballs_base/openstack/ovn-octavia-provider/'
+                     'ovn-octavia-provider-${openstack_branch}.tar.gz')},
+    'placement-base': {
+        'type': 'url',
+        'location': ('$tarballs_base/openstack/placement/'
+                     'placement-${openstack_branch}.tar.gz')},
+    'sahara-base': {
+        'type': 'url',
+        'location': ('$tarballs_base/openstack/sahara/'
+                     'sahara-${openstack_branch}.tar.gz')},
+    'sahara-base-plugin-ambari': {
+        'type': 'url',
+        'location': ('$tarballs_base/openstack/sahara-plugin-ambari/'
+                     'sahara-plugin-ambari-${openstack_branch}.tar.gz')},
+    'sahara-base-plugin-cdh': {
+        'type': 'url',
+        'location': ('$tarballs_base/openstack/sahara-plugin-cdh/'
+                     'sahara-plugin-cdh-${openstack_branch}.tar.gz')},
+    'sahara-base-plugin-mapr': {
+        'type': 'url',
+        'location': ('$tarballs_base/openstack/sahara-plugin-mapr/'
+                     'sahara-plugin-mapr-${openstack_branch}.tar.gz')},
+    'sahara-base-plugin-spark': {
+        'type': 'url',
+        'location': ('$tarballs_base/openstack/sahara-plugin-spark/'
+                     'sahara-plugin-spark-${openstack_branch}.tar.gz')},
+    'sahara-base-plugin-storm': {
+        'type': 'url',
+        'location': ('$tarballs_base/openstack/sahara-plugin-storm/'
+                     'sahara-plugin-storm-${openstack_branch}.tar.gz')},
+    'sahara-base-plugin-vanilla': {
+        'type': 'url',
+        'location': ('$tarballs_base/openstack/sahara-plugin-vanilla/'
+                     'sahara-plugin-vanilla-${openstack_branch}.tar.gz')},
+    'senlin-base': {
+        'type': 'url',
+        'location': ('$tarballs_base/openstack/senlin/'
+                     'senlin-${openstack_branch}.tar.gz')},
+    'solum-base': {
+        'type': 'url',
+        'location': ('$tarballs_base/openstack/solum/'
+                     'solum-${openstack_branch}.tar.gz')},
+    'swift-base': {
+        'type': 'url',
+        'location': ('$tarballs_base/openstack/swift/'
+                     'swift-${openstack_branch}.tar.gz')},
+    'tacker-base': {
+        'type': 'url',
+        'location': ('$tarballs_base/openstack/tacker/'
+                     'tacker-${openstack_branch}.tar.gz')},
+    'tacker-base-plugin-networking-sfc': {
+        'type': 'url',
+        'location': ('$tarballs_base/openstack/networking-sfc/'
+                     'networking-sfc-${openstack_branch}.tar.gz')},
+    'trove-base': {
+        'type': 'url',
+        'location': ('$tarballs_base/openstack/trove/'
+                     'trove-${openstack_branch}.tar.gz')},
+    # FIXME(mgoddard): Revert to ${openstack_branch} when a stable-yoga tarball
+    # exists.
+    'venus-base': {
+        'type': 'url',
+        'location': ('$tarballs_base/openstack/venus/'
+                     'venus-master.tar.gz')},
+    'vitrage-base': {
+        'type': 'url',
+        'location': ('$tarballs_base/openstack/vitrage/'
+                     'vitrage-${openstack_branch}.tar.gz')},
+    'watcher-base': {
+        'type': 'url',
+        'location': ('$tarballs_base/openstack/watcher/'
+                     'watcher-${openstack_branch}.tar.gz')},
+    'zun-base': {
+        'type': 'url',
+        'location': ('$tarballs_base/openstack/zun/'
+                     'zun-${openstack_branch}.tar.gz')}
+}
diff --git a/kolla/common/users.py b/kolla/common/users.py
new file mode 100644
index 000000000..3fc92a54a
--- /dev/null
+++ b/kolla/common/users.py
@@ -0,0 +1,333 @@
+# 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.
+
+# NOTE(SamYaple): Only increment the UID. Never reuse old or removed UIDs.
+#     Starting point 42400+ was chosen arbitrarily to ensure no conflicts
+USERS = {
+    'kolla-user': {
+        'uid': 42400,
+        'gid': 42400,
+    },
+    'ansible-user': {
+        'uid': 42401,
+        'gid': 42401,
+    },
+    'aodh-user': {
+        'uid': 42402,
+        'gid': 42402,
+    },
+    'barbican-user': {
+        'uid': 42403,
+        'gid': 42403,
+    },
+    'bifrost-user': {
+        'uid': 42404,
+        'gid': 42404,
+    },
+    'ceilometer-user': {
+        'uid': 42405,
+        'gid': 42405,
+    },
+    'cinder-user': {
+        'uid': 42407,
+        'gid': 42407,
+    },
+    'cloudkitty-user': {
+        'uid': 42408,
+        'gid': 42408,
+    },
+    'collectd-user': {
+        'uid': 42409,
+        'gid': 42409,
+    },
+    'congress-user': {  # unused user (congress dropped)
+        'uid': 42410,
+        'gid': 42410,
+    },
+    'designate-user': {
+        'uid': 42411,
+        'gid': 42411,
+    },
+    'elasticsearch-user': {
+        'uid': 42412,
+        'gid': 42412,
+    },
+    'etcd-user': {
+        'uid': 42413,
+        'gid': 42413,
+    },
+    'freezer-user': {
+        'uid': 42414,
+        'gid': 42414,
+    },
+    'glance-user': {
+        'uid': 42415,
+        'gid': 42415,
+    },
+    'gnocchi-user': {
+        'uid': 42416,
+        'gid': 42416,
+    },
+    'grafana-user': {
+        'uid': 42417,
+        'gid': 42417,
+    },
+    'heat-user': {
+        'uid': 42418,
+        'gid': 42418,
+    },
+    'horizon-user': {
+        'uid': 42420,
+        'gid': 42420,
+    },
+    'influxdb-user': {
+        'uid': 42421,
+        'gid': 42421,
+    },
+    'ironic-user': {
+        'uid': 42422,
+        'gid': 42422,
+    },
+    'kafka-user': {
+        'uid': 42423,
+        'gid': 42423,
+    },
+    'keystone-user': {
+        'uid': 42425,
+        'gid': 42425,
+    },
+    'kibana-user': {
+        'uid': 42426,
+        'gid': 42426,
+    },
+    'qemu-user': {
+        'uid': 42427,
+        'gid': 42427,
+    },
+    'magnum-user': {
+        'uid': 42428,
+        'gid': 42428,
+    },
+    'manila-user': {
+        'uid': 42429,
+        'gid': 42429,
+    },
+    'mistral-user': {
+        'uid': 42430,
+        'gid': 42430,
+    },
+    'monasca-user': {
+        'uid': 42431,
+        'gid': 42431,
+    },
+    'mongodb-user': {  # unused user (mongodb dropped)
+        'uid': 42432,
+        'gid': 42432,
+    },
+    'murano-user': {
+        'uid': 42433,
+        'gid': 42433,
+    },
+    'mysql-user': {
+        'uid': 42434,
+        'gid': 42434,
+    },
+    'neutron-user': {
+        'uid': 42435,
+        'gid': 42435,
+    },
+    'nova-user': {
+        'uid': 42436,
+        'gid': 42436,
+    },
+    'octavia-user': {
+        'uid': 42437,
+        'gid': 42437,
+    },
+    'rabbitmq-user': {
+        'uid': 42439,
+        'gid': 42439,
+    },
+    'rally-user': {  # unused user (rally dropped)
+        'uid': 42440,
+        'gid': 42440,
+    },
+    'sahara-user': {
+        'uid': 42441,
+        'gid': 42441,
+    },
+    'senlin-user': {
+        'uid': 42443,
+        'gid': 42443,
+    },
+    'solum-user': {
+        'uid': 42444,
+        'gid': 42444,
+    },
+    'swift-user': {
+        'uid': 42445,
+        'gid': 42445,
+    },
+    'tacker-user': {
+        'uid': 42446,
+        'gid': 42446,
+    },
+    'td-agent-user': {
+        'uid': 42447,
+        'gid': 42447,
+    },
+    'telegraf-user': {
+        'uid': 42448,
+        'gid': 42448,
+    },
+    'trove-user': {
+        'uid': 42449,
+        'gid': 42449,
+    },
+    'vmtp-user': {  # unused user (vmtp dropped)
+        'uid': 42450,
+        'gid': 42450,
+    },
+    'watcher-user': {
+        'uid': 42451,
+        'gid': 42451,
+    },
+    'zookeeper-user': {
+        'uid': 42453,
+        'gid': 42453,
+    },
+    'haproxy-user': {
+        'uid': 42454,
+        'gid': 42454,
+    },
+    'memcached-user': {
+        'uid': 42457,
+        'gid': 42457,
+    },
+    'vitrage-user': {
+        'uid': 42459,
+        'gid': 42459,
+    },
+    'redis-user': {
+        'uid': 42460,
+        'gid': 42460,
+    },
+    'ironic-inspector-user': {
+        'uid': 42461,
+        'gid': 42461,
+    },
+    'odl-user': {
+        'uid': 42462,
+        'gid': 42462,
+    },
+    'zun-user': {
+        'uid': 42463,
+        'gid': 42463,
+    },
+    'dragonflow-user': {  # unused user (dragonflow dropped)
+        'uid': 42464,
+        'gid': 42464,
+    },
+    'qdrouterd-user': {   # unused user (qdrouterd dropped)
+        'uid': 42465,
+        'gid': 42465,
+    },
+    'ec2api-user': {
+        'uid': 42466,
+        'gid': 42466,
+    },
+    'sensu-user': {  # unused used (sensu dropped)
+        'uid': 42467,
+        'gid': 42467,
+    },
+    'skydive-user': {
+        'uid': 42468,
+        'gid': 42468,
+    },
+    'kuryr-user': {
+        'uid': 42469,
+        'gid': 42469,
+    },
+    'blazar-user': {
+        'uid': 42471,
+        'gid': 42471,
+    },
+    'prometheus-user': {
+        'uid': 42472,
+        'gid': 42472,
+    },
+    'libvirt-user': {
+        'uid': 42473,  # unused user, but we need the group for socket access
+        'gid': 42473,
+    },
+    'fluentd-user': {
+        'uid': 42474,
+        'gid': 42474,
+    },
+    'almanach-user': {  # unused user (almanach dropped)
+        'uid': 42475,
+        'gid': 42475,
+    },
+    'openvswitch-user': {
+        'uid': 42476,  # unused user
+        'gid': 42476,
+    },
+    'hugetlbfs-user': {
+        'uid': 42477,  # unused user, but we need the group for vhost socket
+        'gid': 42477,
+    },
+    'logstash-user': {
+        'uid': 42478,
+        'gid': 42478,
+    },
+    'storm-user': {
+        'uid': 42479,
+        'gid': 42479,
+    },
+    'tempest-user': {  # unused user (tempest dropped)
+        'uid': 42480,
+        'gid': 42480,
+    },
+    'nfast-user': {
+        'uid': 42481,  # unused user, but we need the group for thales hsm
+        'gid': 42481,
+    },
+    'placement-user': {
+        'uid': 42482,
+        'gid': 42482,
+    },
+    'cyborg-user': {
+        'uid': 42483,
+        'gid': 42483,
+    },
+    'masakari-user': {
+        'uid': 42485,
+        'gid': 42485,
+    },
+    'hacluster-user': {
+        'uid': 42486,
+        'gid': 42486,
+        'group': 'haclient',
+    },
+    'proxysql-user': {
+        'uid': 42487,
+        'gid': 42487,
+    },
+    'letsencrypt-user': {
+        'uid': 42488,
+        'gid': 42488,
+    },
+    'venus-user': {
+        'uid': 42489,
+        'gid': 42489,
+    }
+}