diff --git a/config_samples/devstack/apache2/apache2.conf b/config_samples/devstack/host1/apache2/apache2.conf
similarity index 100%
rename from config_samples/devstack/apache2/apache2.conf
rename to config_samples/devstack/host1/apache2/apache2.conf
diff --git a/config_samples/devstack/apache2/conf.d/charset b/config_samples/devstack/host1/apache2/conf.d/charset
similarity index 100%
rename from config_samples/devstack/apache2/conf.d/charset
rename to config_samples/devstack/host1/apache2/conf.d/charset
diff --git a/config_samples/devstack/apache2/conf.d/javascript-common.conf b/config_samples/devstack/host1/apache2/conf.d/javascript-common.conf
similarity index 100%
rename from config_samples/devstack/apache2/conf.d/javascript-common.conf
rename to config_samples/devstack/host1/apache2/conf.d/javascript-common.conf
diff --git a/config_samples/devstack/apache2/conf.d/localized-error-pages b/config_samples/devstack/host1/apache2/conf.d/localized-error-pages
similarity index 100%
rename from config_samples/devstack/apache2/conf.d/localized-error-pages
rename to config_samples/devstack/host1/apache2/conf.d/localized-error-pages
diff --git a/config_samples/devstack/apache2/conf.d/other-vhosts-access-log b/config_samples/devstack/host1/apache2/conf.d/other-vhosts-access-log
similarity index 100%
rename from config_samples/devstack/apache2/conf.d/other-vhosts-access-log
rename to config_samples/devstack/host1/apache2/conf.d/other-vhosts-access-log
diff --git a/config_samples/devstack/apache2/conf.d/security b/config_samples/devstack/host1/apache2/conf.d/security
similarity index 100%
rename from config_samples/devstack/apache2/conf.d/security
rename to config_samples/devstack/host1/apache2/conf.d/security
diff --git a/config_samples/devstack/apache2/envvars b/config_samples/devstack/host1/apache2/envvars
similarity index 100%
rename from config_samples/devstack/apache2/envvars
rename to config_samples/devstack/host1/apache2/envvars
diff --git a/config_samples/devstack/apache2/httpd.conf b/config_samples/devstack/host1/apache2/httpd.conf
similarity index 100%
rename from config_samples/devstack/apache2/httpd.conf
rename to config_samples/devstack/host1/apache2/httpd.conf
diff --git a/config_samples/devstack/apache2/magic b/config_samples/devstack/host1/apache2/magic
similarity index 100%
rename from config_samples/devstack/apache2/magic
rename to config_samples/devstack/host1/apache2/magic
diff --git a/config_samples/devstack/apache2/mods-available/actions.conf b/config_samples/devstack/host1/apache2/mods-available/actions.conf
similarity index 100%
rename from config_samples/devstack/apache2/mods-available/actions.conf
rename to config_samples/devstack/host1/apache2/mods-available/actions.conf
diff --git a/config_samples/devstack/apache2/mods-available/actions.load b/config_samples/devstack/host1/apache2/mods-available/actions.load
similarity index 100%
rename from config_samples/devstack/apache2/mods-available/actions.load
rename to config_samples/devstack/host1/apache2/mods-available/actions.load
diff --git a/config_samples/devstack/apache2/mods-available/alias.conf b/config_samples/devstack/host1/apache2/mods-available/alias.conf
similarity index 100%
rename from config_samples/devstack/apache2/mods-available/alias.conf
rename to config_samples/devstack/host1/apache2/mods-available/alias.conf
diff --git a/config_samples/devstack/apache2/mods-available/alias.load b/config_samples/devstack/host1/apache2/mods-available/alias.load
similarity index 100%
rename from config_samples/devstack/apache2/mods-available/alias.load
rename to config_samples/devstack/host1/apache2/mods-available/alias.load
diff --git a/config_samples/devstack/apache2/mods-available/asis.load b/config_samples/devstack/host1/apache2/mods-available/asis.load
similarity index 100%
rename from config_samples/devstack/apache2/mods-available/asis.load
rename to config_samples/devstack/host1/apache2/mods-available/asis.load
diff --git a/config_samples/devstack/apache2/mods-available/auth_basic.load b/config_samples/devstack/host1/apache2/mods-available/auth_basic.load
similarity index 100%
rename from config_samples/devstack/apache2/mods-available/auth_basic.load
rename to config_samples/devstack/host1/apache2/mods-available/auth_basic.load
diff --git a/config_samples/devstack/apache2/mods-available/auth_digest.load b/config_samples/devstack/host1/apache2/mods-available/auth_digest.load
similarity index 100%
rename from config_samples/devstack/apache2/mods-available/auth_digest.load
rename to config_samples/devstack/host1/apache2/mods-available/auth_digest.load
diff --git a/config_samples/devstack/apache2/mods-available/authn_alias.load b/config_samples/devstack/host1/apache2/mods-available/authn_alias.load
similarity index 100%
rename from config_samples/devstack/apache2/mods-available/authn_alias.load
rename to config_samples/devstack/host1/apache2/mods-available/authn_alias.load
diff --git a/config_samples/devstack/apache2/mods-available/authn_anon.load b/config_samples/devstack/host1/apache2/mods-available/authn_anon.load
similarity index 100%
rename from config_samples/devstack/apache2/mods-available/authn_anon.load
rename to config_samples/devstack/host1/apache2/mods-available/authn_anon.load
diff --git a/config_samples/devstack/apache2/mods-available/authn_dbd.load b/config_samples/devstack/host1/apache2/mods-available/authn_dbd.load
similarity index 100%
rename from config_samples/devstack/apache2/mods-available/authn_dbd.load
rename to config_samples/devstack/host1/apache2/mods-available/authn_dbd.load
diff --git a/config_samples/devstack/apache2/mods-available/authn_dbm.load b/config_samples/devstack/host1/apache2/mods-available/authn_dbm.load
similarity index 100%
rename from config_samples/devstack/apache2/mods-available/authn_dbm.load
rename to config_samples/devstack/host1/apache2/mods-available/authn_dbm.load
diff --git a/config_samples/devstack/apache2/mods-available/authn_default.load b/config_samples/devstack/host1/apache2/mods-available/authn_default.load
similarity index 100%
rename from config_samples/devstack/apache2/mods-available/authn_default.load
rename to config_samples/devstack/host1/apache2/mods-available/authn_default.load
diff --git a/config_samples/devstack/apache2/mods-available/authn_file.load b/config_samples/devstack/host1/apache2/mods-available/authn_file.load
similarity index 100%
rename from config_samples/devstack/apache2/mods-available/authn_file.load
rename to config_samples/devstack/host1/apache2/mods-available/authn_file.load
diff --git a/config_samples/devstack/apache2/mods-available/authnz_ldap.load b/config_samples/devstack/host1/apache2/mods-available/authnz_ldap.load
similarity index 100%
rename from config_samples/devstack/apache2/mods-available/authnz_ldap.load
rename to config_samples/devstack/host1/apache2/mods-available/authnz_ldap.load
diff --git a/config_samples/devstack/apache2/mods-available/authz_dbm.load b/config_samples/devstack/host1/apache2/mods-available/authz_dbm.load
similarity index 100%
rename from config_samples/devstack/apache2/mods-available/authz_dbm.load
rename to config_samples/devstack/host1/apache2/mods-available/authz_dbm.load
diff --git a/config_samples/devstack/apache2/mods-available/authz_default.load b/config_samples/devstack/host1/apache2/mods-available/authz_default.load
similarity index 100%
rename from config_samples/devstack/apache2/mods-available/authz_default.load
rename to config_samples/devstack/host1/apache2/mods-available/authz_default.load
diff --git a/config_samples/devstack/apache2/mods-available/authz_groupfile.load b/config_samples/devstack/host1/apache2/mods-available/authz_groupfile.load
similarity index 100%
rename from config_samples/devstack/apache2/mods-available/authz_groupfile.load
rename to config_samples/devstack/host1/apache2/mods-available/authz_groupfile.load
diff --git a/config_samples/devstack/apache2/mods-available/authz_host.load b/config_samples/devstack/host1/apache2/mods-available/authz_host.load
similarity index 100%
rename from config_samples/devstack/apache2/mods-available/authz_host.load
rename to config_samples/devstack/host1/apache2/mods-available/authz_host.load
diff --git a/config_samples/devstack/apache2/mods-available/authz_owner.load b/config_samples/devstack/host1/apache2/mods-available/authz_owner.load
similarity index 100%
rename from config_samples/devstack/apache2/mods-available/authz_owner.load
rename to config_samples/devstack/host1/apache2/mods-available/authz_owner.load
diff --git a/config_samples/devstack/apache2/mods-available/authz_user.load b/config_samples/devstack/host1/apache2/mods-available/authz_user.load
similarity index 100%
rename from config_samples/devstack/apache2/mods-available/authz_user.load
rename to config_samples/devstack/host1/apache2/mods-available/authz_user.load
diff --git a/config_samples/devstack/apache2/mods-available/autoindex.conf b/config_samples/devstack/host1/apache2/mods-available/autoindex.conf
similarity index 100%
rename from config_samples/devstack/apache2/mods-available/autoindex.conf
rename to config_samples/devstack/host1/apache2/mods-available/autoindex.conf
diff --git a/config_samples/devstack/apache2/mods-available/autoindex.load b/config_samples/devstack/host1/apache2/mods-available/autoindex.load
similarity index 100%
rename from config_samples/devstack/apache2/mods-available/autoindex.load
rename to config_samples/devstack/host1/apache2/mods-available/autoindex.load
diff --git a/config_samples/devstack/apache2/mods-available/cache.load b/config_samples/devstack/host1/apache2/mods-available/cache.load
similarity index 100%
rename from config_samples/devstack/apache2/mods-available/cache.load
rename to config_samples/devstack/host1/apache2/mods-available/cache.load
diff --git a/config_samples/devstack/apache2/mods-available/cern_meta.load b/config_samples/devstack/host1/apache2/mods-available/cern_meta.load
similarity index 100%
rename from config_samples/devstack/apache2/mods-available/cern_meta.load
rename to config_samples/devstack/host1/apache2/mods-available/cern_meta.load
diff --git a/config_samples/devstack/apache2/mods-available/cgi.load b/config_samples/devstack/host1/apache2/mods-available/cgi.load
similarity index 100%
rename from config_samples/devstack/apache2/mods-available/cgi.load
rename to config_samples/devstack/host1/apache2/mods-available/cgi.load
diff --git a/config_samples/devstack/apache2/mods-available/cgid.conf b/config_samples/devstack/host1/apache2/mods-available/cgid.conf
similarity index 100%
rename from config_samples/devstack/apache2/mods-available/cgid.conf
rename to config_samples/devstack/host1/apache2/mods-available/cgid.conf
diff --git a/config_samples/devstack/apache2/mods-available/cgid.load b/config_samples/devstack/host1/apache2/mods-available/cgid.load
similarity index 100%
rename from config_samples/devstack/apache2/mods-available/cgid.load
rename to config_samples/devstack/host1/apache2/mods-available/cgid.load
diff --git a/config_samples/devstack/apache2/mods-available/charset_lite.load b/config_samples/devstack/host1/apache2/mods-available/charset_lite.load
similarity index 100%
rename from config_samples/devstack/apache2/mods-available/charset_lite.load
rename to config_samples/devstack/host1/apache2/mods-available/charset_lite.load
diff --git a/config_samples/devstack/apache2/mods-available/dav.load b/config_samples/devstack/host1/apache2/mods-available/dav.load
similarity index 100%
rename from config_samples/devstack/apache2/mods-available/dav.load
rename to config_samples/devstack/host1/apache2/mods-available/dav.load
diff --git a/config_samples/devstack/apache2/mods-available/dav_fs.conf b/config_samples/devstack/host1/apache2/mods-available/dav_fs.conf
similarity index 100%
rename from config_samples/devstack/apache2/mods-available/dav_fs.conf
rename to config_samples/devstack/host1/apache2/mods-available/dav_fs.conf
diff --git a/config_samples/devstack/apache2/mods-available/dav_fs.load b/config_samples/devstack/host1/apache2/mods-available/dav_fs.load
similarity index 100%
rename from config_samples/devstack/apache2/mods-available/dav_fs.load
rename to config_samples/devstack/host1/apache2/mods-available/dav_fs.load
diff --git a/config_samples/devstack/apache2/mods-available/dav_lock.load b/config_samples/devstack/host1/apache2/mods-available/dav_lock.load
similarity index 100%
rename from config_samples/devstack/apache2/mods-available/dav_lock.load
rename to config_samples/devstack/host1/apache2/mods-available/dav_lock.load
diff --git a/config_samples/devstack/apache2/mods-available/dbd.load b/config_samples/devstack/host1/apache2/mods-available/dbd.load
similarity index 100%
rename from config_samples/devstack/apache2/mods-available/dbd.load
rename to config_samples/devstack/host1/apache2/mods-available/dbd.load
diff --git a/config_samples/devstack/apache2/mods-available/deflate.conf b/config_samples/devstack/host1/apache2/mods-available/deflate.conf
similarity index 100%
rename from config_samples/devstack/apache2/mods-available/deflate.conf
rename to config_samples/devstack/host1/apache2/mods-available/deflate.conf
diff --git a/config_samples/devstack/apache2/mods-available/deflate.load b/config_samples/devstack/host1/apache2/mods-available/deflate.load
similarity index 100%
rename from config_samples/devstack/apache2/mods-available/deflate.load
rename to config_samples/devstack/host1/apache2/mods-available/deflate.load
diff --git a/config_samples/devstack/apache2/mods-available/dir.conf b/config_samples/devstack/host1/apache2/mods-available/dir.conf
similarity index 100%
rename from config_samples/devstack/apache2/mods-available/dir.conf
rename to config_samples/devstack/host1/apache2/mods-available/dir.conf
diff --git a/config_samples/devstack/apache2/mods-available/dir.load b/config_samples/devstack/host1/apache2/mods-available/dir.load
similarity index 100%
rename from config_samples/devstack/apache2/mods-available/dir.load
rename to config_samples/devstack/host1/apache2/mods-available/dir.load
diff --git a/config_samples/devstack/apache2/mods-available/disk_cache.conf b/config_samples/devstack/host1/apache2/mods-available/disk_cache.conf
similarity index 100%
rename from config_samples/devstack/apache2/mods-available/disk_cache.conf
rename to config_samples/devstack/host1/apache2/mods-available/disk_cache.conf
diff --git a/config_samples/devstack/apache2/mods-available/disk_cache.load b/config_samples/devstack/host1/apache2/mods-available/disk_cache.load
similarity index 100%
rename from config_samples/devstack/apache2/mods-available/disk_cache.load
rename to config_samples/devstack/host1/apache2/mods-available/disk_cache.load
diff --git a/config_samples/devstack/apache2/mods-available/dump_io.load b/config_samples/devstack/host1/apache2/mods-available/dump_io.load
similarity index 100%
rename from config_samples/devstack/apache2/mods-available/dump_io.load
rename to config_samples/devstack/host1/apache2/mods-available/dump_io.load
diff --git a/config_samples/devstack/apache2/mods-available/env.load b/config_samples/devstack/host1/apache2/mods-available/env.load
similarity index 100%
rename from config_samples/devstack/apache2/mods-available/env.load
rename to config_samples/devstack/host1/apache2/mods-available/env.load
diff --git a/config_samples/devstack/apache2/mods-available/expires.load b/config_samples/devstack/host1/apache2/mods-available/expires.load
similarity index 100%
rename from config_samples/devstack/apache2/mods-available/expires.load
rename to config_samples/devstack/host1/apache2/mods-available/expires.load
diff --git a/config_samples/devstack/apache2/mods-available/ext_filter.load b/config_samples/devstack/host1/apache2/mods-available/ext_filter.load
similarity index 100%
rename from config_samples/devstack/apache2/mods-available/ext_filter.load
rename to config_samples/devstack/host1/apache2/mods-available/ext_filter.load
diff --git a/config_samples/devstack/apache2/mods-available/file_cache.load b/config_samples/devstack/host1/apache2/mods-available/file_cache.load
similarity index 100%
rename from config_samples/devstack/apache2/mods-available/file_cache.load
rename to config_samples/devstack/host1/apache2/mods-available/file_cache.load
diff --git a/config_samples/devstack/apache2/mods-available/filter.load b/config_samples/devstack/host1/apache2/mods-available/filter.load
similarity index 100%
rename from config_samples/devstack/apache2/mods-available/filter.load
rename to config_samples/devstack/host1/apache2/mods-available/filter.load
diff --git a/config_samples/devstack/apache2/mods-available/headers.load b/config_samples/devstack/host1/apache2/mods-available/headers.load
similarity index 100%
rename from config_samples/devstack/apache2/mods-available/headers.load
rename to config_samples/devstack/host1/apache2/mods-available/headers.load
diff --git a/config_samples/devstack/apache2/mods-available/ident.load b/config_samples/devstack/host1/apache2/mods-available/ident.load
similarity index 100%
rename from config_samples/devstack/apache2/mods-available/ident.load
rename to config_samples/devstack/host1/apache2/mods-available/ident.load
diff --git a/config_samples/devstack/apache2/mods-available/imagemap.load b/config_samples/devstack/host1/apache2/mods-available/imagemap.load
similarity index 100%
rename from config_samples/devstack/apache2/mods-available/imagemap.load
rename to config_samples/devstack/host1/apache2/mods-available/imagemap.load
diff --git a/config_samples/devstack/apache2/mods-available/include.load b/config_samples/devstack/host1/apache2/mods-available/include.load
similarity index 100%
rename from config_samples/devstack/apache2/mods-available/include.load
rename to config_samples/devstack/host1/apache2/mods-available/include.load
diff --git a/config_samples/devstack/apache2/mods-available/info.conf b/config_samples/devstack/host1/apache2/mods-available/info.conf
similarity index 100%
rename from config_samples/devstack/apache2/mods-available/info.conf
rename to config_samples/devstack/host1/apache2/mods-available/info.conf
diff --git a/config_samples/devstack/apache2/mods-available/info.load b/config_samples/devstack/host1/apache2/mods-available/info.load
similarity index 100%
rename from config_samples/devstack/apache2/mods-available/info.load
rename to config_samples/devstack/host1/apache2/mods-available/info.load
diff --git a/config_samples/devstack/apache2/mods-available/ldap.conf b/config_samples/devstack/host1/apache2/mods-available/ldap.conf
similarity index 100%
rename from config_samples/devstack/apache2/mods-available/ldap.conf
rename to config_samples/devstack/host1/apache2/mods-available/ldap.conf
diff --git a/config_samples/devstack/apache2/mods-available/ldap.load b/config_samples/devstack/host1/apache2/mods-available/ldap.load
similarity index 100%
rename from config_samples/devstack/apache2/mods-available/ldap.load
rename to config_samples/devstack/host1/apache2/mods-available/ldap.load
diff --git a/config_samples/devstack/apache2/mods-available/log_forensic.load b/config_samples/devstack/host1/apache2/mods-available/log_forensic.load
similarity index 100%
rename from config_samples/devstack/apache2/mods-available/log_forensic.load
rename to config_samples/devstack/host1/apache2/mods-available/log_forensic.load
diff --git a/config_samples/devstack/apache2/mods-available/mem_cache.conf b/config_samples/devstack/host1/apache2/mods-available/mem_cache.conf
similarity index 100%
rename from config_samples/devstack/apache2/mods-available/mem_cache.conf
rename to config_samples/devstack/host1/apache2/mods-available/mem_cache.conf
diff --git a/config_samples/devstack/apache2/mods-available/mem_cache.load b/config_samples/devstack/host1/apache2/mods-available/mem_cache.load
similarity index 100%
rename from config_samples/devstack/apache2/mods-available/mem_cache.load
rename to config_samples/devstack/host1/apache2/mods-available/mem_cache.load
diff --git a/config_samples/devstack/apache2/mods-available/mime.conf b/config_samples/devstack/host1/apache2/mods-available/mime.conf
similarity index 100%
rename from config_samples/devstack/apache2/mods-available/mime.conf
rename to config_samples/devstack/host1/apache2/mods-available/mime.conf
diff --git a/config_samples/devstack/apache2/mods-available/mime.load b/config_samples/devstack/host1/apache2/mods-available/mime.load
similarity index 100%
rename from config_samples/devstack/apache2/mods-available/mime.load
rename to config_samples/devstack/host1/apache2/mods-available/mime.load
diff --git a/config_samples/devstack/apache2/mods-available/mime_magic.conf b/config_samples/devstack/host1/apache2/mods-available/mime_magic.conf
similarity index 100%
rename from config_samples/devstack/apache2/mods-available/mime_magic.conf
rename to config_samples/devstack/host1/apache2/mods-available/mime_magic.conf
diff --git a/config_samples/devstack/apache2/mods-available/mime_magic.load b/config_samples/devstack/host1/apache2/mods-available/mime_magic.load
similarity index 100%
rename from config_samples/devstack/apache2/mods-available/mime_magic.load
rename to config_samples/devstack/host1/apache2/mods-available/mime_magic.load
diff --git a/config_samples/devstack/apache2/mods-available/negotiation.conf b/config_samples/devstack/host1/apache2/mods-available/negotiation.conf
similarity index 100%
rename from config_samples/devstack/apache2/mods-available/negotiation.conf
rename to config_samples/devstack/host1/apache2/mods-available/negotiation.conf
diff --git a/config_samples/devstack/apache2/mods-available/negotiation.load b/config_samples/devstack/host1/apache2/mods-available/negotiation.load
similarity index 100%
rename from config_samples/devstack/apache2/mods-available/negotiation.load
rename to config_samples/devstack/host1/apache2/mods-available/negotiation.load
diff --git a/config_samples/devstack/apache2/mods-available/proxy.conf b/config_samples/devstack/host1/apache2/mods-available/proxy.conf
similarity index 100%
rename from config_samples/devstack/apache2/mods-available/proxy.conf
rename to config_samples/devstack/host1/apache2/mods-available/proxy.conf
diff --git a/config_samples/devstack/apache2/mods-available/proxy.load b/config_samples/devstack/host1/apache2/mods-available/proxy.load
similarity index 100%
rename from config_samples/devstack/apache2/mods-available/proxy.load
rename to config_samples/devstack/host1/apache2/mods-available/proxy.load
diff --git a/config_samples/devstack/apache2/mods-available/proxy_ajp.load b/config_samples/devstack/host1/apache2/mods-available/proxy_ajp.load
similarity index 100%
rename from config_samples/devstack/apache2/mods-available/proxy_ajp.load
rename to config_samples/devstack/host1/apache2/mods-available/proxy_ajp.load
diff --git a/config_samples/devstack/apache2/mods-available/proxy_balancer.conf b/config_samples/devstack/host1/apache2/mods-available/proxy_balancer.conf
similarity index 100%
rename from config_samples/devstack/apache2/mods-available/proxy_balancer.conf
rename to config_samples/devstack/host1/apache2/mods-available/proxy_balancer.conf
diff --git a/config_samples/devstack/apache2/mods-available/proxy_balancer.load b/config_samples/devstack/host1/apache2/mods-available/proxy_balancer.load
similarity index 100%
rename from config_samples/devstack/apache2/mods-available/proxy_balancer.load
rename to config_samples/devstack/host1/apache2/mods-available/proxy_balancer.load
diff --git a/config_samples/devstack/apache2/mods-available/proxy_connect.load b/config_samples/devstack/host1/apache2/mods-available/proxy_connect.load
similarity index 100%
rename from config_samples/devstack/apache2/mods-available/proxy_connect.load
rename to config_samples/devstack/host1/apache2/mods-available/proxy_connect.load
diff --git a/config_samples/devstack/apache2/mods-available/proxy_ftp.conf b/config_samples/devstack/host1/apache2/mods-available/proxy_ftp.conf
similarity index 100%
rename from config_samples/devstack/apache2/mods-available/proxy_ftp.conf
rename to config_samples/devstack/host1/apache2/mods-available/proxy_ftp.conf
diff --git a/config_samples/devstack/apache2/mods-available/proxy_ftp.load b/config_samples/devstack/host1/apache2/mods-available/proxy_ftp.load
similarity index 100%
rename from config_samples/devstack/apache2/mods-available/proxy_ftp.load
rename to config_samples/devstack/host1/apache2/mods-available/proxy_ftp.load
diff --git a/config_samples/devstack/apache2/mods-available/proxy_http.load b/config_samples/devstack/host1/apache2/mods-available/proxy_http.load
similarity index 100%
rename from config_samples/devstack/apache2/mods-available/proxy_http.load
rename to config_samples/devstack/host1/apache2/mods-available/proxy_http.load
diff --git a/config_samples/devstack/apache2/mods-available/proxy_scgi.load b/config_samples/devstack/host1/apache2/mods-available/proxy_scgi.load
similarity index 100%
rename from config_samples/devstack/apache2/mods-available/proxy_scgi.load
rename to config_samples/devstack/host1/apache2/mods-available/proxy_scgi.load
diff --git a/config_samples/devstack/apache2/mods-available/reqtimeout.conf b/config_samples/devstack/host1/apache2/mods-available/reqtimeout.conf
similarity index 100%
rename from config_samples/devstack/apache2/mods-available/reqtimeout.conf
rename to config_samples/devstack/host1/apache2/mods-available/reqtimeout.conf
diff --git a/config_samples/devstack/apache2/mods-available/reqtimeout.load b/config_samples/devstack/host1/apache2/mods-available/reqtimeout.load
similarity index 100%
rename from config_samples/devstack/apache2/mods-available/reqtimeout.load
rename to config_samples/devstack/host1/apache2/mods-available/reqtimeout.load
diff --git a/config_samples/devstack/apache2/mods-available/rewrite.load b/config_samples/devstack/host1/apache2/mods-available/rewrite.load
similarity index 100%
rename from config_samples/devstack/apache2/mods-available/rewrite.load
rename to config_samples/devstack/host1/apache2/mods-available/rewrite.load
diff --git a/config_samples/devstack/apache2/mods-available/setenvif.conf b/config_samples/devstack/host1/apache2/mods-available/setenvif.conf
similarity index 100%
rename from config_samples/devstack/apache2/mods-available/setenvif.conf
rename to config_samples/devstack/host1/apache2/mods-available/setenvif.conf
diff --git a/config_samples/devstack/apache2/mods-available/setenvif.load b/config_samples/devstack/host1/apache2/mods-available/setenvif.load
similarity index 100%
rename from config_samples/devstack/apache2/mods-available/setenvif.load
rename to config_samples/devstack/host1/apache2/mods-available/setenvif.load
diff --git a/config_samples/devstack/apache2/mods-available/speling.load b/config_samples/devstack/host1/apache2/mods-available/speling.load
similarity index 100%
rename from config_samples/devstack/apache2/mods-available/speling.load
rename to config_samples/devstack/host1/apache2/mods-available/speling.load
diff --git a/config_samples/devstack/apache2/mods-available/ssl.conf b/config_samples/devstack/host1/apache2/mods-available/ssl.conf
similarity index 100%
rename from config_samples/devstack/apache2/mods-available/ssl.conf
rename to config_samples/devstack/host1/apache2/mods-available/ssl.conf
diff --git a/config_samples/devstack/apache2/mods-available/ssl.load b/config_samples/devstack/host1/apache2/mods-available/ssl.load
similarity index 100%
rename from config_samples/devstack/apache2/mods-available/ssl.load
rename to config_samples/devstack/host1/apache2/mods-available/ssl.load
diff --git a/config_samples/devstack/apache2/mods-available/status.conf b/config_samples/devstack/host1/apache2/mods-available/status.conf
similarity index 100%
rename from config_samples/devstack/apache2/mods-available/status.conf
rename to config_samples/devstack/host1/apache2/mods-available/status.conf
diff --git a/config_samples/devstack/apache2/mods-available/status.load b/config_samples/devstack/host1/apache2/mods-available/status.load
similarity index 100%
rename from config_samples/devstack/apache2/mods-available/status.load
rename to config_samples/devstack/host1/apache2/mods-available/status.load
diff --git a/config_samples/devstack/apache2/mods-available/substitute.load b/config_samples/devstack/host1/apache2/mods-available/substitute.load
similarity index 100%
rename from config_samples/devstack/apache2/mods-available/substitute.load
rename to config_samples/devstack/host1/apache2/mods-available/substitute.load
diff --git a/config_samples/devstack/apache2/mods-available/suexec.load b/config_samples/devstack/host1/apache2/mods-available/suexec.load
similarity index 100%
rename from config_samples/devstack/apache2/mods-available/suexec.load
rename to config_samples/devstack/host1/apache2/mods-available/suexec.load
diff --git a/config_samples/devstack/apache2/mods-available/unique_id.load b/config_samples/devstack/host1/apache2/mods-available/unique_id.load
similarity index 100%
rename from config_samples/devstack/apache2/mods-available/unique_id.load
rename to config_samples/devstack/host1/apache2/mods-available/unique_id.load
diff --git a/config_samples/devstack/apache2/mods-available/userdir.conf b/config_samples/devstack/host1/apache2/mods-available/userdir.conf
similarity index 100%
rename from config_samples/devstack/apache2/mods-available/userdir.conf
rename to config_samples/devstack/host1/apache2/mods-available/userdir.conf
diff --git a/config_samples/devstack/apache2/mods-available/userdir.load b/config_samples/devstack/host1/apache2/mods-available/userdir.load
similarity index 100%
rename from config_samples/devstack/apache2/mods-available/userdir.load
rename to config_samples/devstack/host1/apache2/mods-available/userdir.load
diff --git a/config_samples/devstack/apache2/mods-available/usertrack.load b/config_samples/devstack/host1/apache2/mods-available/usertrack.load
similarity index 100%
rename from config_samples/devstack/apache2/mods-available/usertrack.load
rename to config_samples/devstack/host1/apache2/mods-available/usertrack.load
diff --git a/config_samples/devstack/apache2/mods-available/version.load b/config_samples/devstack/host1/apache2/mods-available/version.load
similarity index 100%
rename from config_samples/devstack/apache2/mods-available/version.load
rename to config_samples/devstack/host1/apache2/mods-available/version.load
diff --git a/config_samples/devstack/apache2/mods-available/vhost_alias.load b/config_samples/devstack/host1/apache2/mods-available/vhost_alias.load
similarity index 100%
rename from config_samples/devstack/apache2/mods-available/vhost_alias.load
rename to config_samples/devstack/host1/apache2/mods-available/vhost_alias.load
diff --git a/config_samples/devstack/apache2/mods-available/wsgi.conf b/config_samples/devstack/host1/apache2/mods-available/wsgi.conf
similarity index 100%
rename from config_samples/devstack/apache2/mods-available/wsgi.conf
rename to config_samples/devstack/host1/apache2/mods-available/wsgi.conf
diff --git a/config_samples/devstack/apache2/mods-available/wsgi.load b/config_samples/devstack/host1/apache2/mods-available/wsgi.load
similarity index 100%
rename from config_samples/devstack/apache2/mods-available/wsgi.load
rename to config_samples/devstack/host1/apache2/mods-available/wsgi.load
diff --git a/config_samples/devstack/apache2/mods-enabled/alias.conf b/config_samples/devstack/host1/apache2/mods-enabled/alias.conf
similarity index 100%
rename from config_samples/devstack/apache2/mods-enabled/alias.conf
rename to config_samples/devstack/host1/apache2/mods-enabled/alias.conf
diff --git a/config_samples/devstack/apache2/mods-enabled/alias.load b/config_samples/devstack/host1/apache2/mods-enabled/alias.load
similarity index 100%
rename from config_samples/devstack/apache2/mods-enabled/alias.load
rename to config_samples/devstack/host1/apache2/mods-enabled/alias.load
diff --git a/config_samples/devstack/apache2/mods-enabled/auth_basic.load b/config_samples/devstack/host1/apache2/mods-enabled/auth_basic.load
similarity index 100%
rename from config_samples/devstack/apache2/mods-enabled/auth_basic.load
rename to config_samples/devstack/host1/apache2/mods-enabled/auth_basic.load
diff --git a/config_samples/devstack/apache2/mods-enabled/authn_file.load b/config_samples/devstack/host1/apache2/mods-enabled/authn_file.load
similarity index 100%
rename from config_samples/devstack/apache2/mods-enabled/authn_file.load
rename to config_samples/devstack/host1/apache2/mods-enabled/authn_file.load
diff --git a/config_samples/devstack/apache2/mods-enabled/authz_default.load b/config_samples/devstack/host1/apache2/mods-enabled/authz_default.load
similarity index 100%
rename from config_samples/devstack/apache2/mods-enabled/authz_default.load
rename to config_samples/devstack/host1/apache2/mods-enabled/authz_default.load
diff --git a/config_samples/devstack/apache2/mods-enabled/authz_groupfile.load b/config_samples/devstack/host1/apache2/mods-enabled/authz_groupfile.load
similarity index 100%
rename from config_samples/devstack/apache2/mods-enabled/authz_groupfile.load
rename to config_samples/devstack/host1/apache2/mods-enabled/authz_groupfile.load
diff --git a/config_samples/devstack/apache2/mods-enabled/authz_host.load b/config_samples/devstack/host1/apache2/mods-enabled/authz_host.load
similarity index 100%
rename from config_samples/devstack/apache2/mods-enabled/authz_host.load
rename to config_samples/devstack/host1/apache2/mods-enabled/authz_host.load
diff --git a/config_samples/devstack/apache2/mods-enabled/authz_user.load b/config_samples/devstack/host1/apache2/mods-enabled/authz_user.load
similarity index 100%
rename from config_samples/devstack/apache2/mods-enabled/authz_user.load
rename to config_samples/devstack/host1/apache2/mods-enabled/authz_user.load
diff --git a/config_samples/devstack/apache2/mods-enabled/autoindex.conf b/config_samples/devstack/host1/apache2/mods-enabled/autoindex.conf
similarity index 100%
rename from config_samples/devstack/apache2/mods-enabled/autoindex.conf
rename to config_samples/devstack/host1/apache2/mods-enabled/autoindex.conf
diff --git a/config_samples/devstack/apache2/mods-enabled/autoindex.load b/config_samples/devstack/host1/apache2/mods-enabled/autoindex.load
similarity index 100%
rename from config_samples/devstack/apache2/mods-enabled/autoindex.load
rename to config_samples/devstack/host1/apache2/mods-enabled/autoindex.load
diff --git a/config_samples/devstack/apache2/mods-enabled/cgid.conf b/config_samples/devstack/host1/apache2/mods-enabled/cgid.conf
similarity index 100%
rename from config_samples/devstack/apache2/mods-enabled/cgid.conf
rename to config_samples/devstack/host1/apache2/mods-enabled/cgid.conf
diff --git a/config_samples/devstack/apache2/mods-enabled/cgid.load b/config_samples/devstack/host1/apache2/mods-enabled/cgid.load
similarity index 100%
rename from config_samples/devstack/apache2/mods-enabled/cgid.load
rename to config_samples/devstack/host1/apache2/mods-enabled/cgid.load
diff --git a/config_samples/devstack/apache2/mods-enabled/deflate.conf b/config_samples/devstack/host1/apache2/mods-enabled/deflate.conf
similarity index 100%
rename from config_samples/devstack/apache2/mods-enabled/deflate.conf
rename to config_samples/devstack/host1/apache2/mods-enabled/deflate.conf
diff --git a/config_samples/devstack/apache2/mods-enabled/deflate.load b/config_samples/devstack/host1/apache2/mods-enabled/deflate.load
similarity index 100%
rename from config_samples/devstack/apache2/mods-enabled/deflate.load
rename to config_samples/devstack/host1/apache2/mods-enabled/deflate.load
diff --git a/config_samples/devstack/apache2/mods-enabled/dir.conf b/config_samples/devstack/host1/apache2/mods-enabled/dir.conf
similarity index 100%
rename from config_samples/devstack/apache2/mods-enabled/dir.conf
rename to config_samples/devstack/host1/apache2/mods-enabled/dir.conf
diff --git a/config_samples/devstack/apache2/mods-enabled/dir.load b/config_samples/devstack/host1/apache2/mods-enabled/dir.load
similarity index 100%
rename from config_samples/devstack/apache2/mods-enabled/dir.load
rename to config_samples/devstack/host1/apache2/mods-enabled/dir.load
diff --git a/config_samples/devstack/apache2/mods-enabled/env.load b/config_samples/devstack/host1/apache2/mods-enabled/env.load
similarity index 100%
rename from config_samples/devstack/apache2/mods-enabled/env.load
rename to config_samples/devstack/host1/apache2/mods-enabled/env.load
diff --git a/config_samples/devstack/apache2/mods-enabled/mime.conf b/config_samples/devstack/host1/apache2/mods-enabled/mime.conf
similarity index 100%
rename from config_samples/devstack/apache2/mods-enabled/mime.conf
rename to config_samples/devstack/host1/apache2/mods-enabled/mime.conf
diff --git a/config_samples/devstack/apache2/mods-enabled/mime.load b/config_samples/devstack/host1/apache2/mods-enabled/mime.load
similarity index 100%
rename from config_samples/devstack/apache2/mods-enabled/mime.load
rename to config_samples/devstack/host1/apache2/mods-enabled/mime.load
diff --git a/config_samples/devstack/apache2/mods-enabled/negotiation.conf b/config_samples/devstack/host1/apache2/mods-enabled/negotiation.conf
similarity index 100%
rename from config_samples/devstack/apache2/mods-enabled/negotiation.conf
rename to config_samples/devstack/host1/apache2/mods-enabled/negotiation.conf
diff --git a/config_samples/devstack/apache2/mods-enabled/negotiation.load b/config_samples/devstack/host1/apache2/mods-enabled/negotiation.load
similarity index 100%
rename from config_samples/devstack/apache2/mods-enabled/negotiation.load
rename to config_samples/devstack/host1/apache2/mods-enabled/negotiation.load
diff --git a/config_samples/devstack/apache2/mods-enabled/reqtimeout.conf b/config_samples/devstack/host1/apache2/mods-enabled/reqtimeout.conf
similarity index 100%
rename from config_samples/devstack/apache2/mods-enabled/reqtimeout.conf
rename to config_samples/devstack/host1/apache2/mods-enabled/reqtimeout.conf
diff --git a/config_samples/devstack/apache2/mods-enabled/reqtimeout.load b/config_samples/devstack/host1/apache2/mods-enabled/reqtimeout.load
similarity index 100%
rename from config_samples/devstack/apache2/mods-enabled/reqtimeout.load
rename to config_samples/devstack/host1/apache2/mods-enabled/reqtimeout.load
diff --git a/config_samples/devstack/apache2/mods-enabled/setenvif.conf b/config_samples/devstack/host1/apache2/mods-enabled/setenvif.conf
similarity index 100%
rename from config_samples/devstack/apache2/mods-enabled/setenvif.conf
rename to config_samples/devstack/host1/apache2/mods-enabled/setenvif.conf
diff --git a/config_samples/devstack/apache2/mods-enabled/setenvif.load b/config_samples/devstack/host1/apache2/mods-enabled/setenvif.load
similarity index 100%
rename from config_samples/devstack/apache2/mods-enabled/setenvif.load
rename to config_samples/devstack/host1/apache2/mods-enabled/setenvif.load
diff --git a/config_samples/devstack/apache2/mods-enabled/status.conf b/config_samples/devstack/host1/apache2/mods-enabled/status.conf
similarity index 100%
rename from config_samples/devstack/apache2/mods-enabled/status.conf
rename to config_samples/devstack/host1/apache2/mods-enabled/status.conf
diff --git a/config_samples/devstack/apache2/mods-enabled/status.load b/config_samples/devstack/host1/apache2/mods-enabled/status.load
similarity index 100%
rename from config_samples/devstack/apache2/mods-enabled/status.load
rename to config_samples/devstack/host1/apache2/mods-enabled/status.load
diff --git a/config_samples/devstack/apache2/mods-enabled/wsgi.conf b/config_samples/devstack/host1/apache2/mods-enabled/wsgi.conf
similarity index 100%
rename from config_samples/devstack/apache2/mods-enabled/wsgi.conf
rename to config_samples/devstack/host1/apache2/mods-enabled/wsgi.conf
diff --git a/config_samples/devstack/apache2/mods-enabled/wsgi.load b/config_samples/devstack/host1/apache2/mods-enabled/wsgi.load
similarity index 100%
rename from config_samples/devstack/apache2/mods-enabled/wsgi.load
rename to config_samples/devstack/host1/apache2/mods-enabled/wsgi.load
diff --git a/config_samples/devstack/apache2/ports.conf b/config_samples/devstack/host1/apache2/ports.conf
similarity index 100%
rename from config_samples/devstack/apache2/ports.conf
rename to config_samples/devstack/host1/apache2/ports.conf
diff --git a/config_samples/devstack/apache2/sites-available/default b/config_samples/devstack/host1/apache2/sites-available/default
similarity index 100%
rename from config_samples/devstack/apache2/sites-available/default
rename to config_samples/devstack/host1/apache2/sites-available/default
diff --git a/config_samples/devstack/apache2/sites-available/default-ssl b/config_samples/devstack/host1/apache2/sites-available/default-ssl
similarity index 100%
rename from config_samples/devstack/apache2/sites-available/default-ssl
rename to config_samples/devstack/host1/apache2/sites-available/default-ssl
diff --git a/config_samples/devstack/apache2/sites-available/horizon b/config_samples/devstack/host1/apache2/sites-available/horizon
similarity index 100%
rename from config_samples/devstack/apache2/sites-available/horizon
rename to config_samples/devstack/host1/apache2/sites-available/horizon
diff --git a/config_samples/devstack/apache2/sites-enabled/horizon b/config_samples/devstack/host1/apache2/sites-enabled/horizon
similarity index 100%
rename from config_samples/devstack/apache2/sites-enabled/horizon
rename to config_samples/devstack/host1/apache2/sites-enabled/horizon
diff --git a/config_samples/devstack/cinder/api-paste.ini b/config_samples/devstack/host1/cinder/api-paste.ini
similarity index 100%
rename from config_samples/devstack/cinder/api-paste.ini
rename to config_samples/devstack/host1/cinder/api-paste.ini
diff --git a/config_samples/devstack/cinder/cinder.conf b/config_samples/devstack/host1/cinder/cinder.conf
similarity index 100%
rename from config_samples/devstack/cinder/cinder.conf
rename to config_samples/devstack/host1/cinder/cinder.conf
diff --git a/config_samples/devstack/cinder/policy.json b/config_samples/devstack/host1/cinder/policy.json
similarity index 100%
rename from config_samples/devstack/cinder/policy.json
rename to config_samples/devstack/host1/cinder/policy.json
diff --git a/config_samples/devstack/cinder/rootwrap.conf b/config_samples/devstack/host1/cinder/rootwrap.conf
similarity index 100%
rename from config_samples/devstack/cinder/rootwrap.conf
rename to config_samples/devstack/host1/cinder/rootwrap.conf
diff --git a/config_samples/devstack/cinder/rootwrap.d/volume.filters b/config_samples/devstack/host1/cinder/rootwrap.d/volume.filters
similarity index 100%
rename from config_samples/devstack/cinder/rootwrap.d/volume.filters
rename to config_samples/devstack/host1/cinder/rootwrap.d/volume.filters
diff --git a/config_samples/devstack/glance/glance-api-paste.ini b/config_samples/devstack/host1/glance/glance-api-paste.ini
similarity index 100%
rename from config_samples/devstack/glance/glance-api-paste.ini
rename to config_samples/devstack/host1/glance/glance-api-paste.ini
diff --git a/config_samples/devstack/glance/glance-api.conf b/config_samples/devstack/host1/glance/glance-api.conf
similarity index 100%
rename from config_samples/devstack/glance/glance-api.conf
rename to config_samples/devstack/host1/glance/glance-api.conf
diff --git a/config_samples/devstack/glance/glance-cache.conf b/config_samples/devstack/host1/glance/glance-cache.conf
similarity index 100%
rename from config_samples/devstack/glance/glance-cache.conf
rename to config_samples/devstack/host1/glance/glance-cache.conf
diff --git a/config_samples/devstack/glance/glance-registry-paste.ini b/config_samples/devstack/host1/glance/glance-registry-paste.ini
similarity index 100%
rename from config_samples/devstack/glance/glance-registry-paste.ini
rename to config_samples/devstack/host1/glance/glance-registry-paste.ini
diff --git a/config_samples/devstack/glance/glance-registry.conf b/config_samples/devstack/host1/glance/glance-registry.conf
similarity index 100%
rename from config_samples/devstack/glance/glance-registry.conf
rename to config_samples/devstack/host1/glance/glance-registry.conf
diff --git a/config_samples/devstack/glance/policy.json b/config_samples/devstack/host1/glance/policy.json
similarity index 100%
rename from config_samples/devstack/glance/policy.json
rename to config_samples/devstack/host1/glance/policy.json
diff --git a/config_samples/devstack/keystone/keystone.conf b/config_samples/devstack/host1/keystone/keystone.conf
similarity index 100%
rename from config_samples/devstack/keystone/keystone.conf
rename to config_samples/devstack/host1/keystone/keystone.conf
diff --git a/config_samples/devstack/keystone/logging.conf b/config_samples/devstack/host1/keystone/logging.conf
similarity index 100%
rename from config_samples/devstack/keystone/logging.conf
rename to config_samples/devstack/host1/keystone/logging.conf
diff --git a/config_samples/devstack/keystone/policy.json b/config_samples/devstack/host1/keystone/policy.json
similarity index 100%
rename from config_samples/devstack/keystone/policy.json
rename to config_samples/devstack/host1/keystone/policy.json
diff --git a/config_samples/devstack/keystone/ssl/certs/01.pem b/config_samples/devstack/host1/keystone/ssl/certs/01.pem
similarity index 100%
rename from config_samples/devstack/keystone/ssl/certs/01.pem
rename to config_samples/devstack/host1/keystone/ssl/certs/01.pem
diff --git a/config_samples/devstack/keystone/ssl/certs/ca.pem b/config_samples/devstack/host1/keystone/ssl/certs/ca.pem
similarity index 100%
rename from config_samples/devstack/keystone/ssl/certs/ca.pem
rename to config_samples/devstack/host1/keystone/ssl/certs/ca.pem
diff --git a/config_samples/devstack/keystone/ssl/certs/cakey.pem b/config_samples/devstack/host1/keystone/ssl/certs/cakey.pem
similarity index 100%
rename from config_samples/devstack/keystone/ssl/certs/cakey.pem
rename to config_samples/devstack/host1/keystone/ssl/certs/cakey.pem
diff --git a/config_samples/devstack/keystone/ssl/certs/index.txt b/config_samples/devstack/host1/keystone/ssl/certs/index.txt
similarity index 100%
rename from config_samples/devstack/keystone/ssl/certs/index.txt
rename to config_samples/devstack/host1/keystone/ssl/certs/index.txt
diff --git a/config_samples/devstack/keystone/ssl/certs/index.txt.attr b/config_samples/devstack/host1/keystone/ssl/certs/index.txt.attr
similarity index 100%
rename from config_samples/devstack/keystone/ssl/certs/index.txt.attr
rename to config_samples/devstack/host1/keystone/ssl/certs/index.txt.attr
diff --git a/config_samples/devstack/keystone/ssl/certs/index.txt.old b/config_samples/devstack/host1/keystone/ssl/certs/index.txt.old
similarity index 100%
rename from config_samples/devstack/keystone/ssl/certs/index.txt.old
rename to config_samples/devstack/host1/keystone/ssl/certs/index.txt.old
diff --git a/config_samples/devstack/keystone/ssl/certs/openssl.conf b/config_samples/devstack/host1/keystone/ssl/certs/openssl.conf
similarity index 100%
rename from config_samples/devstack/keystone/ssl/certs/openssl.conf
rename to config_samples/devstack/host1/keystone/ssl/certs/openssl.conf
diff --git a/config_samples/devstack/keystone/ssl/certs/req.pem b/config_samples/devstack/host1/keystone/ssl/certs/req.pem
similarity index 100%
rename from config_samples/devstack/keystone/ssl/certs/req.pem
rename to config_samples/devstack/host1/keystone/ssl/certs/req.pem
diff --git a/config_samples/devstack/keystone/ssl/certs/serial b/config_samples/devstack/host1/keystone/ssl/certs/serial
similarity index 100%
rename from config_samples/devstack/keystone/ssl/certs/serial
rename to config_samples/devstack/host1/keystone/ssl/certs/serial
diff --git a/config_samples/devstack/keystone/ssl/certs/serial.old b/config_samples/devstack/host1/keystone/ssl/certs/serial.old
similarity index 100%
rename from config_samples/devstack/keystone/ssl/certs/serial.old
rename to config_samples/devstack/host1/keystone/ssl/certs/serial.old
diff --git a/config_samples/devstack/keystone/ssl/certs/signing_cert.pem b/config_samples/devstack/host1/keystone/ssl/certs/signing_cert.pem
similarity index 100%
rename from config_samples/devstack/keystone/ssl/certs/signing_cert.pem
rename to config_samples/devstack/host1/keystone/ssl/certs/signing_cert.pem
diff --git a/config_samples/devstack/keystone/ssl/private/signing_key.pem b/config_samples/devstack/host1/keystone/ssl/private/signing_key.pem
similarity index 100%
rename from config_samples/devstack/keystone/ssl/private/signing_key.pem
rename to config_samples/devstack/host1/keystone/ssl/private/signing_key.pem
diff --git a/config_samples/devstack/mysql/conf.d/mysqld_safe_syslog.cnf b/config_samples/devstack/host1/mysql/conf.d/mysqld_safe_syslog.cnf
similarity index 100%
rename from config_samples/devstack/mysql/conf.d/mysqld_safe_syslog.cnf
rename to config_samples/devstack/host1/mysql/conf.d/mysqld_safe_syslog.cnf
diff --git a/config_samples/devstack/mysql/debian-start b/config_samples/devstack/host1/mysql/debian-start
similarity index 100%
rename from config_samples/devstack/mysql/debian-start
rename to config_samples/devstack/host1/mysql/debian-start
diff --git a/config_samples/devstack/mysql/debian.cnf b/config_samples/devstack/host1/mysql/debian.cnf
similarity index 100%
rename from config_samples/devstack/mysql/debian.cnf
rename to config_samples/devstack/host1/mysql/debian.cnf
diff --git a/config_samples/devstack/mysql/my.cnf b/config_samples/devstack/host1/mysql/my.cnf
similarity index 100%
rename from config_samples/devstack/mysql/my.cnf
rename to config_samples/devstack/host1/mysql/my.cnf
diff --git a/config_samples/devstack/nova/api-paste.ini b/config_samples/devstack/host1/nova/api-paste.ini
similarity index 100%
rename from config_samples/devstack/nova/api-paste.ini
rename to config_samples/devstack/host1/nova/api-paste.ini
diff --git a/config_samples/devstack/nova/nova.conf b/config_samples/devstack/host1/nova/nova.conf
similarity index 100%
rename from config_samples/devstack/nova/nova.conf
rename to config_samples/devstack/host1/nova/nova.conf
diff --git a/config_samples/devstack/nova/policy.json b/config_samples/devstack/host1/nova/policy.json
similarity index 100%
rename from config_samples/devstack/nova/policy.json
rename to config_samples/devstack/host1/nova/policy.json
diff --git a/config_samples/devstack/nova/rootwrap.conf b/config_samples/devstack/host1/nova/rootwrap.conf
similarity index 100%
rename from config_samples/devstack/nova/rootwrap.conf
rename to config_samples/devstack/host1/nova/rootwrap.conf
diff --git a/config_samples/devstack/nova/rootwrap.d/api-metadata.filters b/config_samples/devstack/host1/nova/rootwrap.d/api-metadata.filters
similarity index 100%
rename from config_samples/devstack/nova/rootwrap.d/api-metadata.filters
rename to config_samples/devstack/host1/nova/rootwrap.d/api-metadata.filters
diff --git a/config_samples/devstack/nova/rootwrap.d/baremetal-compute-ipmi.filters b/config_samples/devstack/host1/nova/rootwrap.d/baremetal-compute-ipmi.filters
similarity index 100%
rename from config_samples/devstack/nova/rootwrap.d/baremetal-compute-ipmi.filters
rename to config_samples/devstack/host1/nova/rootwrap.d/baremetal-compute-ipmi.filters
diff --git a/config_samples/devstack/nova/rootwrap.d/baremetal-deploy-helper.filters b/config_samples/devstack/host1/nova/rootwrap.d/baremetal-deploy-helper.filters
similarity index 100%
rename from config_samples/devstack/nova/rootwrap.d/baremetal-deploy-helper.filters
rename to config_samples/devstack/host1/nova/rootwrap.d/baremetal-deploy-helper.filters
diff --git a/config_samples/devstack/nova/rootwrap.d/compute.filters b/config_samples/devstack/host1/nova/rootwrap.d/compute.filters
similarity index 100%
rename from config_samples/devstack/nova/rootwrap.d/compute.filters
rename to config_samples/devstack/host1/nova/rootwrap.d/compute.filters
diff --git a/config_samples/devstack/nova/rootwrap.d/network.filters b/config_samples/devstack/host1/nova/rootwrap.d/network.filters
similarity index 100%
rename from config_samples/devstack/nova/rootwrap.d/network.filters
rename to config_samples/devstack/host1/nova/rootwrap.d/network.filters
diff --git a/config_samples/devstack/qemu-ifdown b/config_samples/devstack/host1/qemu-ifdown
similarity index 100%
rename from config_samples/devstack/qemu-ifdown
rename to config_samples/devstack/host1/qemu-ifdown
diff --git a/config_samples/devstack/qemu-ifup b/config_samples/devstack/host1/qemu-ifup
similarity index 100%
rename from config_samples/devstack/qemu-ifup
rename to config_samples/devstack/host1/qemu-ifup
diff --git a/config_samples/devstack/qemu/target-x86_64.conf b/config_samples/devstack/host1/qemu/target-x86_64.conf
similarity index 100%
rename from config_samples/devstack/qemu/target-x86_64.conf
rename to config_samples/devstack/host1/qemu/target-x86_64.conf
diff --git a/config_samples/devstack/rabbitmq/rabbitmq-env.conf b/config_samples/devstack/host1/rabbitmq/rabbitmq-env.conf
similarity index 100%
rename from config_samples/devstack/rabbitmq/rabbitmq-env.conf
rename to config_samples/devstack/host1/rabbitmq/rabbitmq-env.conf