Merge "Move diskimage-builder to infra"

projects/infra.json

@@ -1,6 +1,8 @@
 {
     "name": "OpenStack Infrastructure",
     "subprojects": [
+        "openstack/dib-utils",
+        "openstack/diskimage-builder",
         "openstack-dev/openstack-nose",
         "openstack-infra/activity-board",
         "openstack-infra/ansible-build-image",

projects/tripleo.json

@@ -1,7 +1,5 @@
 {"name": "tripleo", "subprojects": [
     "openstack-infra/tripleo-ci",
-    "openstack/dib-utils",
-    "openstack/diskimage-builder",
     "openstack/instack",
     "openstack/instack-undercloud",
     "openstack/os-apply-config",
@@ -23,7 +21,6 @@
 ],
     "core-team-gerrit-group": "tripleo-core",
 "lp_projects": [
-    "diskimage-builder",
     "os-apply-config",
     "os-cloud-config",
     "os-collect-config",