diff --git a/docker/centos/binary/cinder-data/Dockerfile b/docker/centos/binary/cinder-app/cinder-data/Dockerfile
similarity index 100%
rename from docker/centos/binary/cinder-data/Dockerfile
rename to docker/centos/binary/cinder-app/cinder-data/Dockerfile
diff --git a/docker/centos/binary/nova-compute/nova-compute-data/build b/docker/centos/binary/cinder-app/cinder-data/build
similarity index 100%
rename from docker/centos/binary/nova-compute/nova-compute-data/build
rename to docker/centos/binary/cinder-app/cinder-data/build
diff --git a/docker/centos/binary/cinder-data/build b/docker/centos/binary/cinder-data/build
deleted file mode 120000
index 8d652f7ee2..0000000000
--- a/docker/centos/binary/cinder-data/build
+++ /dev/null
@@ -1 +0,0 @@
-../../../../tools/build-docker-image
\ No newline at end of file
diff --git a/docker/centos/binary/mariadb-app/build b/docker/centos/binary/mariadb-app/build
deleted file mode 120000
index 8d652f7ee2..0000000000
--- a/docker/centos/binary/mariadb-app/build
+++ /dev/null
@@ -1 +0,0 @@
-../../../../tools/build-docker-image
\ No newline at end of file
diff --git a/docker/centos/binary/mariadb-app/config-mysql.sh b/docker/centos/binary/mariadb-app/config-mysql.sh
deleted file mode 120000
index 17341e4151..0000000000
--- a/docker/centos/binary/mariadb-app/config-mysql.sh
+++ /dev/null
@@ -1 +0,0 @@
-../../../common/mariadb-app/config-mysql.sh
\ No newline at end of file
diff --git a/docker/centos/binary/mariadb-app/mysql-entrypoint.sh b/docker/centos/binary/mariadb-app/mysql-entrypoint.sh
deleted file mode 120000
index 0009309c83..0000000000
--- a/docker/centos/binary/mariadb-app/mysql-entrypoint.sh
+++ /dev/null
@@ -1 +0,0 @@
-../../../common/mariadb-app/mysql-entrypoint.sh
\ No newline at end of file
diff --git a/docker/centos/binary/mariadb-data/build b/docker/centos/binary/mariadb-data/build
deleted file mode 120000
index 8d652f7ee2..0000000000
--- a/docker/centos/binary/mariadb-data/build
+++ /dev/null
@@ -1 +0,0 @@
-../../../../tools/build-docker-image
\ No newline at end of file
diff --git a/docker/centos/binary/mariadb-app/Dockerfile b/docker/centos/binary/mariadb/mariadb-app/Dockerfile
similarity index 100%
rename from docker/centos/binary/mariadb-app/Dockerfile
rename to docker/centos/binary/mariadb/mariadb-app/Dockerfile
diff --git a/docker/centos/binary/nova-compute/nova-compute/build b/docker/centos/binary/mariadb/mariadb-app/build
similarity index 100%
rename from docker/centos/binary/nova-compute/nova-compute/build
rename to docker/centos/binary/mariadb/mariadb-app/build
diff --git a/docker/centos/binary/mariadb/mariadb-app/config-mysql.sh b/docker/centos/binary/mariadb/mariadb-app/config-mysql.sh
new file mode 120000
index 0000000000..d093422611
--- /dev/null
+++ b/docker/centos/binary/mariadb/mariadb-app/config-mysql.sh
@@ -0,0 +1 @@
+../../../../common/mariadb-app/config-mysql.sh
\ No newline at end of file
diff --git a/docker/centos/binary/mariadb/mariadb-app/mysql-entrypoint.sh b/docker/centos/binary/mariadb/mariadb-app/mysql-entrypoint.sh
new file mode 120000
index 0000000000..39b4add9ea
--- /dev/null
+++ b/docker/centos/binary/mariadb/mariadb-app/mysql-entrypoint.sh
@@ -0,0 +1 @@
+../../../../common/mariadb-app/mysql-entrypoint.sh
\ No newline at end of file
diff --git a/docker/centos/binary/mariadb-data/Dockerfile b/docker/centos/binary/mariadb/mariadb-data/Dockerfile
similarity index 100%
rename from docker/centos/binary/mariadb-data/Dockerfile
rename to docker/centos/binary/mariadb/mariadb-data/Dockerfile
diff --git a/docker/centos/binary/nova-compute/nova-libvirt/build b/docker/centos/binary/mariadb/mariadb-data/build
similarity index 100%
rename from docker/centos/binary/nova-compute/nova-libvirt/build
rename to docker/centos/binary/mariadb/mariadb-data/build
diff --git a/docker/centos/binary/nova-base/build b/docker/centos/binary/nova-base/build
deleted file mode 120000
index 8d652f7ee2..0000000000
--- a/docker/centos/binary/nova-base/build
+++ /dev/null
@@ -1 +0,0 @@
-../../../../tools/build-docker-image
\ No newline at end of file
diff --git a/docker/centos/binary/nova-base/config-nova.sh b/docker/centos/binary/nova-base/config-nova.sh
deleted file mode 120000
index 32efe60563..0000000000
--- a/docker/centos/binary/nova-base/config-nova.sh
+++ /dev/null
@@ -1 +0,0 @@
-../../../common/nova-base/config-nova.sh
\ No newline at end of file
diff --git a/docker/centos/binary/nova-compute/nova-compute/config-external.sh b/docker/centos/binary/nova-compute/nova-compute/config-external.sh
deleted file mode 120000
index 46de4bf333..0000000000
--- a/docker/centos/binary/nova-compute/nova-compute/config-external.sh
+++ /dev/null
@@ -1 +0,0 @@
-../../../../common/nova-compute/nova-compute/config-external.sh
\ No newline at end of file
diff --git a/docker/centos/binary/nova-compute/nova-compute/config-internal.sh b/docker/centos/binary/nova-compute/nova-compute/config-internal.sh
deleted file mode 120000
index 58337d966a..0000000000
--- a/docker/centos/binary/nova-compute/nova-compute/config-internal.sh
+++ /dev/null
@@ -1 +0,0 @@
-../../../../common/nova-compute/nova-compute/config-internal.sh
\ No newline at end of file
diff --git a/docker/centos/binary/nova-compute/nova-compute/config-nova-compute.sh b/docker/centos/binary/nova-compute/nova-compute/config-nova-compute.sh
deleted file mode 120000
index 0f3c1216cf..0000000000
--- a/docker/centos/binary/nova-compute/nova-compute/config-nova-compute.sh
+++ /dev/null
@@ -1 +0,0 @@
-../../../../common/nova-compute/nova-compute/config-nova-compute.sh
\ No newline at end of file
diff --git a/docker/centos/binary/nova-compute/nova-compute/start.sh b/docker/centos/binary/nova-compute/nova-compute/start.sh
deleted file mode 120000
index ef5d32f18a..0000000000
--- a/docker/centos/binary/nova-compute/nova-compute/start.sh
+++ /dev/null
@@ -1 +0,0 @@
-../../../../common/nova-compute/nova-compute/start.sh
\ No newline at end of file
diff --git a/docker/centos/binary/nova-compute/nova-libvirt/config-external.sh b/docker/centos/binary/nova-compute/nova-libvirt/config-external.sh
deleted file mode 120000
index 22275236bb..0000000000
--- a/docker/centos/binary/nova-compute/nova-libvirt/config-external.sh
+++ /dev/null
@@ -1 +0,0 @@
-../../../../common/nova-compute/nova-libvirt/config-external.sh
\ No newline at end of file
diff --git a/docker/centos/binary/nova-compute/nova-libvirt/config-internal.sh b/docker/centos/binary/nova-compute/nova-libvirt/config-internal.sh
deleted file mode 120000
index c20242db76..0000000000
--- a/docker/centos/binary/nova-compute/nova-libvirt/config-internal.sh
+++ /dev/null
@@ -1 +0,0 @@
-../../../../common/nova-compute/nova-libvirt/config-internal.sh
\ No newline at end of file
diff --git a/docker/centos/binary/nova-compute/nova-libvirt/start.sh b/docker/centos/binary/nova-compute/nova-libvirt/start.sh
deleted file mode 120000
index eac9099789..0000000000
--- a/docker/centos/binary/nova-compute/nova-libvirt/start.sh
+++ /dev/null
@@ -1 +0,0 @@
-../../../../common/nova-compute/nova-libvirt/start.sh
\ No newline at end of file
diff --git a/docker/centos/binary/nova-compute/nova-network/config-external.sh b/docker/centos/binary/nova-compute/nova-network/config-external.sh
deleted file mode 120000
index 1257cd8984..0000000000
--- a/docker/centos/binary/nova-compute/nova-network/config-external.sh
+++ /dev/null
@@ -1 +0,0 @@
-../../../../common/nova-compute/nova-network/config-external.sh
\ No newline at end of file
diff --git a/docker/centos/binary/nova-compute/nova-network/config-internal.sh b/docker/centos/binary/nova-compute/nova-network/config-internal.sh
deleted file mode 120000
index 3b64fcabcb..0000000000
--- a/docker/centos/binary/nova-compute/nova-network/config-internal.sh
+++ /dev/null
@@ -1 +0,0 @@
-../../../../common/nova-compute/nova-network/config-internal.sh
\ No newline at end of file
diff --git a/docker/centos/binary/nova-compute/nova-network/config-nova-network.sh b/docker/centos/binary/nova-compute/nova-network/config-nova-network.sh
deleted file mode 120000
index ed1af588e0..0000000000
--- a/docker/centos/binary/nova-compute/nova-network/config-nova-network.sh
+++ /dev/null
@@ -1 +0,0 @@
-../../../../common/nova-compute/nova-network/config-nova-network.sh
\ No newline at end of file
diff --git a/docker/centos/binary/nova-compute/nova-network/start.sh b/docker/centos/binary/nova-compute/nova-network/start.sh
deleted file mode 120000
index f2bec19791..0000000000
--- a/docker/centos/binary/nova-compute/nova-network/start.sh
+++ /dev/null
@@ -1 +0,0 @@
-../../../../common/nova-compute/nova-network/start.sh
\ No newline at end of file
diff --git a/docker/centos/binary/nova-controller/nova-api/check.sh b/docker/centos/binary/nova-controller/nova-api/check.sh
deleted file mode 120000
index 2a047038e4..0000000000
--- a/docker/centos/binary/nova-controller/nova-api/check.sh
+++ /dev/null
@@ -1 +0,0 @@
-../../../../common/nova-controller/nova-api/check.sh
\ No newline at end of file
diff --git a/docker/centos/binary/nova-controller/nova-api/config-external.sh b/docker/centos/binary/nova-controller/nova-api/config-external.sh
deleted file mode 120000
index a2a68471d2..0000000000
--- a/docker/centos/binary/nova-controller/nova-api/config-external.sh
+++ /dev/null
@@ -1 +0,0 @@
-../../../../common/nova-controller/nova-api/config-external.sh
\ No newline at end of file
diff --git a/docker/centos/binary/nova-controller/nova-api/config-internal.sh b/docker/centos/binary/nova-controller/nova-api/config-internal.sh
deleted file mode 120000
index cde9e26459..0000000000
--- a/docker/centos/binary/nova-controller/nova-api/config-internal.sh
+++ /dev/null
@@ -1 +0,0 @@
-../../../../common/nova-controller/nova-api/config-internal.sh
\ No newline at end of file
diff --git a/docker/centos/binary/nova-controller/nova-api/start.sh b/docker/centos/binary/nova-controller/nova-api/start.sh
deleted file mode 120000
index 7613d713aa..0000000000
--- a/docker/centos/binary/nova-controller/nova-api/start.sh
+++ /dev/null
@@ -1 +0,0 @@
-../../../../common/nova-controller/nova-api/start.sh
\ No newline at end of file
diff --git a/docker/centos/binary/nova-controller/nova-conductor/config-external.sh b/docker/centos/binary/nova-controller/nova-conductor/config-external.sh
deleted file mode 120000
index 4cb26e83e4..0000000000
--- a/docker/centos/binary/nova-controller/nova-conductor/config-external.sh
+++ /dev/null
@@ -1 +0,0 @@
-../../../../common/nova-controller/nova-conductor/config-external.sh
\ No newline at end of file
diff --git a/docker/centos/binary/nova-controller/nova-conductor/config-internal.sh b/docker/centos/binary/nova-controller/nova-conductor/config-internal.sh
deleted file mode 120000
index 836b544364..0000000000
--- a/docker/centos/binary/nova-controller/nova-conductor/config-internal.sh
+++ /dev/null
@@ -1 +0,0 @@
-../../../../common/nova-controller/nova-conductor/config-internal.sh
\ No newline at end of file
diff --git a/docker/centos/binary/nova-controller/nova-conductor/start.sh b/docker/centos/binary/nova-controller/nova-conductor/start.sh
deleted file mode 120000
index 2b0dc28f8c..0000000000
--- a/docker/centos/binary/nova-controller/nova-conductor/start.sh
+++ /dev/null
@@ -1 +0,0 @@
-../../../../common/nova-controller/nova-conductor/start.sh
\ No newline at end of file
diff --git a/docker/centos/binary/nova-controller/nova-consoleauth/config-external.sh b/docker/centos/binary/nova-controller/nova-consoleauth/config-external.sh
deleted file mode 120000
index 78785fe3e1..0000000000
--- a/docker/centos/binary/nova-controller/nova-consoleauth/config-external.sh
+++ /dev/null
@@ -1 +0,0 @@
-../../../../common/nova-controller/nova-consoleauth/config-external.sh
\ No newline at end of file
diff --git a/docker/centos/binary/nova-controller/nova-consoleauth/config-internal.sh b/docker/centos/binary/nova-controller/nova-consoleauth/config-internal.sh
deleted file mode 120000
index 07b75b62db..0000000000
--- a/docker/centos/binary/nova-controller/nova-consoleauth/config-internal.sh
+++ /dev/null
@@ -1 +0,0 @@
-../../../../common/nova-controller/nova-consoleauth/config-internal.sh
\ No newline at end of file
diff --git a/docker/centos/binary/nova-controller/nova-consoleauth/start.sh b/docker/centos/binary/nova-controller/nova-consoleauth/start.sh
deleted file mode 120000
index 0821b3c381..0000000000
--- a/docker/centos/binary/nova-controller/nova-consoleauth/start.sh
+++ /dev/null
@@ -1 +0,0 @@
-../../../../common/nova-controller/nova-consoleauth/start.sh
\ No newline at end of file
diff --git a/docker/centos/binary/nova-controller/nova-novncproxy/config-external.sh b/docker/centos/binary/nova-controller/nova-novncproxy/config-external.sh
deleted file mode 120000
index 8755ef4552..0000000000
--- a/docker/centos/binary/nova-controller/nova-novncproxy/config-external.sh
+++ /dev/null
@@ -1 +0,0 @@
-../../../../common/nova-controller/nova-novncproxy/config-external.sh
\ No newline at end of file
diff --git a/docker/centos/binary/nova-controller/nova-novncproxy/config-internal.sh b/docker/centos/binary/nova-controller/nova-novncproxy/config-internal.sh
deleted file mode 120000
index ddfde08326..0000000000
--- a/docker/centos/binary/nova-controller/nova-novncproxy/config-internal.sh
+++ /dev/null
@@ -1 +0,0 @@
-../../../../common/nova-controller/nova-novncproxy/config-internal.sh
\ No newline at end of file
diff --git a/docker/centos/binary/nova-controller/nova-novncproxy/start.sh b/docker/centos/binary/nova-controller/nova-novncproxy/start.sh
deleted file mode 120000
index 80b6459a44..0000000000
--- a/docker/centos/binary/nova-controller/nova-novncproxy/start.sh
+++ /dev/null
@@ -1 +0,0 @@
-../../../../common/nova-controller/nova-novncproxy/start.sh
\ No newline at end of file
diff --git a/docker/centos/binary/nova-controller/nova-scheduler/config-external.sh b/docker/centos/binary/nova-controller/nova-scheduler/config-external.sh
deleted file mode 120000
index 502d246b03..0000000000
--- a/docker/centos/binary/nova-controller/nova-scheduler/config-external.sh
+++ /dev/null
@@ -1 +0,0 @@
-../../../../common/nova-controller/nova-scheduler/config-external.sh
\ No newline at end of file
diff --git a/docker/centos/binary/nova-controller/nova-scheduler/config-internal.sh b/docker/centos/binary/nova-controller/nova-scheduler/config-internal.sh
deleted file mode 120000
index 4b4808a79e..0000000000
--- a/docker/centos/binary/nova-controller/nova-scheduler/config-internal.sh
+++ /dev/null
@@ -1 +0,0 @@
-../../../../common/nova-controller/nova-scheduler/config-internal.sh
\ No newline at end of file
diff --git a/docker/centos/binary/nova-controller/nova-scheduler/start.sh b/docker/centos/binary/nova-controller/nova-scheduler/start.sh
deleted file mode 120000
index a72115139b..0000000000
--- a/docker/centos/binary/nova-controller/nova-scheduler/start.sh
+++ /dev/null
@@ -1 +0,0 @@
-../../../../common/nova-controller/nova-scheduler/start.sh
\ No newline at end of file
diff --git a/docker/centos/binary/nova-controller/nova-api/Dockerfile b/docker/centos/binary/nova/nova-api/Dockerfile
similarity index 100%
rename from docker/centos/binary/nova-controller/nova-api/Dockerfile
rename to docker/centos/binary/nova/nova-api/Dockerfile
diff --git a/docker/centos/binary/nova-compute/nova-network/build b/docker/centos/binary/nova/nova-api/build
similarity index 100%
rename from docker/centos/binary/nova-compute/nova-network/build
rename to docker/centos/binary/nova/nova-api/build
diff --git a/docker/centos/binary/nova/nova-api/check.sh b/docker/centos/binary/nova/nova-api/check.sh
new file mode 120000
index 0000000000..980c32476e
--- /dev/null
+++ b/docker/centos/binary/nova/nova-api/check.sh
@@ -0,0 +1 @@
+../../../../common/nova/nova-api/check.sh
\ No newline at end of file
diff --git a/docker/centos/binary/nova/nova-api/config-external.sh b/docker/centos/binary/nova/nova-api/config-external.sh
new file mode 120000
index 0000000000..fa9d355fe5
--- /dev/null
+++ b/docker/centos/binary/nova/nova-api/config-external.sh
@@ -0,0 +1 @@
+../../../../common/nova/nova-api/config-external.sh
\ No newline at end of file
diff --git a/docker/centos/binary/nova/nova-api/config-internal.sh b/docker/centos/binary/nova/nova-api/config-internal.sh
new file mode 120000
index 0000000000..7a2866993e
--- /dev/null
+++ b/docker/centos/binary/nova/nova-api/config-internal.sh
@@ -0,0 +1 @@
+../../../../common/nova/nova-api/config-internal.sh
\ No newline at end of file
diff --git a/docker/centos/binary/nova/nova-api/start.sh b/docker/centos/binary/nova/nova-api/start.sh
new file mode 120000
index 0000000000..12fd6f0286
--- /dev/null
+++ b/docker/centos/binary/nova/nova-api/start.sh
@@ -0,0 +1 @@
+../../../../common/nova/nova-api/start.sh
\ No newline at end of file
diff --git a/docker/centos/binary/nova-base/Dockerfile b/docker/centos/binary/nova/nova-base/Dockerfile
similarity index 100%
rename from docker/centos/binary/nova-base/Dockerfile
rename to docker/centos/binary/nova/nova-base/Dockerfile
diff --git a/docker/centos/binary/nova-controller/nova-api/build b/docker/centos/binary/nova/nova-base/build
similarity index 100%
rename from docker/centos/binary/nova-controller/nova-api/build
rename to docker/centos/binary/nova/nova-base/build
diff --git a/docker/centos/binary/nova/nova-base/config-nova.sh b/docker/centos/binary/nova/nova-base/config-nova.sh
new file mode 120000
index 0000000000..c27bef6951
--- /dev/null
+++ b/docker/centos/binary/nova/nova-base/config-nova.sh
@@ -0,0 +1 @@
+../../../../common/nova/nova-base/config-nova.sh
\ No newline at end of file
diff --git a/docker/centos/binary/nova-compute/nova-compute-data/Dockerfile b/docker/centos/binary/nova/nova-compute-data/Dockerfile
similarity index 100%
rename from docker/centos/binary/nova-compute/nova-compute-data/Dockerfile
rename to docker/centos/binary/nova/nova-compute-data/Dockerfile
diff --git a/docker/centos/binary/nova-controller/nova-conductor/build b/docker/centos/binary/nova/nova-compute-data/build
similarity index 100%
rename from docker/centos/binary/nova-controller/nova-conductor/build
rename to docker/centos/binary/nova/nova-compute-data/build
diff --git a/docker/centos/binary/nova-compute/nova-compute/Dockerfile b/docker/centos/binary/nova/nova-compute/Dockerfile
similarity index 100%
rename from docker/centos/binary/nova-compute/nova-compute/Dockerfile
rename to docker/centos/binary/nova/nova-compute/Dockerfile
diff --git a/docker/centos/binary/nova-controller/nova-consoleauth/build b/docker/centos/binary/nova/nova-compute/build
similarity index 100%
rename from docker/centos/binary/nova-controller/nova-consoleauth/build
rename to docker/centos/binary/nova/nova-compute/build
diff --git a/docker/centos/binary/nova/nova-compute/config-external.sh b/docker/centos/binary/nova/nova-compute/config-external.sh
new file mode 120000
index 0000000000..bb13b939c7
--- /dev/null
+++ b/docker/centos/binary/nova/nova-compute/config-external.sh
@@ -0,0 +1 @@
+../../../../common/nova/nova-compute/config-external.sh
\ No newline at end of file
diff --git a/docker/centos/binary/nova/nova-compute/config-internal.sh b/docker/centos/binary/nova/nova-compute/config-internal.sh
new file mode 120000
index 0000000000..8d7449dc7c
--- /dev/null
+++ b/docker/centos/binary/nova/nova-compute/config-internal.sh
@@ -0,0 +1 @@
+../../../../common/nova/nova-compute/config-internal.sh
\ No newline at end of file
diff --git a/docker/centos/binary/nova/nova-compute/config-nova-compute.sh b/docker/centos/binary/nova/nova-compute/config-nova-compute.sh
new file mode 120000
index 0000000000..f003ee0fc6
--- /dev/null
+++ b/docker/centos/binary/nova/nova-compute/config-nova-compute.sh
@@ -0,0 +1 @@
+../../../../common/nova/nova-compute/config-nova-compute.sh
\ No newline at end of file
diff --git a/docker/centos/binary/nova/nova-compute/start.sh b/docker/centos/binary/nova/nova-compute/start.sh
new file mode 120000
index 0000000000..830400f9ed
--- /dev/null
+++ b/docker/centos/binary/nova/nova-compute/start.sh
@@ -0,0 +1 @@
+../../../../common/nova/nova-compute/start.sh
\ No newline at end of file
diff --git a/docker/centos/binary/nova-controller/nova-conductor/Dockerfile b/docker/centos/binary/nova/nova-conductor/Dockerfile
similarity index 100%
rename from docker/centos/binary/nova-controller/nova-conductor/Dockerfile
rename to docker/centos/binary/nova/nova-conductor/Dockerfile
diff --git a/docker/centos/binary/nova-controller/nova-novncproxy/build b/docker/centos/binary/nova/nova-conductor/build
similarity index 100%
rename from docker/centos/binary/nova-controller/nova-novncproxy/build
rename to docker/centos/binary/nova/nova-conductor/build
diff --git a/docker/centos/binary/nova/nova-conductor/config-external.sh b/docker/centos/binary/nova/nova-conductor/config-external.sh
new file mode 120000
index 0000000000..d98f3a8751
--- /dev/null
+++ b/docker/centos/binary/nova/nova-conductor/config-external.sh
@@ -0,0 +1 @@
+../../../../common/nova/nova-conductor/config-external.sh
\ No newline at end of file
diff --git a/docker/centos/binary/nova/nova-conductor/config-internal.sh b/docker/centos/binary/nova/nova-conductor/config-internal.sh
new file mode 120000
index 0000000000..f0ba788568
--- /dev/null
+++ b/docker/centos/binary/nova/nova-conductor/config-internal.sh
@@ -0,0 +1 @@
+../../../../common/nova/nova-conductor/config-internal.sh
\ No newline at end of file
diff --git a/docker/centos/binary/nova/nova-conductor/start.sh b/docker/centos/binary/nova/nova-conductor/start.sh
new file mode 120000
index 0000000000..0eb07db610
--- /dev/null
+++ b/docker/centos/binary/nova/nova-conductor/start.sh
@@ -0,0 +1 @@
+../../../../common/nova/nova-conductor/start.sh
\ No newline at end of file
diff --git a/docker/centos/binary/nova-controller/nova-consoleauth/Dockerfile b/docker/centos/binary/nova/nova-consoleauth/Dockerfile
similarity index 100%
rename from docker/centos/binary/nova-controller/nova-consoleauth/Dockerfile
rename to docker/centos/binary/nova/nova-consoleauth/Dockerfile
diff --git a/docker/centos/binary/nova-controller/nova-scheduler/build b/docker/centos/binary/nova/nova-consoleauth/build
similarity index 100%
rename from docker/centos/binary/nova-controller/nova-scheduler/build
rename to docker/centos/binary/nova/nova-consoleauth/build
diff --git a/docker/centos/binary/nova/nova-consoleauth/config-external.sh b/docker/centos/binary/nova/nova-consoleauth/config-external.sh
new file mode 120000
index 0000000000..b9d5734708
--- /dev/null
+++ b/docker/centos/binary/nova/nova-consoleauth/config-external.sh
@@ -0,0 +1 @@
+../../../../common/nova/nova-consoleauth/config-external.sh
\ No newline at end of file
diff --git a/docker/centos/binary/nova/nova-consoleauth/config-internal.sh b/docker/centos/binary/nova/nova-consoleauth/config-internal.sh
new file mode 120000
index 0000000000..d166c70128
--- /dev/null
+++ b/docker/centos/binary/nova/nova-consoleauth/config-internal.sh
@@ -0,0 +1 @@
+../../../../common/nova/nova-consoleauth/config-internal.sh
\ No newline at end of file
diff --git a/docker/centos/binary/nova/nova-consoleauth/start.sh b/docker/centos/binary/nova/nova-consoleauth/start.sh
new file mode 120000
index 0000000000..658be8e2a0
--- /dev/null
+++ b/docker/centos/binary/nova/nova-consoleauth/start.sh
@@ -0,0 +1 @@
+../../../../common/nova/nova-consoleauth/start.sh
\ No newline at end of file
diff --git a/docker/centos/binary/nova-compute/nova-libvirt/Dockerfile b/docker/centos/binary/nova/nova-libvirt/Dockerfile
similarity index 100%
rename from docker/centos/binary/nova-compute/nova-libvirt/Dockerfile
rename to docker/centos/binary/nova/nova-libvirt/Dockerfile
diff --git a/docker/centos/binary/nova/nova-libvirt/build b/docker/centos/binary/nova/nova-libvirt/build
new file mode 120000
index 0000000000..ec19138031
--- /dev/null
+++ b/docker/centos/binary/nova/nova-libvirt/build
@@ -0,0 +1 @@
+../../../../../tools/build-docker-image
\ No newline at end of file
diff --git a/docker/centos/binary/nova/nova-libvirt/config-external.sh b/docker/centos/binary/nova/nova-libvirt/config-external.sh
new file mode 120000
index 0000000000..e16a4f542d
--- /dev/null
+++ b/docker/centos/binary/nova/nova-libvirt/config-external.sh
@@ -0,0 +1 @@
+../../../../common/nova/nova-libvirt/config-external.sh
\ No newline at end of file
diff --git a/docker/centos/binary/nova/nova-libvirt/config-internal.sh b/docker/centos/binary/nova/nova-libvirt/config-internal.sh
new file mode 120000
index 0000000000..fbf3f4c4e9
--- /dev/null
+++ b/docker/centos/binary/nova/nova-libvirt/config-internal.sh
@@ -0,0 +1 @@
+../../../../common/nova/nova-libvirt/config-internal.sh
\ No newline at end of file
diff --git a/docker/centos/binary/nova/nova-libvirt/start.sh b/docker/centos/binary/nova/nova-libvirt/start.sh
new file mode 120000
index 0000000000..63ca58e26a
--- /dev/null
+++ b/docker/centos/binary/nova/nova-libvirt/start.sh
@@ -0,0 +1 @@
+../../../../common/nova/nova-libvirt/start.sh
\ No newline at end of file
diff --git a/docker/centos/binary/nova-compute/nova-network/Dockerfile b/docker/centos/binary/nova/nova-network/Dockerfile
similarity index 100%
rename from docker/centos/binary/nova-compute/nova-network/Dockerfile
rename to docker/centos/binary/nova/nova-network/Dockerfile
diff --git a/docker/centos/binary/nova/nova-network/build b/docker/centos/binary/nova/nova-network/build
new file mode 120000
index 0000000000..ec19138031
--- /dev/null
+++ b/docker/centos/binary/nova/nova-network/build
@@ -0,0 +1 @@
+../../../../../tools/build-docker-image
\ No newline at end of file
diff --git a/docker/centos/binary/nova/nova-network/config-external.sh b/docker/centos/binary/nova/nova-network/config-external.sh
new file mode 120000
index 0000000000..086eac04ec
--- /dev/null
+++ b/docker/centos/binary/nova/nova-network/config-external.sh
@@ -0,0 +1 @@
+../../../../common/nova/nova-network/config-external.sh
\ No newline at end of file
diff --git a/docker/centos/binary/nova/nova-network/config-internal.sh b/docker/centos/binary/nova/nova-network/config-internal.sh
new file mode 120000
index 0000000000..b7112e39d4
--- /dev/null
+++ b/docker/centos/binary/nova/nova-network/config-internal.sh
@@ -0,0 +1 @@
+../../../../common/nova/nova-network/config-internal.sh
\ No newline at end of file
diff --git a/docker/centos/binary/nova/nova-network/config-nova-network.sh b/docker/centos/binary/nova/nova-network/config-nova-network.sh
new file mode 120000
index 0000000000..0908005d29
--- /dev/null
+++ b/docker/centos/binary/nova/nova-network/config-nova-network.sh
@@ -0,0 +1 @@
+../../../../common/nova/nova-network/config-nova-network.sh
\ No newline at end of file
diff --git a/docker/centos/binary/nova/nova-network/start.sh b/docker/centos/binary/nova/nova-network/start.sh
new file mode 120000
index 0000000000..89c974d808
--- /dev/null
+++ b/docker/centos/binary/nova/nova-network/start.sh
@@ -0,0 +1 @@
+../../../../common/nova/nova-network/start.sh
\ No newline at end of file
diff --git a/docker/centos/binary/nova-controller/nova-novncproxy/Dockerfile b/docker/centos/binary/nova/nova-novncproxy/Dockerfile
similarity index 100%
rename from docker/centos/binary/nova-controller/nova-novncproxy/Dockerfile
rename to docker/centos/binary/nova/nova-novncproxy/Dockerfile
diff --git a/docker/centos/binary/nova/nova-novncproxy/build b/docker/centos/binary/nova/nova-novncproxy/build
new file mode 120000
index 0000000000..ec19138031
--- /dev/null
+++ b/docker/centos/binary/nova/nova-novncproxy/build
@@ -0,0 +1 @@
+../../../../../tools/build-docker-image
\ No newline at end of file
diff --git a/docker/centos/binary/nova/nova-novncproxy/config-external.sh b/docker/centos/binary/nova/nova-novncproxy/config-external.sh
new file mode 120000
index 0000000000..8d2a918105
--- /dev/null
+++ b/docker/centos/binary/nova/nova-novncproxy/config-external.sh
@@ -0,0 +1 @@
+../../../../common/nova/nova-novncproxy/config-external.sh
\ No newline at end of file
diff --git a/docker/centos/binary/nova/nova-novncproxy/config-internal.sh b/docker/centos/binary/nova/nova-novncproxy/config-internal.sh
new file mode 120000
index 0000000000..d6e4e45ec3
--- /dev/null
+++ b/docker/centos/binary/nova/nova-novncproxy/config-internal.sh
@@ -0,0 +1 @@
+../../../../common/nova/nova-novncproxy/config-internal.sh
\ No newline at end of file
diff --git a/docker/centos/binary/nova/nova-novncproxy/start.sh b/docker/centos/binary/nova/nova-novncproxy/start.sh
new file mode 120000
index 0000000000..b57c6a3189
--- /dev/null
+++ b/docker/centos/binary/nova/nova-novncproxy/start.sh
@@ -0,0 +1 @@
+../../../../common/nova/nova-novncproxy/start.sh
\ No newline at end of file
diff --git a/docker/centos/binary/nova-controller/nova-scheduler/Dockerfile b/docker/centos/binary/nova/nova-scheduler/Dockerfile
similarity index 100%
rename from docker/centos/binary/nova-controller/nova-scheduler/Dockerfile
rename to docker/centos/binary/nova/nova-scheduler/Dockerfile
diff --git a/docker/centos/binary/nova/nova-scheduler/build b/docker/centos/binary/nova/nova-scheduler/build
new file mode 120000
index 0000000000..ec19138031
--- /dev/null
+++ b/docker/centos/binary/nova/nova-scheduler/build
@@ -0,0 +1 @@
+../../../../../tools/build-docker-image
\ No newline at end of file
diff --git a/docker/centos/binary/nova/nova-scheduler/config-external.sh b/docker/centos/binary/nova/nova-scheduler/config-external.sh
new file mode 120000
index 0000000000..ef9c60c294
--- /dev/null
+++ b/docker/centos/binary/nova/nova-scheduler/config-external.sh
@@ -0,0 +1 @@
+../../../../common/nova/nova-scheduler/config-external.sh
\ No newline at end of file
diff --git a/docker/centos/binary/nova/nova-scheduler/config-internal.sh b/docker/centos/binary/nova/nova-scheduler/config-internal.sh
new file mode 120000
index 0000000000..1752f44a78
--- /dev/null
+++ b/docker/centos/binary/nova/nova-scheduler/config-internal.sh
@@ -0,0 +1 @@
+../../../../common/nova/nova-scheduler/config-internal.sh
\ No newline at end of file
diff --git a/docker/centos/binary/nova/nova-scheduler/start.sh b/docker/centos/binary/nova/nova-scheduler/start.sh
new file mode 120000
index 0000000000..b73e07a6a7
--- /dev/null
+++ b/docker/centos/binary/nova/nova-scheduler/start.sh
@@ -0,0 +1 @@
+../../../../common/nova/nova-scheduler/start.sh
\ No newline at end of file
diff --git a/docker/common/nova-controller/nova-api/check.sh b/docker/common/nova/nova-api/check.sh
similarity index 100%
rename from docker/common/nova-controller/nova-api/check.sh
rename to docker/common/nova/nova-api/check.sh
diff --git a/docker/common/nova-controller/nova-api/config-external.sh b/docker/common/nova/nova-api/config-external.sh
similarity index 100%
rename from docker/common/nova-controller/nova-api/config-external.sh
rename to docker/common/nova/nova-api/config-external.sh
diff --git a/docker/common/nova-controller/nova-api/config-internal.sh b/docker/common/nova/nova-api/config-internal.sh
similarity index 100%
rename from docker/common/nova-controller/nova-api/config-internal.sh
rename to docker/common/nova/nova-api/config-internal.sh
diff --git a/docker/common/nova-controller/nova-api/start.sh b/docker/common/nova/nova-api/start.sh
similarity index 100%
rename from docker/common/nova-controller/nova-api/start.sh
rename to docker/common/nova/nova-api/start.sh
diff --git a/docker/common/nova-base/config-nova.sh b/docker/common/nova/nova-base/config-nova.sh
similarity index 100%
rename from docker/common/nova-base/config-nova.sh
rename to docker/common/nova/nova-base/config-nova.sh
diff --git a/docker/common/nova-compute/nova-compute/config-external.sh b/docker/common/nova/nova-compute/config-external.sh
similarity index 100%
rename from docker/common/nova-compute/nova-compute/config-external.sh
rename to docker/common/nova/nova-compute/config-external.sh
diff --git a/docker/common/nova-compute/nova-compute/config-internal.sh b/docker/common/nova/nova-compute/config-internal.sh
similarity index 100%
rename from docker/common/nova-compute/nova-compute/config-internal.sh
rename to docker/common/nova/nova-compute/config-internal.sh
diff --git a/docker/common/nova-compute/nova-compute/config-nova-compute.sh b/docker/common/nova/nova-compute/config-nova-compute.sh
similarity index 100%
rename from docker/common/nova-compute/nova-compute/config-nova-compute.sh
rename to docker/common/nova/nova-compute/config-nova-compute.sh
diff --git a/docker/common/nova-compute/nova-compute/start.sh b/docker/common/nova/nova-compute/start.sh
similarity index 100%
rename from docker/common/nova-compute/nova-compute/start.sh
rename to docker/common/nova/nova-compute/start.sh
diff --git a/docker/common/nova-controller/nova-conductor/config-external.sh b/docker/common/nova/nova-conductor/config-external.sh
similarity index 100%
rename from docker/common/nova-controller/nova-conductor/config-external.sh
rename to docker/common/nova/nova-conductor/config-external.sh
diff --git a/docker/common/nova-controller/nova-conductor/config-internal.sh b/docker/common/nova/nova-conductor/config-internal.sh
similarity index 100%
rename from docker/common/nova-controller/nova-conductor/config-internal.sh
rename to docker/common/nova/nova-conductor/config-internal.sh
diff --git a/docker/common/nova-controller/nova-conductor/start.sh b/docker/common/nova/nova-conductor/start.sh
similarity index 100%
rename from docker/common/nova-controller/nova-conductor/start.sh
rename to docker/common/nova/nova-conductor/start.sh
diff --git a/docker/common/nova-controller/nova-consoleauth/config-external.sh b/docker/common/nova/nova-consoleauth/config-external.sh
similarity index 100%
rename from docker/common/nova-controller/nova-consoleauth/config-external.sh
rename to docker/common/nova/nova-consoleauth/config-external.sh
diff --git a/docker/common/nova-controller/nova-consoleauth/config-internal.sh b/docker/common/nova/nova-consoleauth/config-internal.sh
similarity index 100%
rename from docker/common/nova-controller/nova-consoleauth/config-internal.sh
rename to docker/common/nova/nova-consoleauth/config-internal.sh
diff --git a/docker/common/nova-controller/nova-consoleauth/start.sh b/docker/common/nova/nova-consoleauth/start.sh
similarity index 100%
rename from docker/common/nova-controller/nova-consoleauth/start.sh
rename to docker/common/nova/nova-consoleauth/start.sh
diff --git a/docker/common/nova-compute/nova-libvirt/config-external.sh b/docker/common/nova/nova-libvirt/config-external.sh
similarity index 100%
rename from docker/common/nova-compute/nova-libvirt/config-external.sh
rename to docker/common/nova/nova-libvirt/config-external.sh
diff --git a/docker/common/nova-compute/nova-libvirt/config-internal.sh b/docker/common/nova/nova-libvirt/config-internal.sh
similarity index 100%
rename from docker/common/nova-compute/nova-libvirt/config-internal.sh
rename to docker/common/nova/nova-libvirt/config-internal.sh
diff --git a/docker/common/nova-compute/nova-libvirt/start.sh b/docker/common/nova/nova-libvirt/start.sh
similarity index 100%
rename from docker/common/nova-compute/nova-libvirt/start.sh
rename to docker/common/nova/nova-libvirt/start.sh
diff --git a/docker/common/nova-compute/nova-network/config-external.sh b/docker/common/nova/nova-network/config-external.sh
similarity index 100%
rename from docker/common/nova-compute/nova-network/config-external.sh
rename to docker/common/nova/nova-network/config-external.sh
diff --git a/docker/common/nova-compute/nova-network/config-internal.sh b/docker/common/nova/nova-network/config-internal.sh
similarity index 100%
rename from docker/common/nova-compute/nova-network/config-internal.sh
rename to docker/common/nova/nova-network/config-internal.sh
diff --git a/docker/common/nova-compute/nova-network/config-nova-network.sh b/docker/common/nova/nova-network/config-nova-network.sh
similarity index 100%
rename from docker/common/nova-compute/nova-network/config-nova-network.sh
rename to docker/common/nova/nova-network/config-nova-network.sh
diff --git a/docker/common/nova-compute/nova-network/start.sh b/docker/common/nova/nova-network/start.sh
similarity index 100%
rename from docker/common/nova-compute/nova-network/start.sh
rename to docker/common/nova/nova-network/start.sh
diff --git a/docker/common/nova-controller/nova-novncproxy/config-external.sh b/docker/common/nova/nova-novncproxy/config-external.sh
similarity index 100%
rename from docker/common/nova-controller/nova-novncproxy/config-external.sh
rename to docker/common/nova/nova-novncproxy/config-external.sh
diff --git a/docker/common/nova-controller/nova-novncproxy/config-internal.sh b/docker/common/nova/nova-novncproxy/config-internal.sh
similarity index 100%
rename from docker/common/nova-controller/nova-novncproxy/config-internal.sh
rename to docker/common/nova/nova-novncproxy/config-internal.sh
diff --git a/docker/common/nova-controller/nova-novncproxy/start.sh b/docker/common/nova/nova-novncproxy/start.sh
similarity index 100%
rename from docker/common/nova-controller/nova-novncproxy/start.sh
rename to docker/common/nova/nova-novncproxy/start.sh
diff --git a/docker/common/nova-controller/nova-scheduler/config-external.sh b/docker/common/nova/nova-scheduler/config-external.sh
similarity index 100%
rename from docker/common/nova-controller/nova-scheduler/config-external.sh
rename to docker/common/nova/nova-scheduler/config-external.sh
diff --git a/docker/common/nova-controller/nova-scheduler/config-internal.sh b/docker/common/nova/nova-scheduler/config-internal.sh
similarity index 100%
rename from docker/common/nova-controller/nova-scheduler/config-internal.sh
rename to docker/common/nova/nova-scheduler/config-internal.sh
diff --git a/docker/common/nova-controller/nova-scheduler/start.sh b/docker/common/nova/nova-scheduler/start.sh
similarity index 100%
rename from docker/common/nova-controller/nova-scheduler/start.sh
rename to docker/common/nova/nova-scheduler/start.sh
diff --git a/docker/fedora/binary/cinder-data b/docker/fedora/binary/cinder-data
deleted file mode 120000
index de2a67c210..0000000000
--- a/docker/fedora/binary/cinder-data
+++ /dev/null
@@ -1 +0,0 @@
-../../centos/binary/cinder-data
\ No newline at end of file
diff --git a/docker/fedora/binary/mariadb b/docker/fedora/binary/mariadb
new file mode 120000
index 0000000000..98bd30c5d9
--- /dev/null
+++ b/docker/fedora/binary/mariadb
@@ -0,0 +1 @@
+../../centos/binary/mariadb
\ No newline at end of file
diff --git a/docker/fedora/binary/mariadb-app b/docker/fedora/binary/mariadb-app
deleted file mode 120000
index 017d6c2121..0000000000
--- a/docker/fedora/binary/mariadb-app
+++ /dev/null
@@ -1 +0,0 @@
-../../centos/binary/mariadb-app
\ No newline at end of file
diff --git a/docker/fedora/binary/mariadb-data b/docker/fedora/binary/mariadb-data
deleted file mode 120000
index 095a5e84f1..0000000000
--- a/docker/fedora/binary/mariadb-data
+++ /dev/null
@@ -1 +0,0 @@
-../../centos/binary/mariadb-data
\ No newline at end of file
diff --git a/docker/fedora/binary/nova b/docker/fedora/binary/nova
new file mode 120000
index 0000000000..f1f2d05a30
--- /dev/null
+++ b/docker/fedora/binary/nova
@@ -0,0 +1 @@
+../../centos/binary/nova
\ No newline at end of file
diff --git a/docker/fedora/binary/nova-base b/docker/fedora/binary/nova-base
deleted file mode 120000
index 7600927f2b..0000000000
--- a/docker/fedora/binary/nova-base
+++ /dev/null
@@ -1 +0,0 @@
-../../centos/binary/nova-base
\ No newline at end of file
diff --git a/docker/fedora/binary/nova-compute b/docker/fedora/binary/nova-compute
deleted file mode 120000
index ab70e1c1be..0000000000
--- a/docker/fedora/binary/nova-compute
+++ /dev/null
@@ -1 +0,0 @@
-../../centos/binary/nova-compute
\ No newline at end of file
diff --git a/docker/fedora/binary/nova-controller b/docker/fedora/binary/nova-controller
deleted file mode 120000
index d4e6ba4ef3..0000000000
--- a/docker/fedora/binary/nova-controller
+++ /dev/null
@@ -1 +0,0 @@
-../../centos/binary/nova-controller
\ No newline at end of file
diff --git a/docker/rhel/binary/cinder-data b/docker/rhel/binary/cinder-data
deleted file mode 120000
index de2a67c210..0000000000
--- a/docker/rhel/binary/cinder-data
+++ /dev/null
@@ -1 +0,0 @@
-../../centos/binary/cinder-data
\ No newline at end of file
diff --git a/docker/rhel/binary/mariadb b/docker/rhel/binary/mariadb
new file mode 120000
index 0000000000..98bd30c5d9
--- /dev/null
+++ b/docker/rhel/binary/mariadb
@@ -0,0 +1 @@
+../../centos/binary/mariadb
\ No newline at end of file
diff --git a/docker/rhel/binary/mariadb-app b/docker/rhel/binary/mariadb-app
deleted file mode 120000
index 017d6c2121..0000000000
--- a/docker/rhel/binary/mariadb-app
+++ /dev/null
@@ -1 +0,0 @@
-../../centos/binary/mariadb-app
\ No newline at end of file
diff --git a/docker/rhel/binary/mariadb-data b/docker/rhel/binary/mariadb-data
deleted file mode 120000
index 095a5e84f1..0000000000
--- a/docker/rhel/binary/mariadb-data
+++ /dev/null
@@ -1 +0,0 @@
-../../centos/binary/mariadb-data
\ No newline at end of file
diff --git a/docker/rhel/binary/nova b/docker/rhel/binary/nova
new file mode 120000
index 0000000000..f1f2d05a30
--- /dev/null
+++ b/docker/rhel/binary/nova
@@ -0,0 +1 @@
+../../centos/binary/nova
\ No newline at end of file
diff --git a/docker/rhel/binary/nova-base b/docker/rhel/binary/nova-base
deleted file mode 120000
index 7600927f2b..0000000000
--- a/docker/rhel/binary/nova-base
+++ /dev/null
@@ -1 +0,0 @@
-../../centos/binary/nova-base
\ No newline at end of file
diff --git a/docker/rhel/binary/nova-compute b/docker/rhel/binary/nova-compute
deleted file mode 120000
index ab70e1c1be..0000000000
--- a/docker/rhel/binary/nova-compute
+++ /dev/null
@@ -1 +0,0 @@
-../../centos/binary/nova-compute
\ No newline at end of file
diff --git a/docker/rhel/binary/nova-controller b/docker/rhel/binary/nova-controller
deleted file mode 120000
index d4e6ba4ef3..0000000000
--- a/docker/rhel/binary/nova-controller
+++ /dev/null
@@ -1 +0,0 @@
-../../centos/binary/nova-controller
\ No newline at end of file
diff --git a/docker/ubuntu/binary/nova-base/config-nova.sh b/docker/ubuntu/binary/nova-base/config-nova.sh
index 32efe60563..8f6b1ee427 120000
--- a/docker/ubuntu/binary/nova-base/config-nova.sh
+++ b/docker/ubuntu/binary/nova-base/config-nova.sh
@@ -1 +1 @@
-../../../common/nova-base/config-nova.sh
\ No newline at end of file
+../../../common/nova/nova-base/config-nova.sh
\ No newline at end of file
diff --git a/docs/minimal-environment-vars.md b/docs/minimal-environment-vars.md
index 8e11781a3a..29699d3f52 100644
--- a/docs/minimal-environment-vars.md
+++ b/docs/minimal-environment-vars.md
@@ -395,6 +395,18 @@ In order for each service to function, there is a minimum set of required variab
     NOVA_KEYSTONE_USER
     PUBLIC_IP
 
+# Nova-api
+
+    ADMIN_TENANT_NAME
+    KEYSTONE_ADMIN_SERVICE_HOST
+    KEYSTONE_ADMIN_TOKEN
+    NOVA_API_SERVICE_HOST
+    NOVA_DB_NAME
+    NOVA_EC2_API_SERVICE_HOST
+    NOVA_KEYSTONE_PASSWORD
+    NOVA_KEYSTONE_USER
+    PUBLIC_IP
+
 # Nova-base
 
     DEBUG_LOGGING
@@ -414,26 +426,6 @@ In order for each service to function, there is a minimum set of required variab
     NOVA_NOVNC_PROXY_PORT
     NOVA_VNCSERVER_PROXYCLIENT_ADDRESS
 
-# Nova-libvirt
-
-    None
-
-# Nova-network
-
-    None
-
-# Nova-api
-
-    ADMIN_TENANT_NAME
-    KEYSTONE_ADMIN_SERVICE_HOST
-    KEYSTONE_ADMIN_TOKEN
-    NOVA_API_SERVICE_HOST
-    NOVA_DB_NAME
-    NOVA_EC2_API_SERVICE_HOST
-    NOVA_KEYSTONE_PASSWORD
-    NOVA_KEYSTONE_USER
-    PUBLIC_IP
-
 # Nova-conductor
 
     INIT_NOVA_DB
@@ -445,6 +437,14 @@ In order for each service to function, there is a minimum set of required variab
 
     None
 
+# Nova-libvirt
+
+    None
+
+# Nova-network
+
+    None
+
 # Nova-novncproxy
 
     NOVA_NOVNC_BASE_ADDRESS