diff --git a/.gitmodules b/.gitmodules
index 59124e4628..69467c6e2c 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,471 +1,3 @@
-[submodule "afsmon"]
-	path = afsmon
-	url = ../../opendev/afsmon.git
-	branch = .
-[submodule "ansible-role-cloud-launcher"]
-	path = ansible-role-cloud-launcher
-	url = ../../opendev/ansible-role-cloud-launcher.git
-	branch = .
-[submodule "ansible-role-puppet"]
-	path = ansible-role-puppet
-	url = ../../opendev/ansible-role-puppet.git
-	branch = .
-[submodule "askbot-theme"]
-	path = askbot-theme
-	url = ../../opendev/askbot-theme.git
-	branch = .
-[submodule "bindep"]
-	path = bindep
-	url = ../../opendev/bindep.git
-	branch = .
-[submodule "elastic-recheck"]
-	path = elastic-recheck
-	url = ../../opendev/elastic-recheck.git
-	branch = .
-[submodule "gear"]
-	path = gear
-	url = ../../opendev/gear.git
-	branch = .
-[submodule "germqtt"]
-	path = germqtt
-	url = ../../opendev/germqtt.git
-	branch = .
-[submodule "gerrit"]
-	path = gerrit
-	url = ../../opendev/gerrit.git
-	branch = .
-[submodule "gerritbot"]
-	path = gerritbot
-	url = ../../opendev/gerritbot.git
-	branch = .
-[submodule "gerritlib"]
-	path = gerritlib
-	url = ../../opendev/gerritlib.git
-	branch = .
-[submodule "git-restack"]
-	path = git-restack
-	url = ../../opendev/git-restack.git
-	branch = .
-[submodule "git-review"]
-	path = git-review
-	url = ../../opendev/git-review.git
-	branch = .
-[submodule "glean"]
-	path = glean
-	url = ../../opendev/glean.git
-	branch = .
-[submodule "grafyaml"]
-	path = grafyaml
-	url = ../../opendev/grafyaml.git
-	branch = .
-[submodule "infra-specs"]
-	path = infra-specs
-	url = ../../opendev/infra-specs.git
-	branch = .
-[submodule "irc-meetings"]
-	path = irc-meetings
-	url = ../../opendev/irc-meetings.git
-	branch = .
-[submodule "jeepyb"]
-	path = jeepyb
-	url = ../../opendev/jeepyb.git
-	branch = .
-[submodule "lodgeit"]
-	path = lodgeit
-	url = ../../opendev/lodgeit.git
-	branch = .
-[submodule "log-classify"]
-	path = log-classify
-	url = ../../opendev/log-classify.git
-	branch = .
-[submodule "log_processor"]
-	path = log_processor
-	url = ../../opendev/log_processor.git
-	branch = .
-[submodule "lpmqtt"]
-	path = lpmqtt
-	url = ../../opendev/lpmqtt.git
-	branch = .
-[submodule "meetbot"]
-	path = meetbot
-	url = ../../opendev/meetbot.git
-	branch = .
-[submodule "mqtt_statsd"]
-	path = mqtt_statsd
-	url = ../../opendev/mqtt_statsd.git
-	branch = .
-[submodule "project-config-example"]
-	path = project-config-example
-	url = ../../opendev/project-config-example.git
-	branch = .
-[submodule "publications"]
-	path = publications
-	url = ../../opendev/publications.git
-	branch = .
-[submodule "puppet-accessbot"]
-	path = puppet-accessbot
-	url = ../../opendev/puppet-accessbot.git
-	branch = .
-[submodule "puppet-ansible"]
-	path = puppet-ansible
-	url = ../../opendev/puppet-ansible.git
-	branch = .
-[submodule "puppet-apparmor"]
-	path = puppet-apparmor
-	url = ../../opendev/puppet-apparmor.git
-	branch = .
-[submodule "puppet-askbot"]
-	path = puppet-askbot
-	url = ../../opendev/puppet-askbot.git
-	branch = .
-[submodule "puppet-asterisk"]
-	path = puppet-asterisk
-	url = ../../opendev/puppet-asterisk.git
-	branch = .
-[submodule "puppet-bandersnatch"]
-	path = puppet-bandersnatch
-	url = ../../opendev/puppet-bandersnatch.git
-	branch = .
-[submodule "puppet-bugdaystats"]
-	path = puppet-bugdaystats
-	url = ../../opendev/puppet-bugdaystats.git
-	branch = .
-[submodule "puppet-bup"]
-	path = puppet-bup
-	url = ../../opendev/puppet-bup.git
-	branch = .
-[submodule "puppet-cgit"]
-	path = puppet-cgit
-	url = ../../opendev/puppet-cgit.git
-	branch = .
-[submodule "puppet-ciwatch"]
-	path = puppet-ciwatch
-	url = ../../opendev/puppet-ciwatch.git
-	branch = .
-[submodule "puppet-dashboard"]
-	path = puppet-dashboard
-	url = ../../opendev/puppet-dashboard.git
-	branch = .
-[submodule "puppet-diskimage_builder"]
-	path = puppet-diskimage_builder
-	url = ../../opendev/puppet-diskimage_builder.git
-	branch = .
-[submodule "puppet-drupal"]
-	path = puppet-drupal
-	url = ../../opendev/puppet-drupal.git
-	branch = .
-[submodule "puppet-elastic_recheck"]
-	path = puppet-elastic_recheck
-	url = ../../opendev/puppet-elastic_recheck.git
-	branch = .
-[submodule "puppet-elasticsearch"]
-	path = puppet-elasticsearch
-	url = ../../opendev/puppet-elasticsearch.git
-	branch = .
-[submodule "puppet-ethercalc"]
-	path = puppet-ethercalc
-	url = ../../opendev/puppet-ethercalc.git
-	branch = .
-[submodule "puppet-etherpad_lite"]
-	path = puppet-etherpad_lite
-	url = ../../opendev/puppet-etherpad_lite.git
-	branch = .
-[submodule "puppet-exim"]
-	path = puppet-exim
-	url = ../../opendev/puppet-exim.git
-	branch = .
-[submodule "puppet-germqtt"]
-	path = puppet-germqtt
-	url = ../../opendev/puppet-germqtt.git
-	branch = .
-[submodule "puppet-gerrit"]
-	path = puppet-gerrit
-	url = ../../opendev/puppet-gerrit.git
-	branch = .
-[submodule "puppet-gerritbot"]
-	path = puppet-gerritbot
-	url = ../../opendev/puppet-gerritbot.git
-	branch = .
-[submodule "puppet-github"]
-	path = puppet-github
-	url = ../../opendev/puppet-github.git
-	branch = .
-[submodule "puppet-grafyaml"]
-	path = puppet-grafyaml
-	url = ../../opendev/puppet-grafyaml.git
-	branch = .
-[submodule "puppet-graphite"]
-	path = puppet-graphite
-	url = ../../opendev/puppet-graphite.git
-	branch = .
-[submodule "puppet-haveged"]
-	path = puppet-haveged
-	url = ../../opendev/puppet-haveged.git
-	branch = .
-[submodule "puppet-hound"]
-	path = puppet-hound
-	url = ../../opendev/puppet-hound.git
-	branch = .
-[submodule "puppet-httpd"]
-	path = puppet-httpd
-	url = ../../opendev/puppet-httpd.git
-	branch = .
-[submodule "puppet-infra-cookiecutter"]
-	path = puppet-infra-cookiecutter
-	url = ../../opendev/puppet-infra-cookiecutter.git
-	branch = .
-[submodule "puppet-infracloud"]
-	path = puppet-infracloud
-	url = ../../opendev/puppet-infracloud.git
-	branch = .
-[submodule "puppet-ipsilon"]
-	path = puppet-ipsilon
-	url = ../../opendev/puppet-ipsilon.git
-	branch = .
-[submodule "puppet-iptables"]
-	path = puppet-iptables
-	url = ../../opendev/puppet-iptables.git
-	branch = .
-[submodule "puppet-jeepyb"]
-	path = puppet-jeepyb
-	url = ../../opendev/puppet-jeepyb.git
-	branch = .
-[submodule "puppet-jenkins"]
-	path = puppet-jenkins
-	url = ../../opendev/puppet-jenkins.git
-	branch = .
-[submodule "puppet-kerberos"]
-	path = puppet-kerberos
-	url = ../../opendev/puppet-kerberos.git
-	branch = .
-[submodule "puppet-kibana"]
-	path = puppet-kibana
-	url = ../../opendev/puppet-kibana.git
-	branch = .
-[submodule "puppet-lodgeit"]
-	path = puppet-lodgeit
-	url = ../../opendev/puppet-lodgeit.git
-	branch = .
-[submodule "puppet-log_processor"]
-	path = puppet-log_processor
-	url = ../../opendev/puppet-log_processor.git
-	branch = .
-[submodule "puppet-logrotate"]
-	path = puppet-logrotate
-	url = ../../opendev/puppet-logrotate.git
-	branch = .
-[submodule "puppet-logstash"]
-	path = puppet-logstash
-	url = ../../opendev/puppet-logstash.git
-	branch = .
-[submodule "puppet-lpmqtt"]
-	path = puppet-lpmqtt
-	url = ../../opendev/puppet-lpmqtt.git
-	branch = .
-[submodule "puppet-mailman"]
-	path = puppet-mailman
-	url = ../../opendev/puppet-mailman.git
-	branch = .
-[submodule "puppet-mediawiki"]
-	path = puppet-mediawiki
-	url = ../../opendev/puppet-mediawiki.git
-	branch = .
-[submodule "puppet-meetbot"]
-	path = puppet-meetbot
-	url = ../../opendev/puppet-meetbot.git
-	branch = .
-[submodule "puppet-mosquitto"]
-	path = puppet-mosquitto
-	url = ../../opendev/puppet-mosquitto.git
-	branch = .
-[submodule "puppet-mqtt_statsd"]
-	path = puppet-mqtt_statsd
-	url = ../../opendev/puppet-mqtt_statsd.git
-	branch = .
-[submodule "puppet-mysql_backup"]
-	path = puppet-mysql_backup
-	url = ../../opendev/puppet-mysql_backup.git
-	branch = .
-[submodule "puppet-nodepool"]
-	path = puppet-nodepool
-	url = ../../opendev/puppet-nodepool.git
-	branch = .
-[submodule "puppet-openafs"]
-	path = puppet-openafs
-	url = ../../opendev/puppet-openafs.git
-	branch = .
-[submodule "puppet-openstack_health"]
-	path = puppet-openstack_health
-	url = ../../opendev/puppet-openstack_health.git
-	branch = .
-[submodule "puppet-openstack_infra_spec_helper"]
-	path = puppet-openstack_infra_spec_helper
-	url = ../../opendev/puppet-openstack_infra_spec_helper.git
-	branch = .
-[submodule "puppet-openstackci"]
-	path = puppet-openstackci
-	url = ../../opendev/puppet-openstackci.git
-	branch = .
-[submodule "puppet-openstackid"]
-	path = puppet-openstackid
-	url = ../../opendev/puppet-openstackid.git
-	branch = .
-[submodule "puppet-os_client_config"]
-	path = puppet-os_client_config
-	url = ../../opendev/puppet-os_client_config.git
-	branch = .
-[submodule "puppet-packagekit"]
-	path = puppet-packagekit
-	url = ../../opendev/puppet-packagekit.git
-	branch = .
-[submodule "puppet-pgsql_backup"]
-	path = puppet-pgsql_backup
-	url = ../../opendev/puppet-pgsql_backup.git
-	branch = .
-[submodule "puppet-phabricator"]
-	path = puppet-phabricator
-	url = ../../opendev/puppet-phabricator.git
-	branch = .
-[submodule "puppet-pip"]
-	path = puppet-pip
-	url = ../../opendev/puppet-pip.git
-	branch = .
-[submodule "puppet-planet"]
-	path = puppet-planet
-	url = ../../opendev/puppet-planet.git
-	branch = .
-[submodule "puppet-project_config"]
-	path = puppet-project_config
-	url = ../../opendev/puppet-project_config.git
-	branch = .
-[submodule "puppet-ptgbot"]
-	path = puppet-ptgbot
-	url = ../../opendev/puppet-ptgbot.git
-	branch = .
-[submodule "puppet-puppet"]
-	path = puppet-puppet
-	url = ../../opendev/puppet-puppet.git
-	branch = .
-[submodule "puppet-redis"]
-	path = puppet-redis
-	url = ../../opendev/puppet-redis.git
-	branch = .
-[submodule "puppet-refstack"]
-	path = puppet-refstack
-	url = ../../opendev/puppet-refstack.git
-	branch = .
-[submodule "puppet-reviewday"]
-	path = puppet-reviewday
-	url = ../../opendev/puppet-reviewday.git
-	branch = .
-[submodule "puppet-simpleproxy"]
-	path = puppet-simpleproxy
-	url = ../../opendev/puppet-simpleproxy.git
-	branch = .
-[submodule "puppet-snmpd"]
-	path = puppet-snmpd
-	url = ../../opendev/puppet-snmpd.git
-	branch = .
-[submodule "puppet-ssh"]
-	path = puppet-ssh
-	url = ../../opendev/puppet-ssh.git
-	branch = .
-[submodule "puppet-ssl_cert_check"]
-	path = puppet-ssl_cert_check
-	url = ../../opendev/puppet-ssl_cert_check.git
-	branch = .
-[submodule "puppet-statusbot"]
-	path = puppet-statusbot
-	url = ../../opendev/puppet-statusbot.git
-	branch = .
-[submodule "puppet-storyboard"]
-	path = puppet-storyboard
-	url = ../../opendev/puppet-storyboard.git
-	branch = .
-[submodule "puppet-subunit2sql"]
-	path = puppet-subunit2sql
-	url = ../../opendev/puppet-subunit2sql.git
-	branch = .
-[submodule "puppet-sudoers"]
-	path = puppet-sudoers
-	url = ../../opendev/puppet-sudoers.git
-	branch = .
-[submodule "puppet-tmpreaper"]
-	path = puppet-tmpreaper
-	url = ../../opendev/puppet-tmpreaper.git
-	branch = .
-[submodule "puppet-translation_checksite"]
-	path = puppet-translation_checksite
-	url = ../../opendev/puppet-translation_checksite.git
-	branch = .
-[submodule "puppet-ulimit"]
-	path = puppet-ulimit
-	url = ../../opendev/puppet-ulimit.git
-	branch = .
-[submodule "puppet-unattended_upgrades"]
-	path = puppet-unattended_upgrades
-	url = ../../opendev/puppet-unattended_upgrades.git
-	branch = .
-[submodule "puppet-unbound"]
-	path = puppet-unbound
-	url = ../../opendev/puppet-unbound.git
-	branch = .
-[submodule "puppet-user"]
-	path = puppet-user
-	url = ../../opendev/puppet-user.git
-	branch = .
-[submodule "puppet-vcsrepo"]
-	path = puppet-vcsrepo
-	url = ../../opendev/puppet-vcsrepo.git
-	branch = .
-[submodule "puppet-yum"]
-	path = puppet-yum
-	url = ../../opendev/puppet-yum.git
-	branch = .
-[submodule "puppet-zanata"]
-	path = puppet-zanata
-	url = ../../opendev/puppet-zanata.git
-	branch = .
-[submodule "puppet-zuul"]
-	path = puppet-zuul
-	url = ../../opendev/puppet-zuul.git
-	branch = .
-[submodule "pynotedb"]
-	path = pynotedb
-	url = ../../opendev/pynotedb.git
-	branch = .
-[submodule "python-storyboardclient"]
-	path = python-storyboardclient
-	url = ../../opendev/python-storyboardclient.git
-	branch = .
-[submodule "statusbot"]
-	path = statusbot
-	url = ../../opendev/statusbot.git
-	branch = .
-[submodule "storyboard"]
-	path = storyboard
-	url = ../../opendev/storyboard.git
-	branch = .
-[submodule "storyboard-webclient"]
-	path = storyboard-webclient
-	url = ../../opendev/storyboard-webclient.git
-	branch = .
-[submodule "subunit2sql"]
-	path = subunit2sql
-	url = ../../opendev/subunit2sql.git
-	branch = .
-[submodule "system-config"]
-	path = system-config
-	url = ../../opendev/system-config.git
-	branch = .
-[submodule "yaml2ical"]
-	path = yaml2ical
-	url = ../../opendev/yaml2ical.git
-	branch = .
-[submodule "zone-opendev.org"]
-	path = zone-opendev.org
-	url = ../../opendev/zone-opendev.org.git
-	branch = .
 [submodule "adjutant"]
 	path = adjutant
 	url = ../../openstack/adjutant.git
@@ -498,6 +30,10 @@
 	path = ansible-role-container-registry
 	url = ../../openstack/ansible-role-container-registry.git
 	branch = .
+[submodule "ansible-role-lunasa-hsm"]
+	path = ansible-role-lunasa-hsm
+	url = ../../openstack/ansible-role-lunasa-hsm.git
+	branch = .
 [submodule "ansible-role-openstack-operations"]
 	path = ansible-role-openstack-operations
 	url = ../../openstack/ansible-role-openstack-operations.git
@@ -558,6 +94,10 @@
 	path = barbican-tempest-plugin
 	url = ../../openstack/barbican-tempest-plugin.git
 	branch = .
+[submodule "barbican-ui"]
+	path = barbican-ui
+	url = ../../openstack/barbican-ui.git
+	branch = .
 [submodule "bashate"]
 	path = bashate
 	url = ../../openstack/bashate.git
@@ -586,10 +126,6 @@
 	path = blazar-tempest-plugin
 	url = ../../openstack/blazar-tempest-plugin.git
 	branch = .
-[submodule "bugdaystats"]
-	path = bugdaystats
-	url = ../../openstack/bugdaystats.git
-	branch = .
 [submodule "castellan"]
 	path = castellan
 	url = ../../openstack/castellan.git
@@ -598,10 +134,6 @@
 	path = ceilometer
 	url = ../../openstack/ceilometer.git
 	branch = .
-[submodule "ceilometer-powervm"]
-	path = ceilometer-powervm
-	url = ../../openstack/ceilometer-powervm.git
-	branch = .
 [submodule "ceilometermiddleware"]
 	path = ceilometermiddleware
 	url = ../../openstack/ceilometermiddleware.git
@@ -662,6 +194,10 @@
 	path = charm-cinder-backup
 	url = ../../openstack/charm-cinder-backup.git
 	branch = .
+[submodule "charm-cinder-backup-swift-proxy"]
+	path = charm-cinder-backup-swift-proxy
+	url = ../../openstack/charm-cinder-backup-swift-proxy.git
+	branch = .
 [submodule "charm-cinder-ceph"]
 	path = charm-cinder-ceph
 	url = ../../openstack/charm-cinder-ceph.git
@@ -742,6 +278,10 @@
 	path = charm-interface-cinder-backend
 	url = ../../openstack/charm-interface-cinder-backend.git
 	branch = .
+[submodule "charm-interface-cinder-backup"]
+	path = charm-interface-cinder-backup
+	url = ../../openstack/charm-interface-cinder-backup.git
+	branch = .
 [submodule "charm-interface-dashboard-plugin"]
 	path = charm-interface-dashboard-plugin
 	url = ../../openstack/charm-interface-dashboard-plugin.git
@@ -778,10 +318,22 @@
 	path = charm-interface-keystone-fid-service-provider
 	url = ../../openstack/charm-interface-keystone-fid-service-provider.git
 	branch = .
+[submodule "charm-interface-keystone-notifications"]
+	path = charm-interface-keystone-notifications
+	url = ../../openstack/charm-interface-keystone-notifications.git
+	branch = .
 [submodule "charm-interface-manila-plugin"]
 	path = charm-interface-manila-plugin
 	url = ../../openstack/charm-interface-manila-plugin.git
 	branch = .
+[submodule "charm-interface-mysql-innodb-cluster"]
+	path = charm-interface-mysql-innodb-cluster
+	url = ../../openstack/charm-interface-mysql-innodb-cluster.git
+	branch = .
+[submodule "charm-interface-mysql-router"]
+	path = charm-interface-mysql-router
+	url = ../../openstack/charm-interface-mysql-router.git
+	branch = .
 [submodule "charm-interface-mysql-shared"]
 	path = charm-interface-mysql-shared
 	url = ../../openstack/charm-interface-mysql-shared.git
@@ -822,6 +374,10 @@
 	path = charm-interface-pacemaker-remote
 	url = ../../openstack/charm-interface-pacemaker-remote.git
 	branch = .
+[submodule "charm-interface-placement"]
+	path = charm-interface-placement
+	url = ../../openstack/charm-interface-placement.git
+	branch = .
 [submodule "charm-interface-rabbitmq"]
 	path = charm-interface-rabbitmq
 	url = ../../openstack/charm-interface-rabbitmq.git
@@ -874,6 +430,10 @@
 	path = charm-manila
 	url = ../../openstack/charm-manila.git
 	branch = .
+[submodule "charm-manila-ganesha"]
+	path = charm-manila-ganesha
+	url = ../../openstack/charm-manila-ganesha.git
+	branch = .
 [submodule "charm-manila-generic"]
 	path = charm-manila-generic
 	url = ../../openstack/charm-manila-generic.git
@@ -898,18 +458,26 @@
 	path = charm-murano
 	url = ../../openstack/charm-murano.git
 	branch = .
+[submodule "charm-mysql-innodb-cluster"]
+	path = charm-mysql-innodb-cluster
+	url = ../../openstack/charm-mysql-innodb-cluster.git
+	branch = .
+[submodule "charm-mysql-router"]
+	path = charm-mysql-router
+	url = ../../openstack/charm-mysql-router.git
+	branch = .
 [submodule "charm-neutron-api"]
 	path = charm-neutron-api
 	url = ../../openstack/charm-neutron-api.git
 	branch = .
-[submodule "charm-neutron-api-genericswitch"]
-	path = charm-neutron-api-genericswitch
-	url = ../../openstack/charm-neutron-api-genericswitch.git
-	branch = .
 [submodule "charm-neutron-api-odl"]
 	path = charm-neutron-api-odl
 	url = ../../openstack/charm-neutron-api-odl.git
 	branch = .
+[submodule "charm-neutron-api-plugin-ovn"]
+	path = charm-neutron-api-plugin-ovn
+	url = ../../openstack/charm-neutron-api-plugin-ovn.git
+	branch = .
 [submodule "charm-neutron-dynamic-routing"]
 	path = charm-neutron-dynamic-routing
 	url = ../../openstack/charm-neutron-dynamic-routing.git
@@ -978,6 +546,10 @@
 	path = charm-percona-cluster
 	url = ../../openstack/charm-percona-cluster.git
 	branch = .
+[submodule "charm-placement"]
+	path = charm-placement
+	url = ../../openstack/charm-placement.git
+	branch = .
 [submodule "charm-rabbitmq-server"]
 	path = charm-rabbitmq-server
 	url = ../../openstack/charm-rabbitmq-server.git
@@ -998,6 +570,22 @@
 	path = charm-tempest
 	url = ../../openstack/charm-tempest.git
 	branch = .
+[submodule "charm-trilio-data-mover"]
+	path = charm-trilio-data-mover
+	url = ../../openstack/charm-trilio-data-mover.git
+	branch = .
+[submodule "charm-trilio-dm-api"]
+	path = charm-trilio-dm-api
+	url = ../../openstack/charm-trilio-dm-api.git
+	branch = .
+[submodule "charm-trilio-horizon-plugin"]
+	path = charm-trilio-horizon-plugin
+	url = ../../openstack/charm-trilio-horizon-plugin.git
+	branch = .
+[submodule "charm-trilio-wlm"]
+	path = charm-trilio-wlm
+	url = ../../openstack/charm-trilio-wlm.git
+	branch = .
 [submodule "charm-trove"]
 	path = charm-trove
 	url = ../../openstack/charm-trove.git
@@ -1006,6 +594,14 @@
 	path = charm-vault
 	url = ../../openstack/charm-vault.git
 	branch = .
+[submodule "charm-watcher"]
+	path = charm-watcher
+	url = ../../openstack/charm-watcher.git
+	branch = .
+[submodule "charm-watcher-dashboard"]
+	path = charm-watcher-dashboard
+	url = ../../openstack/charm-watcher-dashboard.git
+	branch = .
 [submodule "charms.ceph"]
 	path = charms.ceph
 	url = ../../openstack/charms.ceph.git
@@ -1054,30 +650,6 @@
 	path = compute-hyperv
 	url = ../../openstack/compute-hyperv.git
 	branch = .
-[submodule "congress"]
-	path = congress
-	url = ../../openstack/congress.git
-	branch = .
-[submodule "congress-dashboard"]
-	path = congress-dashboard
-	url = ../../openstack/congress-dashboard.git
-	branch = .
-[submodule "congress-specs"]
-	path = congress-specs
-	url = ../../openstack/congress-specs.git
-	branch = .
-[submodule "congress-tempest-plugin"]
-	path = congress-tempest-plugin
-	url = ../../openstack/congress-tempest-plugin.git
-	branch = .
-[submodule "constellations"]
-	path = constellations
-	url = ../../openstack/constellations.git
-	branch = .
-[submodule "contributor-guide"]
-	path = contributor-guide
-	url = ../../openstack/contributor-guide.git
-	branch = .
 [submodule "cookbook-openstack-application-catalog"]
 	path = cookbook-openstack-application-catalog
 	url = ../../openstack/cookbook-openstack-application-catalog.git
@@ -1190,10 +762,6 @@
 	path = devstack
 	url = ../../openstack/devstack.git
 	branch = .
-[submodule "devstack-gate"]
-	path = devstack-gate
-	url = ../../openstack/devstack-gate.git
-	branch = .
 [submodule "devstack-plugin-amqp1"]
 	path = devstack-plugin-amqp1
 	url = ../../openstack/devstack-plugin-amqp1.git
@@ -1214,6 +782,14 @@
 	path = devstack-plugin-kafka
 	url = ../../openstack/devstack-plugin-kafka.git
 	branch = .
+[submodule "devstack-plugin-nfs"]
+	path = devstack-plugin-nfs
+	url = ../../openstack/devstack-plugin-nfs.git
+	branch = .
+[submodule "devstack-plugin-open-cas"]
+	path = devstack-plugin-open-cas
+	url = ../../openstack/devstack-plugin-open-cas.git
+	branch = .
 [submodule "devstack-plugin-pika"]
 	path = devstack-plugin-pika
 	url = ../../openstack/devstack-plugin-pika.git
@@ -1234,10 +810,6 @@
 	path = dib-utils
 	url = ../../openstack/dib-utils.git
 	branch = .
-[submodule "diskimage-builder"]
-	path = diskimage-builder
-	url = ../../openstack/diskimage-builder.git
-	branch = .
 [submodule "django_openstack_auth"]
 	path = django_openstack_auth
 	url = ../../openstack/django_openstack_auth.git
@@ -1342,18 +914,6 @@
 	path = horizon
 	url = ../../openstack/horizon.git
 	branch = .
-[submodule "i18n"]
-	path = i18n
-	url = ../../openstack/i18n.git
-	branch = .
-[submodule "i18n-specs"]
-	path = i18n-specs
-	url = ../../openstack/i18n-specs.git
-	branch = .
-[submodule "infra-manual"]
-	path = infra-manual
-	url = ../../openstack/infra-manual.git
-	branch = .
 [submodule "instack-undercloud"]
 	path = instack-undercloud
 	url = ../../openstack/instack-undercloud.git
@@ -1486,10 +1046,6 @@
 	path = loci
 	url = ../../openstack/loci.git
 	branch = .
-[submodule "logstash-filters"]
-	path = logstash-filters
-	url = ../../openstack/logstash-filters.git
-	branch = .
 [submodule "magnum"]
 	path = magnum
 	url = ../../openstack/magnum.git
@@ -1550,6 +1106,10 @@
 	path = metalsmith
 	url = ../../openstack/metalsmith.git
 	branch = .
+[submodule "microversion-parse"]
+	path = microversion-parse
+	url = ../../openstack/microversion-parse.git
+	branch = .
 [submodule "mistral"]
 	path = mistral
 	url = ../../openstack/mistral.git
@@ -1710,10 +1270,6 @@
 	path = networking-ovn
 	url = ../../openstack/networking-ovn.git
 	branch = .
-[submodule "networking-powervm"]
-	path = networking-powervm
-	url = ../../openstack/networking-powervm.git
-	branch = .
 [submodule "networking-sfc"]
 	path = networking-sfc
 	url = ../../openstack/networking-sfc.git
@@ -1734,10 +1290,6 @@
 	path = neutron-fwaas-dashboard
 	url = ../../openstack/neutron-fwaas-dashboard.git
 	branch = .
-[submodule "neutron-interconnection"]
-	path = neutron-interconnection
-	url = ../../openstack/neutron-interconnection.git
-	branch = .
 [submodule "neutron-lbaas"]
 	path = neutron-lbaas
 	url = ../../openstack/neutron-lbaas.git
@@ -1766,18 +1318,10 @@
 	path = neutron-vpnaas-dashboard
 	url = ../../openstack/neutron-vpnaas-dashboard.git
 	branch = .
-[submodule "nose-html-output"]
-	path = nose-html-output
-	url = ../../openstack/nose-html-output.git
-	branch = .
 [submodule "nova"]
 	path = nova
 	url = ../../openstack/nova.git
 	branch = .
-[submodule "nova-powervm"]
-	path = nova-powervm
-	url = ../../openstack/nova-powervm.git
-	branch = .
 [submodule "nova-specs"]
 	path = nova-specs
 	url = ../../openstack/nova-specs.git
@@ -1886,10 +1430,6 @@
 	path = openstack-ansible-os_designate
 	url = ../../openstack/openstack-ansible-os_designate.git
 	branch = .
-[submodule "openstack-ansible-os_freezer"]
-	path = openstack-ansible-os_freezer
-	url = ../../openstack/openstack-ansible-os_freezer.git
-	branch = .
 [submodule "openstack-ansible-os_glance"]
 	path = openstack-ansible-os_glance
 	url = ../../openstack/openstack-ansible-os_glance.git
@@ -1986,14 +1526,6 @@
 	path = openstack-ansible-os_zun
 	url = ../../openstack/openstack-ansible-os_zun.git
 	branch = .
-[submodule "openstack-ansible-pip_install"]
-	path = openstack-ansible-pip_install
-	url = ../../openstack/openstack-ansible-pip_install.git
-	branch = .
-[submodule "openstack-ansible-pip_lock_down"]
-	path = openstack-ansible-pip_lock_down
-	url = ../../openstack/openstack-ansible-pip_lock_down.git
-	branch = .
 [submodule "openstack-ansible-plugins"]
 	path = openstack-ansible-plugins
 	url = ../../openstack/openstack-ansible-plugins.git
@@ -2002,10 +1534,6 @@
 	path = openstack-ansible-rabbitmq_server
 	url = ../../openstack/openstack-ansible-rabbitmq_server.git
 	branch = .
-[submodule "openstack-ansible-repo_build"]
-	path = openstack-ansible-repo_build
-	url = ../../openstack/openstack-ansible-repo_build.git
-	branch = .
 [submodule "openstack-ansible-repo_server"]
 	path = openstack-ansible-repo_server
 	url = ../../openstack/openstack-ansible-repo_server.git
@@ -2018,10 +1546,6 @@
 	path = openstack-ansible-rsyslog_server
 	url = ../../openstack/openstack-ansible-rsyslog_server.git
 	branch = .
-[submodule "openstack-ansible-security"]
-	path = openstack-ansible-security
-	url = ../../openstack/openstack-ansible-security.git
-	branch = .
 [submodule "openstack-ansible-specs"]
 	path = openstack-ansible-specs
 	url = ../../openstack/openstack-ansible-specs.git
@@ -2070,30 +1594,14 @@
 	path = openstack-helm-infra
 	url = ../../openstack/openstack-helm-infra.git
 	branch = .
-[submodule "openstack-manuals"]
-	path = openstack-manuals
-	url = ../../openstack/openstack-manuals.git
-	branch = .
-[submodule "openstack-nose"]
-	path = openstack-nose
-	url = ../../openstack/openstack-nose.git
-	branch = .
-[submodule "openstack-planet"]
-	path = openstack-planet
-	url = ../../openstack/openstack-planet.git
+[submodule "openstack-tempest-skiplist"]
+	path = openstack-tempest-skiplist
+	url = ../../openstack/openstack-tempest-skiplist.git
 	branch = .
 [submodule "openstack-virtual-baremetal"]
 	path = openstack-virtual-baremetal
 	url = ../../openstack/openstack-virtual-baremetal.git
 	branch = .
-[submodule "openstack-zuul-jobs"]
-	path = openstack-zuul-jobs
-	url = ../../openstack/openstack-zuul-jobs.git
-	branch = .
-[submodule "openstack-zuul-roles"]
-	path = openstack-zuul-roles
-	url = ../../openstack/openstack-zuul-roles.git
-	branch = .
 [submodule "openstackclient"]
 	path = openstackclient
 	url = ../../openstack/openstackclient.git
@@ -2106,10 +1614,6 @@
 	path = openstacksdk
 	url = ../../openstack/openstacksdk.git
 	branch = .
-[submodule "os-acc"]
-	path = os-acc
-	url = ../../openstack/os-acc.git
-	branch = .
 [submodule "os-api-ref"]
 	path = os-api-ref
 	url = ../../openstack/os-api-ref.git
@@ -2134,10 +1638,6 @@
 	path = os-ken
 	url = ../../openstack/os-ken.git
 	branch = .
-[submodule "os-loganalyze"]
-	path = os-loganalyze
-	url = ../../openstack/os-loganalyze.git
-	branch = .
 [submodule "os-net-config"]
 	path = os-net-config
 	url = ../../openstack/os-net-config.git
@@ -2226,6 +1726,10 @@
 	path = oslo.messaging
 	url = ../../openstack/oslo.messaging.git
 	branch = .
+[submodule "oslo.metrics"]
+	path = oslo.metrics
+	url = ../../openstack/oslo.metrics.git
+	branch = .
 [submodule "oslo.middleware"]
 	path = oslo.middleware
 	url = ../../openstack/oslo.middleware.git
@@ -2286,6 +1790,10 @@
 	path = oswin-tempest-plugin
 	url = ../../openstack/oswin-tempest-plugin.git
 	branch = .
+[submodule "ovn-octavia-provider"]
+	path = ovn-octavia-provider
+	url = ../../openstack/ovn-octavia-provider.git
+	branch = .
 [submodule "ovsdbapp"]
 	path = ovsdbapp
 	url = ../../openstack/ovsdbapp.git
@@ -2314,14 +1822,6 @@
 	path = placement
 	url = ../../openstack/placement.git
 	branch = .
-[submodule "project-config"]
-	path = project-config
-	url = ../../openstack/project-config.git
-	branch = .
-[submodule "ptgbot"]
-	path = ptgbot
-	url = ../../openstack/ptgbot.git
-	branch = .
 [submodule "puppet-aodh"]
 	path = puppet-aodh
 	url = ../../openstack/puppet-aodh.git
@@ -2562,10 +2062,6 @@
 	path = python-cloudkittyclient
 	url = ../../openstack/python-cloudkittyclient.git
 	branch = .
-[submodule "python-congressclient"]
-	path = python-congressclient
-	url = ../../openstack/python-congressclient.git
-	branch = .
 [submodule "python-cyborgclient"]
 	path = python-cyborgclient
 	url = ../../openstack/python-cyborgclient.git
@@ -2746,14 +2242,6 @@
 	path = requirements
 	url = ../../openstack/requirements.git
 	branch = .
-[submodule "reviewday"]
-	path = reviewday
-	url = ../../openstack/reviewday.git
-	branch = .
-[submodule "reviewstats"]
-	path = reviewstats
-	url = ../../openstack/reviewstats.git
-	branch = .
 [submodule "rpm-packaging"]
 	path = rpm-packaging
 	url = ../../openstack/rpm-packaging.git
@@ -2878,6 +2366,10 @@
 	path = sushy
 	url = ../../openstack/sushy.git
 	branch = .
+[submodule "sushy-cli"]
+	path = sushy-cli
+	url = ../../openstack/sushy-cli.git
+	branch = .
 [submodule "sushy-tools"]
 	path = sushy-tools
 	url = ../../openstack/sushy-tools.git
@@ -2950,14 +2442,6 @@
 	path = tosca-parser
 	url = ../../openstack/tosca-parser.git
 	branch = .
-[submodule "training-guides"]
-	path = training-guides
-	url = ../../openstack/training-guides.git
-	branch = .
-[submodule "training-labs"]
-	path = training-labs
-	url = ../../openstack/training-labs.git
-	branch = .
 [submodule "tricircle"]
 	path = tricircle
 	url = ../../openstack/tricircle.git
@@ -2998,6 +2482,10 @@
 	path = tripleo-ipsec
 	url = ../../openstack/tripleo-ipsec.git
 	branch = .
+[submodule "tripleo-operator-ansible"]
+	path = tripleo-operator-ansible
+	url = ../../openstack/tripleo-operator-ansible.git
+	branch = .
 [submodule "tripleo-puppet-elements"]
 	path = tripleo-puppet-elements
 	url = ../../openstack/tripleo-puppet-elements.git
@@ -3046,9 +2534,13 @@
 	path = ui-cookiecutter
 	url = ../../openstack/ui-cookiecutter.git
 	branch = .
-[submodule "upstream-institute-virtual-environment"]
-	path = upstream-institute-virtual-environment
-	url = ../../openstack/upstream-institute-virtual-environment.git
+[submodule "validations-common"]
+	path = validations-common
+	url = ../../openstack/validations-common.git
+	branch = .
+[submodule "validations-libs"]
+	path = validations-libs
+	url = ../../openstack/validations-libs.git
 	branch = .
 [submodule "virtualbmc"]
 	path = virtualbmc
@@ -3142,6 +2634,14 @@
 	path = xstatic-d3
 	url = ../../openstack/xstatic-d3.git
 	branch = .
+[submodule "xstatic-dagre"]
+	path = xstatic-dagre
+	url = ../../openstack/xstatic-dagre.git
+	branch = .
+[submodule "xstatic-dagre-d3"]
+	path = xstatic-dagre-d3
+	url = ../../openstack/xstatic-dagre-d3.git
+	branch = .
 [submodule "xstatic-filesaver"]
 	path = xstatic-filesaver
 	url = ../../openstack/xstatic-filesaver.git
@@ -3150,6 +2650,10 @@
 	path = xstatic-font-awesome
 	url = ../../openstack/xstatic-font-awesome.git
 	branch = .
+[submodule "xstatic-graphlib"]
+	path = xstatic-graphlib
+	url = ../../openstack/xstatic-graphlib.git
+	branch = .
 [submodule "xstatic-hogan"]
 	path = xstatic-hogan
 	url = ../../openstack/xstatic-hogan.git
@@ -3182,6 +2686,10 @@
 	path = xstatic-json2yaml
 	url = ../../openstack/xstatic-json2yaml.git
 	branch = .
+[submodule "xstatic-lodash"]
+	path = xstatic-lodash
+	url = ../../openstack/xstatic-lodash.git
+	branch = .
 [submodule "xstatic-magic-search"]
 	path = xstatic-magic-search
 	url = ../../openstack/xstatic-magic-search.git
@@ -3190,6 +2698,14 @@
 	path = xstatic-mdi
 	url = ../../openstack/xstatic-mdi.git
 	branch = .
+[submodule "xstatic-moment"]
+	path = xstatic-moment
+	url = ../../openstack/xstatic-moment.git
+	branch = .
+[submodule "xstatic-moment-timezone"]
+	path = xstatic-moment-timezone
+	url = ../../openstack/xstatic-moment-timezone.git
+	branch = .
 [submodule "xstatic-rickshaw"]
 	path = xstatic-rickshaw
 	url = ../../openstack/xstatic-rickshaw.git
diff --git a/afsmon b/afsmon
deleted file mode 160000
index 0bbe8b439f..0000000000
--- a/afsmon
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 0bbe8b439f9d8b8052eb29a50e91ad49208888b8
diff --git a/ansible-role-cloud-launcher b/ansible-role-cloud-launcher
deleted file mode 160000
index 60e701bb38..0000000000
--- a/ansible-role-cloud-launcher
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 60e701bb38970659b55d818f62b26730e5f5e7bd
diff --git a/ansible-role-lunasa-hsm b/ansible-role-lunasa-hsm
new file mode 160000
index 0000000000..ce3e955a1d
--- /dev/null
+++ b/ansible-role-lunasa-hsm
@@ -0,0 +1 @@
+Subproject commit ce3e955a1df1a7ecac4124aadb093663b9f355e3
diff --git a/ansible-role-puppet b/ansible-role-puppet
deleted file mode 160000
index eafdbf9593..0000000000
--- a/ansible-role-puppet
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit eafdbf9593a2cfd1e2936b4a682f9eb7ebe3374b
diff --git a/askbot-theme b/askbot-theme
deleted file mode 160000
index 0cc9f5ffd4..0000000000
--- a/askbot-theme
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 0cc9f5ffd4d6c74bf0efb597e7ce478c1e089524
diff --git a/barbican-ui b/barbican-ui
new file mode 160000
index 0000000000..c603b4613a
--- /dev/null
+++ b/barbican-ui
@@ -0,0 +1 @@
+Subproject commit c603b4613af4884e2ded9d13094c00d6ae92d309
diff --git a/bindep b/bindep
deleted file mode 160000
index 8c489f141d..0000000000
--- a/bindep
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 8c489f141d7154f65da05036f38f2d68e399ad57
diff --git a/bugdaystats b/bugdaystats
deleted file mode 160000
index 6d52e41e38..0000000000
--- a/bugdaystats
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 6d52e41e38cfd5d54248afa79454e6a230138ec4
diff --git a/ceilometer-powervm b/ceilometer-powervm
deleted file mode 160000
index 7ca211e700..0000000000
--- a/ceilometer-powervm
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 7ca211e7007b4444b543457c8627c29ab37483cb
diff --git a/charm-cinder-backup-swift-proxy b/charm-cinder-backup-swift-proxy
new file mode 160000
index 0000000000..cd5f4299d7
--- /dev/null
+++ b/charm-cinder-backup-swift-proxy
@@ -0,0 +1 @@
+Subproject commit cd5f4299d723e543d191f6238c869c432b4fc9d8
diff --git a/charm-interface-cinder-backup b/charm-interface-cinder-backup
new file mode 160000
index 0000000000..a1cdf71ad6
--- /dev/null
+++ b/charm-interface-cinder-backup
@@ -0,0 +1 @@
+Subproject commit a1cdf71ad61d4ea5f912d8e0423e887ae761bff7
diff --git a/charm-interface-keystone-notifications b/charm-interface-keystone-notifications
new file mode 160000
index 0000000000..02655dc99a
--- /dev/null
+++ b/charm-interface-keystone-notifications
@@ -0,0 +1 @@
+Subproject commit 02655dc99ab6df44c5847866964af360de9186ca
diff --git a/charm-interface-mysql-innodb-cluster b/charm-interface-mysql-innodb-cluster
new file mode 160000
index 0000000000..5f87bb1dde
--- /dev/null
+++ b/charm-interface-mysql-innodb-cluster
@@ -0,0 +1 @@
+Subproject commit 5f87bb1ddec3868864d2a8d1bf9b66ae5dca4e48
diff --git a/charm-interface-mysql-router b/charm-interface-mysql-router
new file mode 160000
index 0000000000..ffd0fc0dc4
--- /dev/null
+++ b/charm-interface-mysql-router
@@ -0,0 +1 @@
+Subproject commit ffd0fc0dc48ed9d85911894a8038397ddce8ef69
diff --git a/charm-interface-placement b/charm-interface-placement
new file mode 160000
index 0000000000..6c9ba2c5d8
--- /dev/null
+++ b/charm-interface-placement
@@ -0,0 +1 @@
+Subproject commit 6c9ba2c5d83085ff904d636f51c63ed82cbd236d
diff --git a/charm-manila-ganesha b/charm-manila-ganesha
new file mode 160000
index 0000000000..3bfbc392d6
--- /dev/null
+++ b/charm-manila-ganesha
@@ -0,0 +1 @@
+Subproject commit 3bfbc392d64cd084a630b0028daa0aaadc8fe1b5
diff --git a/charm-mysql-innodb-cluster b/charm-mysql-innodb-cluster
new file mode 160000
index 0000000000..383692e4b8
--- /dev/null
+++ b/charm-mysql-innodb-cluster
@@ -0,0 +1 @@
+Subproject commit 383692e4b827e3f60bf226b6f60c1331cade08b1
diff --git a/charm-mysql-router b/charm-mysql-router
new file mode 160000
index 0000000000..27ffd139ae
--- /dev/null
+++ b/charm-mysql-router
@@ -0,0 +1 @@
+Subproject commit 27ffd139ae961b10a2cccd27e74fed8e559a9b07
diff --git a/charm-neutron-api-genericswitch b/charm-neutron-api-genericswitch
deleted file mode 160000
index e761ba0970..0000000000
--- a/charm-neutron-api-genericswitch
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit e761ba09700bea2833f96b270094cf9c6df74603
diff --git a/charm-neutron-api-plugin-ovn b/charm-neutron-api-plugin-ovn
new file mode 160000
index 0000000000..a8d855277d
--- /dev/null
+++ b/charm-neutron-api-plugin-ovn
@@ -0,0 +1 @@
+Subproject commit a8d855277dab6f7f267f6fb7c132e12e011288ea
diff --git a/charm-placement b/charm-placement
new file mode 160000
index 0000000000..4b6680f1f5
--- /dev/null
+++ b/charm-placement
@@ -0,0 +1 @@
+Subproject commit 4b6680f1f5b8f8acc46c3640a32738c2a608ce06
diff --git a/charm-trilio-data-mover b/charm-trilio-data-mover
new file mode 160000
index 0000000000..4655abc835
--- /dev/null
+++ b/charm-trilio-data-mover
@@ -0,0 +1 @@
+Subproject commit 4655abc83518a21d4ebd94f4e98e6de4261b0980
diff --git a/charm-trilio-dm-api b/charm-trilio-dm-api
new file mode 160000
index 0000000000..0eb284d253
--- /dev/null
+++ b/charm-trilio-dm-api
@@ -0,0 +1 @@
+Subproject commit 0eb284d2530ab2e940d893a91449e39920f48d8f
diff --git a/charm-trilio-horizon-plugin b/charm-trilio-horizon-plugin
new file mode 160000
index 0000000000..600a086afe
--- /dev/null
+++ b/charm-trilio-horizon-plugin
@@ -0,0 +1 @@
+Subproject commit 600a086afe989d21331ebb8ca1cf0aa34ddb302b
diff --git a/charm-trilio-wlm b/charm-trilio-wlm
new file mode 160000
index 0000000000..8b38df340e
--- /dev/null
+++ b/charm-trilio-wlm
@@ -0,0 +1 @@
+Subproject commit 8b38df340e32176cace6862064517e9353e9fde6
diff --git a/charm-watcher b/charm-watcher
new file mode 160000
index 0000000000..03957f784a
--- /dev/null
+++ b/charm-watcher
@@ -0,0 +1 @@
+Subproject commit 03957f784a71096f146bf9df3468e352b7309762
diff --git a/charm-watcher-dashboard b/charm-watcher-dashboard
new file mode 160000
index 0000000000..7c4e951bee
--- /dev/null
+++ b/charm-watcher-dashboard
@@ -0,0 +1 @@
+Subproject commit 7c4e951bee2e0917dde58120b53c6bf2277f4d94
diff --git a/congress b/congress
deleted file mode 160000
index bba805af02..0000000000
--- a/congress
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit bba805af02f516b95650531afc02d1c60b1cd010
diff --git a/congress-dashboard b/congress-dashboard
deleted file mode 160000
index 3ce57efc46..0000000000
--- a/congress-dashboard
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 3ce57efc46d48b426f4d1005884b267a97fca814
diff --git a/congress-specs b/congress-specs
deleted file mode 160000
index 1f031e89c2..0000000000
--- a/congress-specs
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 1f031e89c24a281b072d167bf6d11f474581d150
diff --git a/congress-tempest-plugin b/congress-tempest-plugin
deleted file mode 160000
index 3d3098c893..0000000000
--- a/congress-tempest-plugin
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 3d3098c8938eec9fe427f3515c90787840d6c903
diff --git a/constellations b/constellations
deleted file mode 160000
index 3b650630dd..0000000000
--- a/constellations
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 3b650630dde9c9b2cd554d4cdd11c1e319191c33
diff --git a/contributor-guide b/contributor-guide
deleted file mode 160000
index b6e905018e..0000000000
--- a/contributor-guide
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit b6e905018e87ed80b1a34320835a0de030237938
diff --git a/devstack-gate b/devstack-gate
deleted file mode 160000
index 4ecb62ca55..0000000000
--- a/devstack-gate
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 4ecb62ca5512f70f38c4442f526ff15a66d1b485
diff --git a/devstack-plugin-nfs b/devstack-plugin-nfs
new file mode 160000
index 0000000000..ac68b45917
--- /dev/null
+++ b/devstack-plugin-nfs
@@ -0,0 +1 @@
+Subproject commit ac68b459172d8e97b82d47cbdffc65df098d94bf
diff --git a/devstack-plugin-open-cas b/devstack-plugin-open-cas
new file mode 160000
index 0000000000..a32d70e5c0
--- /dev/null
+++ b/devstack-plugin-open-cas
@@ -0,0 +1 @@
+Subproject commit a32d70e5c0e3a802cc1aeab93da5dadfedf76389
diff --git a/diskimage-builder b/diskimage-builder
deleted file mode 160000
index 3477dfad00..0000000000
--- a/diskimage-builder
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 3477dfad00ed4e93fe2c0ea2680c63a704ea618a
diff --git a/elastic-recheck b/elastic-recheck
deleted file mode 160000
index 6fc19ee5b9..0000000000
--- a/elastic-recheck
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 6fc19ee5b9f4ed6fdadb5942ddc87362237e8b05
diff --git a/gear b/gear
deleted file mode 160000
index 9933f06821..0000000000
--- a/gear
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 9933f068213c9da6c4b0ea59659c13bcf2ebe104
diff --git a/germqtt b/germqtt
deleted file mode 160000
index b1067bbdd7..0000000000
--- a/germqtt
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit b1067bbdd7917574126307b7dff3039ccb1243df
diff --git a/gerrit b/gerrit
deleted file mode 160000
index ac5628a6ff..0000000000
--- a/gerrit
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit ac5628a6ff40acbdf5329eb58622590af27c349a
diff --git a/gerritbot b/gerritbot
deleted file mode 160000
index 83f3097608..0000000000
--- a/gerritbot
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 83f30976089aa7d94476afdb3c1202311a20249a
diff --git a/gerritlib b/gerritlib
deleted file mode 160000
index 95e17ddf05..0000000000
--- a/gerritlib
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 95e17ddf05609168303b28e0c5440d0eda23052e
diff --git a/git-restack b/git-restack
deleted file mode 160000
index bef0f92120..0000000000
--- a/git-restack
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit bef0f92120c943e96622ad2cbe37734f6fa59a66
diff --git a/git-review b/git-review
deleted file mode 160000
index 1a58ace6cb..0000000000
--- a/git-review
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 1a58ace6cb9dfde9d5e48400a451342cb50ca33c
diff --git a/glean b/glean
deleted file mode 160000
index 100f20a42d..0000000000
--- a/glean
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 100f20a42de3024c7d6d48560020be767dbd45ce
diff --git a/grafyaml b/grafyaml
deleted file mode 160000
index 67f55d53d6..0000000000
--- a/grafyaml
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 67f55d53d6c91dc1465396c3983812b23757c39f
diff --git a/i18n b/i18n
deleted file mode 160000
index 533fd1ad52..0000000000
--- a/i18n
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 533fd1ad52e8fd63d755b6106163add32d602eb5
diff --git a/i18n-specs b/i18n-specs
deleted file mode 160000
index 7ba6bb5917..0000000000
--- a/i18n-specs
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 7ba6bb59171cc7435493619b7ac417a300002f1f
diff --git a/infra-manual b/infra-manual
deleted file mode 160000
index f7ef525e4b..0000000000
--- a/infra-manual
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit f7ef525e4be256110f211529813400528e860168
diff --git a/infra-specs b/infra-specs
deleted file mode 160000
index 28d1ed64ec..0000000000
--- a/infra-specs
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 28d1ed64ecc963fe34d874b59cffb0e61ed67c1d
diff --git a/irc-meetings b/irc-meetings
deleted file mode 160000
index 81f6e0efab..0000000000
--- a/irc-meetings
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 81f6e0efabef223eea7d585d5f58b669ac13e967
diff --git a/jeepyb b/jeepyb
deleted file mode 160000
index 4b0999f64d..0000000000
--- a/jeepyb
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 4b0999f64d75e023bdbbdaa0f5dbb01c3390ee06
diff --git a/lodgeit b/lodgeit
deleted file mode 160000
index d66b0e82fb..0000000000
--- a/lodgeit
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit d66b0e82fb780fdf2f6870b78de65e782eb18467
diff --git a/log-classify b/log-classify
deleted file mode 160000
index 45ae2b5e39..0000000000
--- a/log-classify
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 45ae2b5e3931bffbf29ed3c28876720f2cee2ce5
diff --git a/log_processor b/log_processor
deleted file mode 160000
index 36e9b3db55..0000000000
--- a/log_processor
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 36e9b3db556543d4bc552b392c46268c7aa12e0a
diff --git a/logstash-filters b/logstash-filters
deleted file mode 160000
index 41a4d92703..0000000000
--- a/logstash-filters
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 41a4d927037af8731447d0f31b54b8c168aa055d
diff --git a/lpmqtt b/lpmqtt
deleted file mode 160000
index 4cff75293e..0000000000
--- a/lpmqtt
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 4cff75293e957eaf861fddfb5d604004cc10840b
diff --git a/meetbot b/meetbot
deleted file mode 160000
index 01e051648c..0000000000
--- a/meetbot
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 01e051648c2759c03f2a907552af8e4410abcde9
diff --git a/microversion-parse b/microversion-parse
new file mode 160000
index 0000000000..2c36df6bf3
--- /dev/null
+++ b/microversion-parse
@@ -0,0 +1 @@
+Subproject commit 2c36df6bf33e42c379fbd8228fbe63c77b3714b1
diff --git a/mqtt_statsd b/mqtt_statsd
deleted file mode 160000
index 4a5adf8cca..0000000000
--- a/mqtt_statsd
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 4a5adf8ccadfc4aa20598d210b1d56f498c7510e
diff --git a/networking-powervm b/networking-powervm
deleted file mode 160000
index a00fc731b1..0000000000
--- a/networking-powervm
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit a00fc731b14bd3ef953fe4cffdc74c8e441c0e13
diff --git a/neutron-interconnection b/neutron-interconnection
deleted file mode 160000
index e74810f3f0..0000000000
--- a/neutron-interconnection
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit e74810f3f077b4f2715a8ddb1ebf992d73ea70c2
diff --git a/nose-html-output b/nose-html-output
deleted file mode 160000
index 25b1e1fad4..0000000000
--- a/nose-html-output
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 25b1e1fad49c293bf44f90cfe1d07334d8810adb
diff --git a/nova-powervm b/nova-powervm
deleted file mode 160000
index 376d9493e2..0000000000
--- a/nova-powervm
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 376d9493e2a10313068508daf9054d7ecf6d121f
diff --git a/openstack-ansible-os_freezer b/openstack-ansible-os_freezer
deleted file mode 160000
index b75a75145f..0000000000
--- a/openstack-ansible-os_freezer
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit b75a75145fc8226a96bb62bb4719a966359fb444
diff --git a/openstack-ansible-pip_install b/openstack-ansible-pip_install
deleted file mode 160000
index d9df50f4e3..0000000000
--- a/openstack-ansible-pip_install
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit d9df50f4e3154d8fd53eb96b4ad8ad7526cf7823
diff --git a/openstack-ansible-pip_lock_down b/openstack-ansible-pip_lock_down
deleted file mode 160000
index fbd2fbe301..0000000000
--- a/openstack-ansible-pip_lock_down
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit fbd2fbe301c892b89d21437a1c7fcfcc5a29aa4d
diff --git a/openstack-ansible-repo_build b/openstack-ansible-repo_build
deleted file mode 160000
index f72de305b8..0000000000
--- a/openstack-ansible-repo_build
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit f72de305b88cd2d189fee42e7a17214ebf341fd8
diff --git a/openstack-ansible-security b/openstack-ansible-security
deleted file mode 160000
index d7f838df9c..0000000000
--- a/openstack-ansible-security
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit d7f838df9c923f7e5e682d1747aa5f5255b6565e
diff --git a/openstack-manuals b/openstack-manuals
deleted file mode 160000
index a2d76fa70f..0000000000
--- a/openstack-manuals
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit a2d76fa70f6da127b50d6760e1ceb4ff77fbd9c9
diff --git a/openstack-nose b/openstack-nose
deleted file mode 160000
index de9dcf85a0..0000000000
--- a/openstack-nose
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit de9dcf85a0b53628d709c6314bccfefed780703f
diff --git a/openstack-planet b/openstack-planet
deleted file mode 160000
index 514df4e261..0000000000
--- a/openstack-planet
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 514df4e26175eaa53c09eef5b316423435f44276
diff --git a/openstack-tempest-skiplist b/openstack-tempest-skiplist
new file mode 160000
index 0000000000..cba9b05cc4
--- /dev/null
+++ b/openstack-tempest-skiplist
@@ -0,0 +1 @@
+Subproject commit cba9b05cc484242c7739e93fddf1051330ce7d06
diff --git a/openstack-zuul-jobs b/openstack-zuul-jobs
deleted file mode 160000
index 3b93422450..0000000000
--- a/openstack-zuul-jobs
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 3b93422450f9f454787e39f706ddcb14df48a5d8
diff --git a/openstack-zuul-roles b/openstack-zuul-roles
deleted file mode 160000
index 153823ddcf..0000000000
--- a/openstack-zuul-roles
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 153823ddcfd4e644d032f7d01c0fb624cf5954a1
diff --git a/os-acc b/os-acc
deleted file mode 160000
index a73815a2df..0000000000
--- a/os-acc
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit a73815a2df6a4c9e2dffb6f68bd33b2fe1210d5b
diff --git a/os-loganalyze b/os-loganalyze
deleted file mode 160000
index d80e6a55e0..0000000000
--- a/os-loganalyze
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit d80e6a55e050fdfb71ea439810ac69853acaec9f
diff --git a/oslo.metrics b/oslo.metrics
new file mode 160000
index 0000000000..2f817c318f
--- /dev/null
+++ b/oslo.metrics
@@ -0,0 +1 @@
+Subproject commit 2f817c318f17fd674c27115bbba8045ea24964e8
diff --git a/ovn-octavia-provider b/ovn-octavia-provider
new file mode 160000
index 0000000000..23d743a444
--- /dev/null
+++ b/ovn-octavia-provider
@@ -0,0 +1 @@
+Subproject commit 23d743a444a426379499193324723a9c7ab33734
diff --git a/project-config b/project-config
deleted file mode 160000
index 05caddb413..0000000000
--- a/project-config
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 05caddb41318e633ff3bc3cc1401d00bc70a6c6e
diff --git a/project-config-example b/project-config-example
deleted file mode 160000
index 814fd44868..0000000000
--- a/project-config-example
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 814fd4486885e7a179529b3320eb5c84fba35bda
diff --git a/ptgbot b/ptgbot
deleted file mode 160000
index 1db00eafb8..0000000000
--- a/ptgbot
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 1db00eafb8e3c4ec93087c9eb3c85fa855671cda
diff --git a/publications b/publications
deleted file mode 160000
index 23a8938b60..0000000000
--- a/publications
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 23a8938b6035dfad77adac8bc503db1d4adf502a
diff --git a/puppet-accessbot b/puppet-accessbot
deleted file mode 160000
index 6bd802239f..0000000000
--- a/puppet-accessbot
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 6bd802239f1d716eef2935c3054f91b4a573f740
diff --git a/puppet-ansible b/puppet-ansible
deleted file mode 160000
index c4a0810afb..0000000000
--- a/puppet-ansible
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit c4a0810afb981045ceb8e3a1a7a7dee90f48d552
diff --git a/puppet-apparmor b/puppet-apparmor
deleted file mode 160000
index 653557e2a8..0000000000
--- a/puppet-apparmor
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 653557e2a8220bca295b9826a069de6efa1275f2
diff --git a/puppet-askbot b/puppet-askbot
deleted file mode 160000
index 6a54303968..0000000000
--- a/puppet-askbot
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 6a543039688acfaabc1cd18e856cad9ede1dcea3
diff --git a/puppet-asterisk b/puppet-asterisk
deleted file mode 160000
index c657851ca0..0000000000
--- a/puppet-asterisk
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit c657851ca0b33c5a94fe8dc5e6a92e2849f3d672
diff --git a/puppet-bandersnatch b/puppet-bandersnatch
deleted file mode 160000
index cac249d5d2..0000000000
--- a/puppet-bandersnatch
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit cac249d5d26fbc99f6e8edd2c7f503c4d286753c
diff --git a/puppet-bugdaystats b/puppet-bugdaystats
deleted file mode 160000
index ddd7ed9ecb..0000000000
--- a/puppet-bugdaystats
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit ddd7ed9ecb1a3b8b85cd4079a36ae438a9994dd5
diff --git a/puppet-bup b/puppet-bup
deleted file mode 160000
index 0807aa03cf..0000000000
--- a/puppet-bup
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 0807aa03cf932d6620e425351051676b037b5390
diff --git a/puppet-cgit b/puppet-cgit
deleted file mode 160000
index ff8acfb6b4..0000000000
--- a/puppet-cgit
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit ff8acfb6b46dc587575b1695be27f772a88bea5e
diff --git a/puppet-ciwatch b/puppet-ciwatch
deleted file mode 160000
index e005e66b2d..0000000000
--- a/puppet-ciwatch
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit e005e66b2dee9821568c5a7ae60d718dfc2a2c81
diff --git a/puppet-dashboard b/puppet-dashboard
deleted file mode 160000
index 9aa3039f9e..0000000000
--- a/puppet-dashboard
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 9aa3039f9e91e0fdd36488e98b31f5db8f2d1a83
diff --git a/puppet-diskimage_builder b/puppet-diskimage_builder
deleted file mode 160000
index a0986f3658..0000000000
--- a/puppet-diskimage_builder
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit a0986f365864c2e46791f6bc0ddf01cfd1b020fb
diff --git a/puppet-drupal b/puppet-drupal
deleted file mode 160000
index 44ab5c9a1b..0000000000
--- a/puppet-drupal
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 44ab5c9a1b37af69c4bf472bf251a3086dfe0afd
diff --git a/puppet-elastic_recheck b/puppet-elastic_recheck
deleted file mode 160000
index 5e294a9615..0000000000
--- a/puppet-elastic_recheck
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 5e294a96150eea3f9a97760044c7d6eff96c5337
diff --git a/puppet-elasticsearch b/puppet-elasticsearch
deleted file mode 160000
index 86e4eb1ff5..0000000000
--- a/puppet-elasticsearch
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 86e4eb1ff5178acf3d9dadf2a75e9e4336faa3ec
diff --git a/puppet-ethercalc b/puppet-ethercalc
deleted file mode 160000
index a8b3acd854..0000000000
--- a/puppet-ethercalc
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit a8b3acd854b64d97dfeda2333e5aecc1a89699eb
diff --git a/puppet-etherpad_lite b/puppet-etherpad_lite
deleted file mode 160000
index bb91e9cd68..0000000000
--- a/puppet-etherpad_lite
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit bb91e9cd689a558b0741d6f3e70e9e1160345e4c
diff --git a/puppet-exim b/puppet-exim
deleted file mode 160000
index 852c94ab73..0000000000
--- a/puppet-exim
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 852c94ab73a2f89804673c1803dda696f0b00a9f
diff --git a/puppet-germqtt b/puppet-germqtt
deleted file mode 160000
index e9edf1fe89..0000000000
--- a/puppet-germqtt
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit e9edf1fe89917e35415640c4de006e26e494471d
diff --git a/puppet-gerrit b/puppet-gerrit
deleted file mode 160000
index eff363f158..0000000000
--- a/puppet-gerrit
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit eff363f15878015545631c7da995047d103c332d
diff --git a/puppet-gerritbot b/puppet-gerritbot
deleted file mode 160000
index bcaeac6d79..0000000000
--- a/puppet-gerritbot
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit bcaeac6d79285920c1260724de248dca0f8df288
diff --git a/puppet-github b/puppet-github
deleted file mode 160000
index ca79c4e65e..0000000000
--- a/puppet-github
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit ca79c4e65e4d728fd1d048095ca8364353d40441
diff --git a/puppet-grafyaml b/puppet-grafyaml
deleted file mode 160000
index b9a4f567ed..0000000000
--- a/puppet-grafyaml
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit b9a4f567ed040e5f9319d3eeab5514b885dade81
diff --git a/puppet-graphite b/puppet-graphite
deleted file mode 160000
index c5003bfd36..0000000000
--- a/puppet-graphite
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit c5003bfd36e70b4b4741ee565a1d7951d3c27f86
diff --git a/puppet-haveged b/puppet-haveged
deleted file mode 160000
index 2c1b51e2af..0000000000
--- a/puppet-haveged
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 2c1b51e2afb677558f16dca01a8b599499a5ddc7
diff --git a/puppet-hound b/puppet-hound
deleted file mode 160000
index 0edcc83e70..0000000000
--- a/puppet-hound
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 0edcc83e70878987ac7983e41b52faac5f2576d7
diff --git a/puppet-httpd b/puppet-httpd
deleted file mode 160000
index c629d4779a..0000000000
--- a/puppet-httpd
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit c629d4779af4c8707a318fc6a99ef8219ef3faa0
diff --git a/puppet-infra-cookiecutter b/puppet-infra-cookiecutter
deleted file mode 160000
index 054b948563..0000000000
--- a/puppet-infra-cookiecutter
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 054b94856324f036e0dd7cc252ac8a323cf12b60
diff --git a/puppet-infracloud b/puppet-infracloud
deleted file mode 160000
index 0568a3e20c..0000000000
--- a/puppet-infracloud
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 0568a3e20c34771f961469d48f072ed4ba688791
diff --git a/puppet-ipsilon b/puppet-ipsilon
deleted file mode 160000
index 204c74eb97..0000000000
--- a/puppet-ipsilon
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 204c74eb978363293e1fda587cfae90a90d89823
diff --git a/puppet-iptables b/puppet-iptables
deleted file mode 160000
index 185bbcbe52..0000000000
--- a/puppet-iptables
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 185bbcbe5202471c973813555a8de5e73130fb8f
diff --git a/puppet-jeepyb b/puppet-jeepyb
deleted file mode 160000
index a353ba1cfd..0000000000
--- a/puppet-jeepyb
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit a353ba1cfdcbd049efec2ed9b84040938772d4ec
diff --git a/puppet-jenkins b/puppet-jenkins
deleted file mode 160000
index 7d007ac721..0000000000
--- a/puppet-jenkins
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 7d007ac7213cec98771ab3411c95f4f6e8ebf3fa
diff --git a/puppet-kerberos b/puppet-kerberos
deleted file mode 160000
index 1b56e53eac..0000000000
--- a/puppet-kerberos
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 1b56e53eacee72a917c24da56c6b3e0ad0ec8c1e
diff --git a/puppet-kibana b/puppet-kibana
deleted file mode 160000
index 7d24a8209d..0000000000
--- a/puppet-kibana
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 7d24a8209dfb34709837aa9bf341c7946637ca58
diff --git a/puppet-lodgeit b/puppet-lodgeit
deleted file mode 160000
index fbc4f1ed8b..0000000000
--- a/puppet-lodgeit
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit fbc4f1ed8b1b9da85d4c593c50808cf1f1f59675
diff --git a/puppet-log_processor b/puppet-log_processor
deleted file mode 160000
index 09b0ed74f7..0000000000
--- a/puppet-log_processor
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 09b0ed74f77ebff022d6292f4a9544a0346e39de
diff --git a/puppet-logrotate b/puppet-logrotate
deleted file mode 160000
index 91e1835b97..0000000000
--- a/puppet-logrotate
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 91e1835b97cf454286d650c59521411aa436d0c1
diff --git a/puppet-logstash b/puppet-logstash
deleted file mode 160000
index 32e9f596f4..0000000000
--- a/puppet-logstash
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 32e9f596f4dc3a548732087334c6856bf7bf2558
diff --git a/puppet-lpmqtt b/puppet-lpmqtt
deleted file mode 160000
index 815bc2de5b..0000000000
--- a/puppet-lpmqtt
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 815bc2de5b02dbc01069143f49e63a12cee9e633
diff --git a/puppet-mailman b/puppet-mailman
deleted file mode 160000
index 61c3fded0a..0000000000
--- a/puppet-mailman
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 61c3fded0adc2ee42e0b67f90aa5c29601685a3b
diff --git a/puppet-mediawiki b/puppet-mediawiki
deleted file mode 160000
index d476171f72..0000000000
--- a/puppet-mediawiki
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit d476171f72fd26d1e686a625c10de851ba97609b
diff --git a/puppet-meetbot b/puppet-meetbot
deleted file mode 160000
index 6c5903c2bf..0000000000
--- a/puppet-meetbot
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 6c5903c2bf2d1e8997193975a6de0878b0b1a21f
diff --git a/puppet-mosquitto b/puppet-mosquitto
deleted file mode 160000
index 2e9fd8f107..0000000000
--- a/puppet-mosquitto
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 2e9fd8f107d267307c993dedc665bcc023d157d5
diff --git a/puppet-mqtt_statsd b/puppet-mqtt_statsd
deleted file mode 160000
index f7df05b21e..0000000000
--- a/puppet-mqtt_statsd
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit f7df05b21ece2dff0eebd360c7c3c6b8986b8990
diff --git a/puppet-mysql_backup b/puppet-mysql_backup
deleted file mode 160000
index 8a5cb47fa7..0000000000
--- a/puppet-mysql_backup
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 8a5cb47fa711dd512cc0af14c02d95435eeb2fd9
diff --git a/puppet-nodepool b/puppet-nodepool
deleted file mode 160000
index bb0f56209d..0000000000
--- a/puppet-nodepool
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit bb0f56209d2b99a0123511555a0837c6079d1f98
diff --git a/puppet-openafs b/puppet-openafs
deleted file mode 160000
index 3141abcb6e..0000000000
--- a/puppet-openafs
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 3141abcb6e3110c5bc10527d26433472a24949f2
diff --git a/puppet-openstack_health b/puppet-openstack_health
deleted file mode 160000
index 504f0c64db..0000000000
--- a/puppet-openstack_health
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 504f0c64db63272d2db237ff16503caeab2d62b2
diff --git a/puppet-openstack_infra_spec_helper b/puppet-openstack_infra_spec_helper
deleted file mode 160000
index 1e6387b109..0000000000
--- a/puppet-openstack_infra_spec_helper
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 1e6387b109188cab2b5a01e52846fcdee40b3e19
diff --git a/puppet-openstackci b/puppet-openstackci
deleted file mode 160000
index 2c4f42cecd..0000000000
--- a/puppet-openstackci
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 2c4f42cecd2ec328d88a5642e64777f412dd8bb0
diff --git a/puppet-openstackid b/puppet-openstackid
deleted file mode 160000
index 5fd8ea4c50..0000000000
--- a/puppet-openstackid
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 5fd8ea4c50e620469dd1a713c95067fd8e5175a8
diff --git a/puppet-os_client_config b/puppet-os_client_config
deleted file mode 160000
index cc87f0cb52..0000000000
--- a/puppet-os_client_config
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit cc87f0cb5253f8d750a0b9be8c6e84914ff590d7
diff --git a/puppet-packagekit b/puppet-packagekit
deleted file mode 160000
index da3d80b0c1..0000000000
--- a/puppet-packagekit
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit da3d80b0c1c2fa063b9e2bda13b6b10ce4b4e444
diff --git a/puppet-pgsql_backup b/puppet-pgsql_backup
deleted file mode 160000
index e553d17e84..0000000000
--- a/puppet-pgsql_backup
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit e553d17e847c56b91436214af668cf10d9137795
diff --git a/puppet-phabricator b/puppet-phabricator
deleted file mode 160000
index bc8279c3fa..0000000000
--- a/puppet-phabricator
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit bc8279c3faa52104904b1d0574af81a10a763d15
diff --git a/puppet-pip b/puppet-pip
deleted file mode 160000
index 0065e85c52..0000000000
--- a/puppet-pip
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 0065e85c5291e4a0b0bf04f46532c2576a2c1637
diff --git a/puppet-planet b/puppet-planet
deleted file mode 160000
index d30b8f0414..0000000000
--- a/puppet-planet
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit d30b8f0414aafd31aee18bda02b560ced0bd0d97
diff --git a/puppet-project_config b/puppet-project_config
deleted file mode 160000
index a41ed4712c..0000000000
--- a/puppet-project_config
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit a41ed4712cfd6d840ca42edbf78b6cc2c1499af5
diff --git a/puppet-ptgbot b/puppet-ptgbot
deleted file mode 160000
index 1afaf5492c..0000000000
--- a/puppet-ptgbot
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 1afaf5492cec3c788c88b4ee9ab9bf2252616e80
diff --git a/puppet-puppet b/puppet-puppet
deleted file mode 160000
index be214b846c..0000000000
--- a/puppet-puppet
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit be214b846c5ee08e3fb47bcbdbdcab2686b29d21
diff --git a/puppet-redis b/puppet-redis
deleted file mode 160000
index 5d82a68b06..0000000000
--- a/puppet-redis
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 5d82a68b065b1bb00c3a42033ec0fcc0d83e6ba8
diff --git a/puppet-refstack b/puppet-refstack
deleted file mode 160000
index 7d2bf8ef50..0000000000
--- a/puppet-refstack
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 7d2bf8ef507869d46533a0c93b00dd1c1f70bed7
diff --git a/puppet-reviewday b/puppet-reviewday
deleted file mode 160000
index ae52920b72..0000000000
--- a/puppet-reviewday
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit ae52920b7253e9792a03cc0cf35423bee75c165c
diff --git a/puppet-simpleproxy b/puppet-simpleproxy
deleted file mode 160000
index 9628e89639..0000000000
--- a/puppet-simpleproxy
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 9628e8963982df72e96df90af6984fb7102aa6db
diff --git a/puppet-snmpd b/puppet-snmpd
deleted file mode 160000
index a50ef9390d..0000000000
--- a/puppet-snmpd
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit a50ef9390df0e72d002297859aff15df715dc252
diff --git a/puppet-ssh b/puppet-ssh
deleted file mode 160000
index 60494ad3ca..0000000000
--- a/puppet-ssh
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 60494ad3caffbef9926a2fc961c6c5ab0d44fe16
diff --git a/puppet-ssl_cert_check b/puppet-ssl_cert_check
deleted file mode 160000
index 18063c41da..0000000000
--- a/puppet-ssl_cert_check
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 18063c41daf42cb226528f8a60b0cb85c951c569
diff --git a/puppet-statusbot b/puppet-statusbot
deleted file mode 160000
index f1eed8682e..0000000000
--- a/puppet-statusbot
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit f1eed8682e02ed6740dac7d1d2a6ee21eccce7e5
diff --git a/puppet-storyboard b/puppet-storyboard
deleted file mode 160000
index b3fd60a132..0000000000
--- a/puppet-storyboard
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit b3fd60a13278ba9a664932046b6b0c6e06a36160
diff --git a/puppet-subunit2sql b/puppet-subunit2sql
deleted file mode 160000
index 35764a1e39..0000000000
--- a/puppet-subunit2sql
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 35764a1e39a083a2ce99d2e7c635f4329ce0f707
diff --git a/puppet-sudoers b/puppet-sudoers
deleted file mode 160000
index aebb59133a..0000000000
--- a/puppet-sudoers
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit aebb59133a97b50188376ec2cf4747bac7ac192e
diff --git a/puppet-tmpreaper b/puppet-tmpreaper
deleted file mode 160000
index e1c4955d87..0000000000
--- a/puppet-tmpreaper
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit e1c4955d8753b83cfb154499edadb4a246a1a305
diff --git a/puppet-translation_checksite b/puppet-translation_checksite
deleted file mode 160000
index 2fa129b4c8..0000000000
--- a/puppet-translation_checksite
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 2fa129b4c88c188a3d840848c7733f3328ddc312
diff --git a/puppet-ulimit b/puppet-ulimit
deleted file mode 160000
index 8f72d04530..0000000000
--- a/puppet-ulimit
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 8f72d04530d30316bbc0eed3bc29f19f87e85ce6
diff --git a/puppet-unattended_upgrades b/puppet-unattended_upgrades
deleted file mode 160000
index 5fd5d43cc0..0000000000
--- a/puppet-unattended_upgrades
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 5fd5d43cc0778b6f6f412534925f59be0bcb3149
diff --git a/puppet-unbound b/puppet-unbound
deleted file mode 160000
index 169833d9f3..0000000000
--- a/puppet-unbound
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 169833d9f365137031938c68deab597b357551e0
diff --git a/puppet-user b/puppet-user
deleted file mode 160000
index dfa699c8c1..0000000000
--- a/puppet-user
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit dfa699c8c14a05fb2a66a6adb687f69f5f6546be
diff --git a/puppet-vcsrepo b/puppet-vcsrepo
deleted file mode 160000
index c8c656d8a0..0000000000
--- a/puppet-vcsrepo
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit c8c656d8a0bc4bcba034f5c034026ae7618daed5
diff --git a/puppet-yum b/puppet-yum
deleted file mode 160000
index 97083c52f9..0000000000
--- a/puppet-yum
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 97083c52f98f523ef7b1b7e954e426bba0e0d383
diff --git a/puppet-zanata b/puppet-zanata
deleted file mode 160000
index 24a3c65e32..0000000000
--- a/puppet-zanata
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 24a3c65e322d86d7d2bb82ea11bab36728c63475
diff --git a/puppet-zuul b/puppet-zuul
deleted file mode 160000
index 63126bdbb8..0000000000
--- a/puppet-zuul
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 63126bdbb89f9b69c73abd7b2ba987d80b806daf
diff --git a/pynotedb b/pynotedb
deleted file mode 160000
index e87d890c00..0000000000
--- a/pynotedb
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit e87d890c00ab86171d5210e71c51b42312da0dea
diff --git a/python-congressclient b/python-congressclient
deleted file mode 160000
index 1388136246..0000000000
--- a/python-congressclient
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 13881362468fd7e4627a49ff5713aecb609f4b16
diff --git a/python-storyboardclient b/python-storyboardclient
deleted file mode 160000
index 0ae49a0017..0000000000
--- a/python-storyboardclient
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 0ae49a00173d86935e479fe35706f79e909a2d47
diff --git a/reviewday b/reviewday
deleted file mode 160000
index 1992485332..0000000000
--- a/reviewday
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 19924853324b868ee15d7aa646560c5bd9b304d1
diff --git a/reviewstats b/reviewstats
deleted file mode 160000
index 707a7c5be0..0000000000
--- a/reviewstats
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 707a7c5be057d0b39e8e2fa8ded7474514ee3a49
diff --git a/statusbot b/statusbot
deleted file mode 160000
index 7b3a04a575..0000000000
--- a/statusbot
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 7b3a04a57592bce2345ec4e521b7279e9ac46178
diff --git a/storyboard b/storyboard
deleted file mode 160000
index 647bb9c660..0000000000
--- a/storyboard
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 647bb9c660812f42893d6db294c8fdb7852a49ac
diff --git a/storyboard-webclient b/storyboard-webclient
deleted file mode 160000
index 1aa7a72ea0..0000000000
--- a/storyboard-webclient
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 1aa7a72ea04d8e5f02cae24ace87057a121f0174
diff --git a/subunit2sql b/subunit2sql
deleted file mode 160000
index 99f83fda87..0000000000
--- a/subunit2sql
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 99f83fda8742c1c4732c832d139f1c68dce36da9
diff --git a/sushy-cli b/sushy-cli
new file mode 160000
index 0000000000..a66bb0df20
--- /dev/null
+++ b/sushy-cli
@@ -0,0 +1 @@
+Subproject commit a66bb0df2066e284e3194ca525821e6144f2b633
diff --git a/system-config b/system-config
deleted file mode 160000
index 7dabbf8809..0000000000
--- a/system-config
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 7dabbf88094cbbfaba7da87206b9c413376246a9
diff --git a/training-guides b/training-guides
deleted file mode 160000
index bc7b372cb2..0000000000
--- a/training-guides
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit bc7b372cb21d4ccc0d761567abd23d7bbcbaf2d2
diff --git a/training-labs b/training-labs
deleted file mode 160000
index 2585b12b87..0000000000
--- a/training-labs
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 2585b12b879bae4c3fe48a846d1ba9d3de1e4b77
diff --git a/tripleo-operator-ansible b/tripleo-operator-ansible
new file mode 160000
index 0000000000..92830666c3
--- /dev/null
+++ b/tripleo-operator-ansible
@@ -0,0 +1 @@
+Subproject commit 92830666c37c875c58bc079ee824d718c2bf74c8
diff --git a/upstream-institute-virtual-environment b/upstream-institute-virtual-environment
deleted file mode 160000
index 67b9faf7ea..0000000000
--- a/upstream-institute-virtual-environment
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 67b9faf7ea53ba822a147fcdce4f9614306e7812
diff --git a/validations-common b/validations-common
new file mode 160000
index 0000000000..8a3f7e7052
--- /dev/null
+++ b/validations-common
@@ -0,0 +1 @@
+Subproject commit 8a3f7e7052bec386c081bc1c02ed23b105e71061
diff --git a/validations-libs b/validations-libs
new file mode 160000
index 0000000000..b5cc8dff75
--- /dev/null
+++ b/validations-libs
@@ -0,0 +1 @@
+Subproject commit b5cc8dff75f254850b38b0a6a96eeedf38362ee8
diff --git a/xstatic-dagre b/xstatic-dagre
new file mode 160000
index 0000000000..8e4aa995bd
--- /dev/null
+++ b/xstatic-dagre
@@ -0,0 +1 @@
+Subproject commit 8e4aa995bd051e5a6821dcb36fc8161e3e4fdd68
diff --git a/xstatic-dagre-d3 b/xstatic-dagre-d3
new file mode 160000
index 0000000000..3e10f0d4ec
--- /dev/null
+++ b/xstatic-dagre-d3
@@ -0,0 +1 @@
+Subproject commit 3e10f0d4ec3fdc6da5b5d1a9d0812598e74bf4fd
diff --git a/xstatic-graphlib b/xstatic-graphlib
new file mode 160000
index 0000000000..32eecfeb24
--- /dev/null
+++ b/xstatic-graphlib
@@ -0,0 +1 @@
+Subproject commit 32eecfeb243346f2ae5c3b2bff038e1d14bbaeb1
diff --git a/xstatic-lodash b/xstatic-lodash
new file mode 160000
index 0000000000..661ab314a7
--- /dev/null
+++ b/xstatic-lodash
@@ -0,0 +1 @@
+Subproject commit 661ab314a772f0f76b1909a204f75ba8cfd6f071
diff --git a/xstatic-moment b/xstatic-moment
new file mode 160000
index 0000000000..a56d2009f3
--- /dev/null
+++ b/xstatic-moment
@@ -0,0 +1 @@
+Subproject commit a56d2009f3aaf1a25ed2cdbc2399961d8d3f519f
diff --git a/xstatic-moment-timezone b/xstatic-moment-timezone
new file mode 160000
index 0000000000..641ca36da0
--- /dev/null
+++ b/xstatic-moment-timezone
@@ -0,0 +1 @@
+Subproject commit 641ca36da01f3ff7af7ad39f36f9579498c2f018
diff --git a/yaml2ical b/yaml2ical
deleted file mode 160000
index 17fc96295b..0000000000
--- a/yaml2ical
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 17fc96295b34bf7f87da721e6d118b0b9078e380
diff --git a/zone-opendev.org b/zone-opendev.org
deleted file mode 160000
index b86d56b3f1..0000000000
--- a/zone-opendev.org
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit b86d56b3f166f48dc5834f70022a7bdecb1dd09f