From: Stefan K. Berg Date: Tue, 12 May 2015 13:54:39 +0000 (+0200) Subject: Corrected directory name X-Git-Tag: arno.2015.1.0~51^2 X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=refs%2Fchanges%2F16%2F516%2F1;p=genesis.git Corrected directory name It was never meant for the first level to be called anything else than auto-deploy - really needed to get rid of the terrible .../deploy/deploy/deploy.sh! JIRA Change-Id: Ifa68e5922ca8da9cc72df963e8138a8fc0b8b63b Signed-off-by: Stefan K. Berg --- diff --git a/fuel/prototypes/deploy/README.rst b/fuel/prototypes/auto-deploy/README.rst similarity index 100% rename from fuel/prototypes/deploy/README.rst rename to fuel/prototypes/auto-deploy/README.rst diff --git a/fuel/prototypes/deploy/TODO.txt b/fuel/prototypes/auto-deploy/TODO.txt similarity index 100% rename from fuel/prototypes/deploy/TODO.txt rename to fuel/prototypes/auto-deploy/TODO.txt diff --git a/fuel/prototypes/deploy/create_templates/create_templates.sh b/fuel/prototypes/auto-deploy/create_templates/create_templates.sh similarity index 100% rename from fuel/prototypes/deploy/create_templates/create_templates.sh rename to fuel/prototypes/auto-deploy/create_templates/create_templates.sh diff --git a/fuel/prototypes/deploy/create_templates/generate_fuel_node_info.py b/fuel/prototypes/auto-deploy/create_templates/generate_fuel_node_info.py similarity index 100% rename from fuel/prototypes/deploy/create_templates/generate_fuel_node_info.py rename to fuel/prototypes/auto-deploy/create_templates/generate_fuel_node_info.py diff --git a/fuel/prototypes/deploy/create_templates/generate_node_info.py b/fuel/prototypes/auto-deploy/create_templates/generate_node_info.py similarity index 100% rename from fuel/prototypes/deploy/create_templates/generate_node_info.py rename to fuel/prototypes/auto-deploy/create_templates/generate_node_info.py diff --git a/fuel/prototypes/deploy/create_templates/reap_fuel_settings.py b/fuel/prototypes/auto-deploy/create_templates/reap_fuel_settings.py similarity index 100% rename from fuel/prototypes/deploy/create_templates/reap_fuel_settings.py rename to fuel/prototypes/auto-deploy/create_templates/reap_fuel_settings.py diff --git a/fuel/prototypes/deploy/create_templates/reap_network_scheme.py b/fuel/prototypes/auto-deploy/create_templates/reap_network_scheme.py similarity index 100% rename from fuel/prototypes/deploy/create_templates/reap_network_scheme.py rename to fuel/prototypes/auto-deploy/create_templates/reap_network_scheme.py diff --git a/fuel/prototypes/deploy/create_templates/reap_network_settings.py b/fuel/prototypes/auto-deploy/create_templates/reap_network_settings.py similarity index 100% rename from fuel/prototypes/deploy/create_templates/reap_network_settings.py rename to fuel/prototypes/auto-deploy/create_templates/reap_network_settings.py diff --git a/fuel/prototypes/deploy/create_templates/reap_opnfv_astute.py b/fuel/prototypes/auto-deploy/create_templates/reap_opnfv_astute.py similarity index 100% rename from fuel/prototypes/deploy/create_templates/reap_opnfv_astute.py rename to fuel/prototypes/auto-deploy/create_templates/reap_opnfv_astute.py diff --git a/fuel/prototypes/deploy/create_templates/reap_settings.py b/fuel/prototypes/auto-deploy/create_templates/reap_settings.py similarity index 100% rename from fuel/prototypes/deploy/create_templates/reap_settings.py rename to fuel/prototypes/auto-deploy/create_templates/reap_settings.py diff --git a/fuel/prototypes/deploy/deploy/deploy.sh b/fuel/prototypes/auto-deploy/deploy/deploy.sh similarity index 100% rename from fuel/prototypes/deploy/deploy/deploy.sh rename to fuel/prototypes/auto-deploy/deploy/deploy.sh diff --git a/fuel/prototypes/deploy/deploy/dha-adapters/dhaParse.py b/fuel/prototypes/auto-deploy/deploy/dha-adapters/dhaParse.py similarity index 100% rename from fuel/prototypes/deploy/deploy/dha-adapters/dhaParse.py rename to fuel/prototypes/auto-deploy/deploy/dha-adapters/dhaParse.py diff --git a/fuel/prototypes/deploy/deploy/dha-adapters/ipmi.sh b/fuel/prototypes/auto-deploy/deploy/dha-adapters/ipmi.sh similarity index 100% rename from fuel/prototypes/deploy/deploy/dha-adapters/ipmi.sh rename to fuel/prototypes/auto-deploy/deploy/dha-adapters/ipmi.sh diff --git a/fuel/prototypes/deploy/deploy/dha-adapters/libvirt.sh b/fuel/prototypes/auto-deploy/deploy/dha-adapters/libvirt.sh similarity index 100% rename from fuel/prototypes/deploy/deploy/dha-adapters/libvirt.sh rename to fuel/prototypes/auto-deploy/deploy/dha-adapters/libvirt.sh diff --git a/fuel/prototypes/deploy/deploy/functions/common.sh b/fuel/prototypes/auto-deploy/deploy/functions/common.sh similarity index 100% rename from fuel/prototypes/deploy/deploy/functions/common.sh rename to fuel/prototypes/auto-deploy/deploy/functions/common.sh diff --git a/fuel/prototypes/deploy/deploy/functions/dea-api.sh b/fuel/prototypes/auto-deploy/deploy/functions/dea-api.sh similarity index 100% rename from fuel/prototypes/deploy/deploy/functions/dea-api.sh rename to fuel/prototypes/auto-deploy/deploy/functions/dea-api.sh diff --git a/fuel/prototypes/deploy/deploy/functions/deaParse.py b/fuel/prototypes/auto-deploy/deploy/functions/deaParse.py similarity index 100% rename from fuel/prototypes/deploy/deploy/functions/deaParse.py rename to fuel/prototypes/auto-deploy/deploy/functions/deaParse.py diff --git a/fuel/prototypes/deploy/deploy/functions/deploy_env.sh b/fuel/prototypes/auto-deploy/deploy/functions/deploy_env.sh similarity index 100% rename from fuel/prototypes/deploy/deploy/functions/deploy_env.sh rename to fuel/prototypes/auto-deploy/deploy/functions/deploy_env.sh diff --git a/fuel/prototypes/deploy/deploy/functions/install_iso.sh b/fuel/prototypes/auto-deploy/deploy/functions/install_iso.sh similarity index 100% rename from fuel/prototypes/deploy/deploy/functions/install_iso.sh rename to fuel/prototypes/auto-deploy/deploy/functions/install_iso.sh diff --git a/fuel/prototypes/deploy/deploy/functions/isolinux.cfg.patch b/fuel/prototypes/auto-deploy/deploy/functions/isolinux.cfg.patch similarity index 100% rename from fuel/prototypes/deploy/deploy/functions/isolinux.cfg.patch rename to fuel/prototypes/auto-deploy/deploy/functions/isolinux.cfg.patch diff --git a/fuel/prototypes/deploy/deploy/functions/ks.cfg.patch b/fuel/prototypes/auto-deploy/deploy/functions/ks.cfg.patch similarity index 100% rename from fuel/prototypes/deploy/deploy/functions/ks.cfg.patch rename to fuel/prototypes/auto-deploy/deploy/functions/ks.cfg.patch diff --git a/fuel/prototypes/deploy/deploy/functions/patch-iso.sh b/fuel/prototypes/auto-deploy/deploy/functions/patch-iso.sh similarity index 100% rename from fuel/prototypes/deploy/deploy/functions/patch-iso.sh rename to fuel/prototypes/auto-deploy/deploy/functions/patch-iso.sh diff --git a/fuel/prototypes/deploy/deploy/tools/transplant0.sh b/fuel/prototypes/auto-deploy/deploy/tools/transplant0.sh similarity index 100% rename from fuel/prototypes/deploy/deploy/tools/transplant0.sh rename to fuel/prototypes/auto-deploy/deploy/tools/transplant0.sh diff --git a/fuel/prototypes/deploy/deploy/tools/transplant1.sh b/fuel/prototypes/auto-deploy/deploy/tools/transplant1.sh similarity index 100% rename from fuel/prototypes/deploy/deploy/tools/transplant1.sh rename to fuel/prototypes/auto-deploy/deploy/tools/transplant1.sh diff --git a/fuel/prototypes/deploy/deploy/tools/transplant2.sh b/fuel/prototypes/auto-deploy/deploy/tools/transplant2.sh similarity index 100% rename from fuel/prototypes/deploy/deploy/tools/transplant2.sh rename to fuel/prototypes/auto-deploy/deploy/tools/transplant2.sh diff --git a/fuel/prototypes/deploy/deploy/tools/transplant_fuel_settings.py b/fuel/prototypes/auto-deploy/deploy/tools/transplant_fuel_settings.py similarity index 100% rename from fuel/prototypes/deploy/deploy/tools/transplant_fuel_settings.py rename to fuel/prototypes/auto-deploy/deploy/tools/transplant_fuel_settings.py diff --git a/fuel/prototypes/deploy/deploy/tools/transplant_interfaces.py b/fuel/prototypes/auto-deploy/deploy/tools/transplant_interfaces.py similarity index 100% rename from fuel/prototypes/deploy/deploy/tools/transplant_interfaces.py rename to fuel/prototypes/auto-deploy/deploy/tools/transplant_interfaces.py diff --git a/fuel/prototypes/deploy/deploy/tools/transplant_network_scheme.py b/fuel/prototypes/auto-deploy/deploy/tools/transplant_network_scheme.py similarity index 100% rename from fuel/prototypes/deploy/deploy/tools/transplant_network_scheme.py rename to fuel/prototypes/auto-deploy/deploy/tools/transplant_network_scheme.py diff --git a/fuel/prototypes/deploy/deploy/tools/transplant_network_settings.py b/fuel/prototypes/auto-deploy/deploy/tools/transplant_network_settings.py similarity index 100% rename from fuel/prototypes/deploy/deploy/tools/transplant_network_settings.py rename to fuel/prototypes/auto-deploy/deploy/tools/transplant_network_settings.py diff --git a/fuel/prototypes/deploy/deploy/tools/transplant_opnfv_settings.py b/fuel/prototypes/auto-deploy/deploy/tools/transplant_opnfv_settings.py similarity index 100% rename from fuel/prototypes/deploy/deploy/tools/transplant_opnfv_settings.py rename to fuel/prototypes/auto-deploy/deploy/tools/transplant_opnfv_settings.py diff --git a/fuel/prototypes/deploy/deploy/tools/transplant_settings.py b/fuel/prototypes/auto-deploy/deploy/tools/transplant_settings.py similarity index 100% rename from fuel/prototypes/deploy/deploy/tools/transplant_settings.py rename to fuel/prototypes/auto-deploy/deploy/tools/transplant_settings.py diff --git a/fuel/prototypes/deploy/deploy/verify_dea.sh b/fuel/prototypes/auto-deploy/deploy/verify_dea.sh similarity index 100% rename from fuel/prototypes/deploy/deploy/verify_dea.sh rename to fuel/prototypes/auto-deploy/deploy/verify_dea.sh diff --git a/fuel/prototypes/deploy/deploy/verify_dha.sh b/fuel/prototypes/auto-deploy/deploy/verify_dha.sh similarity index 100% rename from fuel/prototypes/deploy/deploy/verify_dha.sh rename to fuel/prototypes/auto-deploy/deploy/verify_dha.sh diff --git a/fuel/prototypes/deploy/documentation/1-introduction.txt b/fuel/prototypes/auto-deploy/documentation/1-introduction.txt similarity index 100% rename from fuel/prototypes/deploy/documentation/1-introduction.txt rename to fuel/prototypes/auto-deploy/documentation/1-introduction.txt diff --git a/fuel/prototypes/deploy/documentation/2-dea.txt b/fuel/prototypes/auto-deploy/documentation/2-dea.txt similarity index 100% rename from fuel/prototypes/deploy/documentation/2-dea.txt rename to fuel/prototypes/auto-deploy/documentation/2-dea.txt diff --git a/fuel/prototypes/deploy/documentation/3-dha.txt b/fuel/prototypes/auto-deploy/documentation/3-dha.txt similarity index 100% rename from fuel/prototypes/deploy/documentation/3-dha.txt rename to fuel/prototypes/auto-deploy/documentation/3-dha.txt diff --git a/fuel/prototypes/deploy/documentation/4-dha-adapter-api.txt b/fuel/prototypes/auto-deploy/documentation/4-dha-adapter-api.txt similarity index 100% rename from fuel/prototypes/deploy/documentation/4-dha-adapter-api.txt rename to fuel/prototypes/auto-deploy/documentation/4-dha-adapter-api.txt diff --git a/fuel/prototypes/deploy/documentation/5-dea-api.txt b/fuel/prototypes/auto-deploy/documentation/5-dea-api.txt similarity index 100% rename from fuel/prototypes/deploy/documentation/5-dea-api.txt rename to fuel/prototypes/auto-deploy/documentation/5-dea-api.txt diff --git a/fuel/prototypes/deploy/examples/ipmi/README.txt b/fuel/prototypes/auto-deploy/examples/ipmi/README.txt similarity index 100% rename from fuel/prototypes/deploy/examples/ipmi/README.txt rename to fuel/prototypes/auto-deploy/examples/ipmi/README.txt diff --git a/fuel/prototypes/deploy/examples/ipmi/conf/README.txt b/fuel/prototypes/auto-deploy/examples/ipmi/conf/README.txt similarity index 100% rename from fuel/prototypes/deploy/examples/ipmi/conf/README.txt rename to fuel/prototypes/auto-deploy/examples/ipmi/conf/README.txt diff --git a/fuel/prototypes/deploy/examples/ipmi/conf/dea.yaml b/fuel/prototypes/auto-deploy/examples/ipmi/conf/dea.yaml similarity index 100% rename from fuel/prototypes/deploy/examples/ipmi/conf/dea.yaml rename to fuel/prototypes/auto-deploy/examples/ipmi/conf/dea.yaml diff --git a/fuel/prototypes/deploy/examples/ipmi/conf/dha.yaml b/fuel/prototypes/auto-deploy/examples/ipmi/conf/dha.yaml similarity index 100% rename from fuel/prototypes/deploy/examples/ipmi/conf/dha.yaml rename to fuel/prototypes/auto-deploy/examples/ipmi/conf/dha.yaml diff --git a/fuel/prototypes/deploy/examples/ipmi/conf/vm/vFuel b/fuel/prototypes/auto-deploy/examples/ipmi/conf/vm/vFuel similarity index 100% rename from fuel/prototypes/deploy/examples/ipmi/conf/vm/vFuel rename to fuel/prototypes/auto-deploy/examples/ipmi/conf/vm/vFuel diff --git a/fuel/prototypes/deploy/examples/ipmi/install-ubuntu-packages.sh b/fuel/prototypes/auto-deploy/examples/ipmi/install-ubuntu-packages.sh similarity index 100% rename from fuel/prototypes/deploy/examples/ipmi/install-ubuntu-packages.sh rename to fuel/prototypes/auto-deploy/examples/ipmi/install-ubuntu-packages.sh diff --git a/fuel/prototypes/deploy/examples/libvirt/README.txt b/fuel/prototypes/auto-deploy/examples/libvirt/README.txt similarity index 100% rename from fuel/prototypes/deploy/examples/libvirt/README.txt rename to fuel/prototypes/auto-deploy/examples/libvirt/README.txt diff --git a/fuel/prototypes/deploy/examples/libvirt/conf/dea.yaml b/fuel/prototypes/auto-deploy/examples/libvirt/conf/dea.yaml similarity index 100% rename from fuel/prototypes/deploy/examples/libvirt/conf/dea.yaml rename to fuel/prototypes/auto-deploy/examples/libvirt/conf/dea.yaml diff --git a/fuel/prototypes/deploy/examples/libvirt/conf/dha.yaml b/fuel/prototypes/auto-deploy/examples/libvirt/conf/dha.yaml similarity index 100% rename from fuel/prototypes/deploy/examples/libvirt/conf/dha.yaml rename to fuel/prototypes/auto-deploy/examples/libvirt/conf/dha.yaml diff --git a/fuel/prototypes/deploy/examples/libvirt/conf/networks/fuel1 b/fuel/prototypes/auto-deploy/examples/libvirt/conf/networks/fuel1 similarity index 100% rename from fuel/prototypes/deploy/examples/libvirt/conf/networks/fuel1 rename to fuel/prototypes/auto-deploy/examples/libvirt/conf/networks/fuel1 diff --git a/fuel/prototypes/deploy/examples/libvirt/conf/networks/fuel2 b/fuel/prototypes/auto-deploy/examples/libvirt/conf/networks/fuel2 similarity index 100% rename from fuel/prototypes/deploy/examples/libvirt/conf/networks/fuel2 rename to fuel/prototypes/auto-deploy/examples/libvirt/conf/networks/fuel2 diff --git a/fuel/prototypes/deploy/examples/libvirt/conf/networks/fuel3 b/fuel/prototypes/auto-deploy/examples/libvirt/conf/networks/fuel3 similarity index 100% rename from fuel/prototypes/deploy/examples/libvirt/conf/networks/fuel3 rename to fuel/prototypes/auto-deploy/examples/libvirt/conf/networks/fuel3 diff --git a/fuel/prototypes/deploy/examples/libvirt/conf/networks/fuel4 b/fuel/prototypes/auto-deploy/examples/libvirt/conf/networks/fuel4 similarity index 100% rename from fuel/prototypes/deploy/examples/libvirt/conf/networks/fuel4 rename to fuel/prototypes/auto-deploy/examples/libvirt/conf/networks/fuel4 diff --git a/fuel/prototypes/deploy/examples/libvirt/conf/vms/compute4 b/fuel/prototypes/auto-deploy/examples/libvirt/conf/vms/compute4 similarity index 100% rename from fuel/prototypes/deploy/examples/libvirt/conf/vms/compute4 rename to fuel/prototypes/auto-deploy/examples/libvirt/conf/vms/compute4 diff --git a/fuel/prototypes/deploy/examples/libvirt/conf/vms/compute5 b/fuel/prototypes/auto-deploy/examples/libvirt/conf/vms/compute5 similarity index 100% rename from fuel/prototypes/deploy/examples/libvirt/conf/vms/compute5 rename to fuel/prototypes/auto-deploy/examples/libvirt/conf/vms/compute5 diff --git a/fuel/prototypes/deploy/examples/libvirt/conf/vms/controller1 b/fuel/prototypes/auto-deploy/examples/libvirt/conf/vms/controller1 similarity index 100% rename from fuel/prototypes/deploy/examples/libvirt/conf/vms/controller1 rename to fuel/prototypes/auto-deploy/examples/libvirt/conf/vms/controller1 diff --git a/fuel/prototypes/deploy/examples/libvirt/conf/vms/fuel-master b/fuel/prototypes/auto-deploy/examples/libvirt/conf/vms/fuel-master similarity index 100% rename from fuel/prototypes/deploy/examples/libvirt/conf/vms/fuel-master rename to fuel/prototypes/auto-deploy/examples/libvirt/conf/vms/fuel-master diff --git a/fuel/prototypes/deploy/examples/libvirt/install-ubuntu-packages.sh b/fuel/prototypes/auto-deploy/examples/libvirt/install-ubuntu-packages.sh similarity index 100% rename from fuel/prototypes/deploy/examples/libvirt/install-ubuntu-packages.sh rename to fuel/prototypes/auto-deploy/examples/libvirt/install-ubuntu-packages.sh diff --git a/fuel/prototypes/deploy/examples/libvirt/setup_example_vms.sh b/fuel/prototypes/auto-deploy/examples/libvirt/setup_example_vms.sh similarity index 100% rename from fuel/prototypes/deploy/examples/libvirt/setup_example_vms.sh rename to fuel/prototypes/auto-deploy/examples/libvirt/setup_example_vms.sh diff --git a/fuel/prototypes/deploy/examples/libvirt/tools/cleanup_example_vms.sh b/fuel/prototypes/auto-deploy/examples/libvirt/tools/cleanup_example_vms.sh similarity index 100% rename from fuel/prototypes/deploy/examples/libvirt/tools/cleanup_example_vms.sh rename to fuel/prototypes/auto-deploy/examples/libvirt/tools/cleanup_example_vms.sh diff --git a/fuel/prototypes/deploy/examples/libvirt/tools/dump_setup.sh b/fuel/prototypes/auto-deploy/examples/libvirt/tools/dump_setup.sh similarity index 100% rename from fuel/prototypes/deploy/examples/libvirt/tools/dump_setup.sh rename to fuel/prototypes/auto-deploy/examples/libvirt/tools/dump_setup.sh diff --git a/fuel/prototypes/deploy/list_fixmes.sh b/fuel/prototypes/auto-deploy/list_fixmes.sh similarity index 100% rename from fuel/prototypes/deploy/list_fixmes.sh rename to fuel/prototypes/auto-deploy/list_fixmes.sh