From 45d5296e76570db7caf94d1e8e69abc5ede2ec9c Mon Sep 17 00:00:00 2001 From: Andreas Jaeger Date: Fri, 31 May 2019 21:08:41 +0200 Subject: [PATCH] Regenerate .gitmodules after rename Regenerate .gitmodules after rename. This also takes into account recent retirement and new creation of repos. Change-Id: I171261b046cc3f00444ef1f4b2bc0bc646f9b346 --- .gitmodules | 126 ++++++------------ ansible-role-cloud-launcher | 1 + ansible-role-k8s-cinder | 1 - ansible-role-k8s-cookiecutter | 1 - ansible-role-k8s-glance | 1 - ansible-role-k8s-keystone | 1 - ansible-role-k8s-mariadb | 1 - ansible-role-k8s-rabbitmq | 1 - ansible-role-k8s-tripleo | 1 - charm-interface-keystone-fid-service-provider | 1 + charm-interface-websso-fid-service-provider | 1 + charm-keystone-saml-mellon | 1 + charm-lxd => charm-nova-lxd | 0 charm-vault | 1 + ciwatch | 1 - compute-hyperv | 1 + cyborg-tempest-plugin | 1 + gearman-plugin | 1 - gitdm | 1 - groups | 1 - groups-static-pages | 1 - infra-ansible | 1 - jenkins-job-builder | 1 - liberasurecode | 1 + odsreg | 1 - openstackid | 1 - openstackid-resources | 1 - openstackweb | 1 - oslosphinx | 1 - pyeclib | 1 + zmq-event-publisher | 1 - zone-opendev.org | 1 + 32 files changed, 53 insertions(+), 103 deletions(-) create mode 160000 ansible-role-cloud-launcher delete mode 160000 ansible-role-k8s-cinder delete mode 160000 ansible-role-k8s-cookiecutter delete mode 160000 ansible-role-k8s-glance delete mode 160000 ansible-role-k8s-keystone delete mode 160000 ansible-role-k8s-mariadb delete mode 160000 ansible-role-k8s-rabbitmq delete mode 160000 ansible-role-k8s-tripleo create mode 160000 charm-interface-keystone-fid-service-provider create mode 160000 charm-interface-websso-fid-service-provider create mode 160000 charm-keystone-saml-mellon rename charm-lxd => charm-nova-lxd (100%) create mode 160000 charm-vault delete mode 160000 ciwatch create mode 160000 compute-hyperv create mode 160000 cyborg-tempest-plugin delete mode 160000 gearman-plugin delete mode 160000 gitdm delete mode 160000 groups delete mode 160000 groups-static-pages delete mode 160000 infra-ansible delete mode 160000 jenkins-job-builder create mode 160000 liberasurecode delete mode 160000 odsreg delete mode 160000 openstackid delete mode 160000 openstackid-resources delete mode 160000 openstackweb delete mode 160000 oslosphinx create mode 160000 pyeclib delete mode 160000 zmq-event-publisher create mode 160000 zone-opendev.org diff --git a/.gitmodules b/.gitmodules index 8b2fb7e485..e48ae69e48 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,7 +1,3 @@ -[submodule "jenkins-job-builder"] - path = jenkins-job-builder - url = ../../jjb/jenkins-job-builder.git - branch = . [submodule "afsmon"] path = afsmon url = ../../opendev/afsmon.git @@ -462,6 +458,10 @@ 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 @@ -494,34 +494,6 @@ path = ansible-role-container-registry url = ../../openstack/ansible-role-container-registry.git branch = . -[submodule "ansible-role-k8s-cinder"] - path = ansible-role-k8s-cinder - url = ../../openstack/ansible-role-k8s-cinder.git - branch = . -[submodule "ansible-role-k8s-cookiecutter"] - path = ansible-role-k8s-cookiecutter - url = ../../openstack/ansible-role-k8s-cookiecutter.git - branch = . -[submodule "ansible-role-k8s-glance"] - path = ansible-role-k8s-glance - url = ../../openstack/ansible-role-k8s-glance.git - branch = . -[submodule "ansible-role-k8s-keystone"] - path = ansible-role-k8s-keystone - url = ../../openstack/ansible-role-k8s-keystone.git - branch = . -[submodule "ansible-role-k8s-mariadb"] - path = ansible-role-k8s-mariadb - url = ../../openstack/ansible-role-k8s-mariadb.git - branch = . -[submodule "ansible-role-k8s-rabbitmq"] - path = ansible-role-k8s-rabbitmq - url = ../../openstack/ansible-role-k8s-rabbitmq.git - branch = . -[submodule "ansible-role-k8s-tripleo"] - path = ansible-role-k8s-tripleo - url = ../../openstack/ansible-role-k8s-tripleo.git - branch = . [submodule "ansible-role-openstack-operations"] path = ansible-role-openstack-operations url = ../../openstack/ansible-role-openstack-operations.git @@ -926,6 +898,10 @@ path = charm-interface-keystone-domain-backend url = ../../openstack/charm-interface-keystone-domain-backend.git branch = . +[submodule "charm-interface-keystone-fid-service-provider"] + path = charm-interface-keystone-fid-service-provider + url = ../../openstack/charm-interface-keystone-fid-service-provider.git + branch = . [submodule "charm-interface-manila-plugin"] path = charm-interface-manila-plugin url = ../../openstack/charm-interface-manila-plugin.git @@ -978,6 +954,10 @@ path = charm-interface-service-control url = ../../openstack/charm-interface-service-control.git branch = . +[submodule "charm-interface-websso-fid-service-provider"] + path = charm-interface-websso-fid-service-provider + url = ../../openstack/charm-interface-websso-fid-service-provider.git + branch = . [submodule "charm-ironic"] path = charm-ironic url = ../../openstack/charm-ironic.git @@ -990,6 +970,10 @@ path = charm-keystone-ldap url = ../../openstack/charm-keystone-ldap.git branch = . +[submodule "charm-keystone-saml-mellon"] + path = charm-keystone-saml-mellon + url = ../../openstack/charm-keystone-saml-mellon.git + branch = . [submodule "charm-layer-ceph"] path = charm-layer-ceph url = ../../openstack/charm-layer-ceph.git @@ -1010,10 +994,6 @@ path = charm-layer-openstack-principle url = ../../openstack/charm-layer-openstack-principle.git branch = . -[submodule "charm-lxd"] - path = charm-lxd - url = ../../openstack/charm-lxd.git - branch = . [submodule "charm-manila"] path = charm-manila url = ../../openstack/charm-manila.git @@ -1082,6 +1062,10 @@ path = charm-nova-compute-proxy url = ../../openstack/charm-nova-compute-proxy.git branch = . +[submodule "charm-nova-lxd"] + path = charm-nova-lxd + url = ../../openstack/charm-nova-lxd.git + branch = . [submodule "charm-octavia"] path = charm-octavia url = ../../openstack/charm-octavia.git @@ -1138,6 +1122,10 @@ path = charm-trove url = ../../openstack/charm-trove.git branch = . +[submodule "charm-vault"] + path = charm-vault + url = ../../openstack/charm-vault.git + branch = . [submodule "charms.ceph"] path = charms.ceph url = ../../openstack/charms.ceph.git @@ -1182,6 +1170,10 @@ path = cloudkitty-tempest-plugin url = ../../openstack/cloudkitty-tempest-plugin.git branch = . +[submodule "compute-hyperv"] + path = compute-hyperv + url = ../../openstack/compute-hyperv.git + branch = . [submodule "congress"] path = congress url = ../../openstack/congress.git @@ -1290,6 +1282,10 @@ path = cyborg-specs url = ../../openstack/cyborg-specs.git branch = . +[submodule "cyborg-tempest-plugin"] + path = cyborg-tempest-plugin + url = ../../openstack/cyborg-tempest-plugin.git + branch = . [submodule "debtcollector"] path = debtcollector url = ../../openstack/debtcollector.git @@ -1590,6 +1586,10 @@ path = ldappool url = ../../openstack/ldappool.git branch = . +[submodule "liberasurecode"] + path = liberasurecode + url = ../../openstack/liberasurecode.git + branch = . [submodule "loci"] path = loci url = ../../openstack/loci.git @@ -2410,10 +2410,6 @@ path = oslo.vmware url = ../../openstack/oslo.vmware.git branch = . -[submodule "oslosphinx"] - path = oslosphinx - url = ../../openstack/oslosphinx.git - branch = . [submodule "oslotest"] path = oslotest url = ../../openstack/oslotest.git @@ -2670,6 +2666,10 @@ path = pycadf url = ../../openstack/pycadf.git branch = . +[submodule "pyeclib"] + path = pyeclib + url = ../../openstack/pyeclib.git + branch = . [submodule "pymod2pkg"] path = pymod2pkg url = ../../openstack/pymod2pkg.git @@ -3394,47 +3394,7 @@ path = zun-ui url = ../../openstack/zun-ui.git branch = . -[submodule "groups"] - path = groups - url = ../../osf/groups.git - branch = . -[submodule "groups-static-pages"] - path = groups-static-pages - url = ../../osf/groups-static-pages.git - branch = . -[submodule "odsreg"] - path = odsreg - url = ../../osf/odsreg.git - branch = . -[submodule "openstackid"] - path = openstackid - url = ../../osf/openstackid.git - branch = . -[submodule "openstackid-resources"] - path = openstackid-resources - url = ../../osf/openstackid-resources.git - branch = . -[submodule "openstackweb"] - path = openstackweb - url = ../../osf/openstackweb.git - branch = . -[submodule "ciwatch"] - path = ciwatch - url = ../../x/ciwatch.git - branch = . -[submodule "gearman-plugin"] - path = gearman-plugin - url = ../../x/gearman-plugin.git - branch = . -[submodule "gitdm"] - path = gitdm - url = ../../x/gitdm.git - branch = . -[submodule "infra-ansible"] - path = infra-ansible - url = ../../x/infra-ansible.git - branch = . -[submodule "zmq-event-publisher"] - path = zmq-event-publisher - url = ../../x/zmq-event-publisher.git +[submodule "ansible-role-cloud-launcher"] + path = ansible-role-cloud-launcher + url = ../../x/ansible-role-cloud-launcher.git branch = . diff --git a/ansible-role-cloud-launcher b/ansible-role-cloud-launcher new file mode 160000 index 0000000000..60e701bb38 --- /dev/null +++ b/ansible-role-cloud-launcher @@ -0,0 +1 @@ +Subproject commit 60e701bb38970659b55d818f62b26730e5f5e7bd diff --git a/ansible-role-k8s-cinder b/ansible-role-k8s-cinder deleted file mode 160000 index 57c1b3f30b..0000000000 --- a/ansible-role-k8s-cinder +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 57c1b3f30b06043490d41b4f0ceb7e2d45abf1df diff --git a/ansible-role-k8s-cookiecutter b/ansible-role-k8s-cookiecutter deleted file mode 160000 index cf2c6b7b1d..0000000000 --- a/ansible-role-k8s-cookiecutter +++ /dev/null @@ -1 +0,0 @@ -Subproject commit cf2c6b7b1d4c673ca8011f6c859cac08bd653898 diff --git a/ansible-role-k8s-glance b/ansible-role-k8s-glance deleted file mode 160000 index 6c31b56370..0000000000 --- a/ansible-role-k8s-glance +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 6c31b563708d169421f9b94c7da565b99a5f674c diff --git a/ansible-role-k8s-keystone b/ansible-role-k8s-keystone deleted file mode 160000 index 165461a8d3..0000000000 --- a/ansible-role-k8s-keystone +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 165461a8d31c168504c9b08353c0258ac53b6070 diff --git a/ansible-role-k8s-mariadb b/ansible-role-k8s-mariadb deleted file mode 160000 index f052db5f00..0000000000 --- a/ansible-role-k8s-mariadb +++ /dev/null @@ -1 +0,0 @@ -Subproject commit f052db5f0010c1cf3a5166e680aebe4d3048cf70 diff --git a/ansible-role-k8s-rabbitmq b/ansible-role-k8s-rabbitmq deleted file mode 160000 index aac14f7985..0000000000 --- a/ansible-role-k8s-rabbitmq +++ /dev/null @@ -1 +0,0 @@ -Subproject commit aac14f798546117102ed5596a56ee54fd4fec47f diff --git a/ansible-role-k8s-tripleo b/ansible-role-k8s-tripleo deleted file mode 160000 index 2a94475a27..0000000000 --- a/ansible-role-k8s-tripleo +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 2a94475a270545d734658c646ae22c937ed344ec diff --git a/charm-interface-keystone-fid-service-provider b/charm-interface-keystone-fid-service-provider new file mode 160000 index 0000000000..cb6bdc5c10 --- /dev/null +++ b/charm-interface-keystone-fid-service-provider @@ -0,0 +1 @@ +Subproject commit cb6bdc5c10c4393131b135a2721b34f5e3a6d789 diff --git a/charm-interface-websso-fid-service-provider b/charm-interface-websso-fid-service-provider new file mode 160000 index 0000000000..bd3640f68d --- /dev/null +++ b/charm-interface-websso-fid-service-provider @@ -0,0 +1 @@ +Subproject commit bd3640f68d9742bfbf186aa40f070c9504141da0 diff --git a/charm-keystone-saml-mellon b/charm-keystone-saml-mellon new file mode 160000 index 0000000000..e2731d14f3 --- /dev/null +++ b/charm-keystone-saml-mellon @@ -0,0 +1 @@ +Subproject commit e2731d14f374f7e83a70498bebf4f5b9cfa6d4eb diff --git a/charm-lxd b/charm-nova-lxd similarity index 100% rename from charm-lxd rename to charm-nova-lxd diff --git a/charm-vault b/charm-vault new file mode 160000 index 0000000000..60c35da8b6 --- /dev/null +++ b/charm-vault @@ -0,0 +1 @@ +Subproject commit 60c35da8b638cf0854bc1ac8039a66499c9259cb diff --git a/ciwatch b/ciwatch deleted file mode 160000 index a5f13c53f0..0000000000 --- a/ciwatch +++ /dev/null @@ -1 +0,0 @@ -Subproject commit a5f13c53f0ec611c8252640c58661b3e50cc3067 diff --git a/compute-hyperv b/compute-hyperv new file mode 160000 index 0000000000..f7c98982ad --- /dev/null +++ b/compute-hyperv @@ -0,0 +1 @@ +Subproject commit f7c98982ad3aa0b4272c4b540fe51f644d9dddc0 diff --git a/cyborg-tempest-plugin b/cyborg-tempest-plugin new file mode 160000 index 0000000000..d64f64fa09 --- /dev/null +++ b/cyborg-tempest-plugin @@ -0,0 +1 @@ +Subproject commit d64f64fa094a06e122bb01e9988721fa2df77c6d diff --git a/gearman-plugin b/gearman-plugin deleted file mode 160000 index 46d74f029f..0000000000 --- a/gearman-plugin +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 46d74f029f19067446ae386e8a6ed47fb627d867 diff --git a/gitdm b/gitdm deleted file mode 160000 index 547072d99f..0000000000 --- a/gitdm +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 547072d99f61f1fe91d49fbcbb156244496a0ac2 diff --git a/groups b/groups deleted file mode 160000 index e825e37696..0000000000 --- a/groups +++ /dev/null @@ -1 +0,0 @@ -Subproject commit e825e376967db60e57a04d90fc8c7b40c50be527 diff --git a/groups-static-pages b/groups-static-pages deleted file mode 160000 index 0b3d5ca5b8..0000000000 --- a/groups-static-pages +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 0b3d5ca5b803f4a70c68dd5a955211fb1675bbed diff --git a/infra-ansible b/infra-ansible deleted file mode 160000 index 0b6d56c9d9..0000000000 --- a/infra-ansible +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 0b6d56c9d93d3c3b612ffaca659e8ea93f0205ba diff --git a/jenkins-job-builder b/jenkins-job-builder deleted file mode 160000 index e394ed37e0..0000000000 --- a/jenkins-job-builder +++ /dev/null @@ -1 +0,0 @@ -Subproject commit e394ed37e0941c09fb33d9cc6ba8b2e997eff8c1 diff --git a/liberasurecode b/liberasurecode new file mode 160000 index 0000000000..778bddf2c9 --- /dev/null +++ b/liberasurecode @@ -0,0 +1 @@ +Subproject commit 778bddf2c97715c088c8da8b65e25cf135e9ea62 diff --git a/odsreg b/odsreg deleted file mode 160000 index 88b1770704..0000000000 --- a/odsreg +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 88b1770704ec9b1f7c777e0e6b066483595371bc diff --git a/openstackid b/openstackid deleted file mode 160000 index e23c36dddf..0000000000 --- a/openstackid +++ /dev/null @@ -1 +0,0 @@ -Subproject commit e23c36dddfa37e5fa1d27e5f475a77e6f1ab6ee9 diff --git a/openstackid-resources b/openstackid-resources deleted file mode 160000 index 6a674a6dd8..0000000000 --- a/openstackid-resources +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 6a674a6dd81fe9f038dab8f5eef6f205e0675a59 diff --git a/openstackweb b/openstackweb deleted file mode 160000 index 38c8be9ed1..0000000000 --- a/openstackweb +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 38c8be9ed12bd3aba9cb34c9b5d760317af0600f diff --git a/oslosphinx b/oslosphinx deleted file mode 160000 index 8e194ee518..0000000000 --- a/oslosphinx +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 8e194ee518c10ec8e43e6cae5e7d9003cd4e91f3 diff --git a/pyeclib b/pyeclib new file mode 160000 index 0000000000..b1df313d42 --- /dev/null +++ b/pyeclib @@ -0,0 +1 @@ +Subproject commit b1df313d42676f29d881708bf9de284703f3ae33 diff --git a/zmq-event-publisher b/zmq-event-publisher deleted file mode 160000 index 54759994c6..0000000000 --- a/zmq-event-publisher +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 54759994c66a1cf37563999f8c451e5c5e0a7fb4 diff --git a/zone-opendev.org b/zone-opendev.org new file mode 160000 index 0000000000..94edae08fd --- /dev/null +++ b/zone-opendev.org @@ -0,0 +1 @@ +Subproject commit 94edae08fdb5c339c1ba8d5e33e7d8c995992404