diff options
| -rw-r--r-- | README (renamed from fuel/README) | 0 | ||||
| -rw-r--r-- | TODO (renamed from fuel/TODO) | 0 | ||||
| -rw-r--r-- | build/Makefile (renamed from fuel/build/Makefile) | 0 | ||||
| -rw-r--r-- | build/README (renamed from fuel/build/README) | 0 | ||||
| -rw-r--r-- | build/add_opnfv_packages (renamed from fuel/build/add_opnfv_packages) | 0 | ||||
| -rw-r--r-- | build/apply_patches (renamed from fuel/build/apply_patches) | 0 | ||||
| -rw-r--r-- | build/cache.mk (renamed from fuel/build/cache.mk) | 0 | ||||
| -rwxr-xr-x | build/cache.sh (renamed from fuel/build/cache.sh) | 0 | ||||
| -rwxr-xr-x | build/check_dependencies.sh (renamed from fuel/build/check_dependencies.sh) | 0 | ||||
| -rw-r--r-- | build/config.mk (renamed from fuel/build/config.mk) | 0 | ||||
| -rw-r--r-- | build/docker/Dockerfile (renamed from fuel/build/docker/Dockerfile) | 0 | ||||
| -rw-r--r-- | build/docker/Makefile (renamed from fuel/build/docker/Makefile) | 0 | ||||
| -rw-r--r-- | build/docker/README (renamed from fuel/build/docker/README) | 0 | ||||
| -rwxr-xr-x | build/docker/runcontext (renamed from fuel/build/docker/runcontext) | 0 | ||||
| -rw-r--r-- | build/docker/ubuntu-builder/enable_dockerx2 (renamed from fuel/build/docker/ubuntu-builder/enable_dockerx2) | 0 | ||||
| -rwxr-xr-x | build/docker/ubuntu-builder/setcontext (renamed from fuel/build/docker/ubuntu-builder/setcontext) | 0 | ||||
| -rw-r--r-- | build/f_example_control_bond/Makefile (renamed from fuel/build/f_example_control_bond/Makefile) | 0 | ||||
| -rw-r--r-- | build/f_example_control_bond/README (renamed from fuel/build/f_example_control_bond/README) | 0 | ||||
| -rw-r--r-- | build/f_example_control_bond/puppet/modules/opnfv/files/control-bond (renamed from fuel/build/f_example_control_bond/puppet/modules/opnfv/files/control-bond) | 0 | ||||
| -rw-r--r-- | build/f_example_control_bond/puppet/modules/opnfv/manifests/control-bond.pp (renamed from fuel/build/f_example_control_bond/puppet/modules/opnfv/manifests/control-bond.pp) | 0 | ||||
| -rw-r--r-- | build/f_example_packadd/Makefile (renamed from fuel/build/f_example_packadd/Makefile) | 0 | ||||
| -rw-r--r-- | build/f_example_packadd/README (renamed from fuel/build/f_example_packadd/README) | 0 | ||||
| -rw-r--r-- | build/f_example_packadd/foobar_1.0-1/DEBIAN/conffiles (renamed from fuel/build/f_example_packadd/foobar_1.0-1/DEBIAN/conffiles) | 0 | ||||
| -rw-r--r-- | build/f_example_packadd/foobar_1.0-1/DEBIAN/control (renamed from fuel/build/f_example_packadd/foobar_1.0-1/DEBIAN/control) | 0 | ||||
| -rwxr-xr-x | build/f_example_packadd/foobar_1.0-1/DEBIAN/postinst (renamed from fuel/build/f_example_packadd/foobar_1.0-1/DEBIAN/postinst) | 0 | ||||
| -rw-r--r-- | build/f_example_packadd/foobar_1.0-1/etc/foobar/foobar.conf (renamed from fuel/build/f_example_packadd/foobar_1.0-1/etc/foobar/foobar.conf) | 0 | ||||
| -rwxr-xr-x | build/f_example_packadd/foobar_1.0-1/usr/bin/foobar (renamed from fuel/build/f_example_packadd/foobar_1.0-1/usr/bin/foobar) | 0 | ||||
| -rw-r--r-- | build/f_example_packadd/foobar_1.0-1/usr/share/doc/foobar/changelog.Debian (renamed from fuel/build/f_example_packadd/foobar_1.0-1/usr/share/doc/foobar/changelog.Debian) | 0 | ||||
| -rw-r--r-- | build/f_example_packadd/foobar_1.0-1/usr/share/doc/foobar/copyright (renamed from fuel/build/f_example_packadd/foobar_1.0-1/usr/share/doc/foobar/copyright) | 0 | ||||
| -rw-r--r-- | build/f_example_packadd/puppet/modules/opnfv/manifests/foobar.pp (renamed from fuel/build/f_example_packadd/puppet/modules/opnfv/manifests/foobar.pp) | 0 | ||||
| -rw-r--r-- | build/f_isoroot/Makefile (renamed from fuel/build/f_isoroot/Makefile) | 0 | ||||
| -rw-r--r-- | build/f_isoroot/README (renamed from fuel/build/f_isoroot/README) | 0 | ||||
| -rw-r--r-- | build/f_isoroot/cache.mk (renamed from fuel/build/f_isoroot/cache.mk) | 0 | ||||
| -rw-r--r-- | build/f_isoroot/f_bootstrap/Makefile (renamed from fuel/build/f_isoroot/f_bootstrap/Makefile) | 0 | ||||
| -rw-r--r-- | build/f_isoroot/f_bootstrap/README (renamed from fuel/build/f_isoroot/f_bootstrap/README) | 0 | ||||
| -rwxr-xr-x | build/f_isoroot/f_bootstrap/bootstrap_admin_node.sh (renamed from fuel/build/f_isoroot/f_bootstrap/bootstrap_admin_node.sh) | 0 | ||||
| -rwxr-xr-x | build/f_isoroot/f_bootstrap/bootstrap_admin_node.sh.orig (renamed from fuel/build/f_isoroot/f_bootstrap/bootstrap_admin_node.sh.orig) | 0 | ||||
| -rwxr-xr-x | build/f_isoroot/f_bootstrap/post-scripts/00_post_example.sh (renamed from fuel/build/f_isoroot/f_bootstrap/post-scripts/00_post_example.sh) | 0 | ||||
| -rwxr-xr-x | build/f_isoroot/f_bootstrap/post-scripts/03_install_repo.sh (renamed from fuel/build/f_isoroot/f_bootstrap/post-scripts/03_install_repo.sh) | 0 | ||||
| -rwxr-xr-x | build/f_isoroot/f_bootstrap/pre-scripts/00_pre_example.sh (renamed from fuel/build/f_isoroot/f_bootstrap/pre-scripts/00_pre_example.sh) | 0 | ||||
| -rw-r--r-- | build/f_isoroot/f_kscfg/Makefile (renamed from fuel/build/f_isoroot/f_kscfg/Makefile) | 0 | ||||
| -rw-r--r-- | build/f_isoroot/f_kscfg/README (renamed from fuel/build/f_isoroot/f_kscfg/README) | 0 | ||||
| -rw-r--r-- | build/f_isoroot/f_kscfg/ks.cfg (renamed from fuel/build/f_isoroot/f_kscfg/ks.cfg) | 0 | ||||
| -rw-r--r-- | build/f_isoroot/f_kscfg/ks.cfg.orig (renamed from fuel/build/f_isoroot/f_kscfg/ks.cfg.orig) | 0 | ||||
| -rw-r--r-- | build/f_isoroot/f_odlpluginbuild/Makefile (renamed from fuel/build/f_isoroot/f_odlpluginbuild/Makefile) | 0 | ||||
| -rw-r--r-- | build/f_isoroot/f_odlpluginbuild/config/opendaylight_config.yaml (renamed from fuel/build/f_isoroot/f_odlpluginbuild/config/opendaylight_config.yaml) | 0 | ||||
| -rw-r--r-- | build/f_isoroot/f_repobuild/Makefile (renamed from fuel/build/f_isoroot/f_repobuild/Makefile) | 0 | ||||
| -rwxr-xr-x | build/f_isoroot/f_repobuild/select_ubuntu_repo.sh (renamed from fuel/build/f_isoroot/f_repobuild/select_ubuntu_repo.sh) | 0 | ||||
| -rw-r--r-- | build/fuel-main_5.patch (renamed from fuel/build/fuel-main_5.patch) | 0 | ||||
| -rw-r--r-- | build/fuel-main_6.patch (renamed from fuel/build/fuel-main_6.patch) | 0 | ||||
| -rw-r--r-- | build/install/apt-ftparchive-deb.conf (renamed from fuel/build/install/apt-ftparchive-deb.conf) | 0 | ||||
| -rw-r--r-- | build/install/apt-ftparchive-release.conf (renamed from fuel/build/install/apt-ftparchive-release.conf) | 0 | ||||
| -rw-r--r-- | build/install/apt-ftparchive-udeb.conf (renamed from fuel/build/install/apt-ftparchive-udeb.conf) | 0 | ||||
| -rwxr-xr-x | build/install/install.sh (renamed from fuel/build/install/install.sh) | 0 | ||||
| -rwxr-xr-x | build/install/uninstall.sh (renamed from fuel/build/install/uninstall.sh) | 0 | ||||
| -rw-r--r-- | build/patch-packages/Makefile (renamed from fuel/build/patch-packages/Makefile) | 0 | ||||
| -rwxr-xr-x | build/patch-packages/tools/correct_deps (renamed from fuel/build/patch-packages/tools/correct_deps) | 0 | ||||
| -rwxr-xr-x | build/patch-packages/tools/deb_pack (renamed from fuel/build/patch-packages/tools/deb_pack) | 0 | ||||
| -rwxr-xr-x | build/patch-packages/tools/deb_unpack (renamed from fuel/build/patch-packages/tools/deb_unpack) | 0 | ||||
| -rwxr-xr-x | build/patch-packages/tools/udeb_pack (renamed from fuel/build/patch-packages/tools/udeb_pack) | 0 | ||||
| -rwxr-xr-x | build/patch-packages/tools/udeb_unpack (renamed from fuel/build/patch-packages/tools/udeb_unpack) | 0 | ||||
| -rw-r--r-- | build/patch-packages/tr_example/Makefile (renamed from fuel/build/patch-packages/tr_example/Makefile) | 0 | ||||
| -rwxr-xr-x | build/repo_info.sh (renamed from fuel/build/repo_info.sh) | 0 | ||||
| -rw-r--r-- | ci/README (renamed from fuel/ci/README) | 0 | ||||
| -rwxr-xr-x | ci/build.sh (renamed from fuel/ci/build.sh) | 0 | ||||
| -rwxr-xr-x | ci/deploy.sh (renamed from fuel/ci/deploy.sh) | 0 | ||||
| -rw-r--r-- | deploy/README (renamed from fuel/deploy/README) | 0 | ||||
| -rw-r--r-- | deploy/__init__.py (renamed from fuel/deploy/__init__.py) | 0 | ||||
| -rw-r--r-- | deploy/cloud/configure_environment.py (renamed from fuel/deploy/cloud/configure_environment.py) | 0 | ||||
| -rw-r--r-- | deploy/cloud/configure_network.py (renamed from fuel/deploy/cloud/configure_network.py) | 0 | ||||
| -rw-r--r-- | deploy/cloud/configure_nodes.py (renamed from fuel/deploy/cloud/configure_nodes.py) | 0 | ||||
| -rw-r--r-- | deploy/cloud/configure_settings.py (renamed from fuel/deploy/cloud/configure_settings.py) | 0 | ||||
| -rw-r--r-- | deploy/cloud/deploy.py (renamed from fuel/deploy/cloud/deploy.py) | 0 | ||||
| -rw-r--r-- | deploy/cloud/deployment.py (renamed from fuel/deploy/cloud/deployment.py) | 0 | ||||
| -rw-r--r-- | deploy/common.py (renamed from fuel/deploy/common.py) | 0 | ||||
| -rw-r--r-- | deploy/dea.py (renamed from fuel/deploy/dea.py) | 0 | ||||
| -rw-r--r-- | deploy/deploy.py (renamed from fuel/deploy/deploy.py) | 0 | ||||
| -rw-r--r-- | deploy/deploy_env.py (renamed from fuel/deploy/deploy_env.py) | 0 | ||||
| -rw-r--r-- | deploy/dha.py (renamed from fuel/deploy/dha.py) | 0 | ||||
| -rw-r--r-- | deploy/dha_adapters/__init__.py (renamed from fuel/deploy/dha_adapters/__init__.py) | 0 | ||||
| -rw-r--r-- | deploy/dha_adapters/amt_adapter.py (renamed from fuel/deploy/dha_adapters/amt_adapter.py) | 0 | ||||
| -rw-r--r-- | deploy/dha_adapters/hardware_adapter.py (renamed from fuel/deploy/dha_adapters/hardware_adapter.py) | 0 | ||||
| -rw-r--r-- | deploy/dha_adapters/hp_adapter.py (renamed from fuel/deploy/dha_adapters/hp_adapter.py) | 0 | ||||
| -rw-r--r-- | deploy/dha_adapters/ipmi_adapter.py (renamed from fuel/deploy/dha_adapters/ipmi_adapter.py) | 0 | ||||
| -rw-r--r-- | deploy/dha_adapters/libvirt_adapter.py (renamed from fuel/deploy/dha_adapters/libvirt_adapter.py) | 0 | ||||
| -rw-r--r-- | deploy/environments/__init__.py (renamed from fuel/deploy/environments/__init__.py) | 0 | ||||
| -rw-r--r-- | deploy/environments/execution_environment.py (renamed from fuel/deploy/environments/execution_environment.py) | 0 | ||||
| -rw-r--r-- | deploy/environments/libvirt_environment.py (renamed from fuel/deploy/environments/libvirt_environment.py) | 0 | ||||
| -rw-r--r-- | deploy/environments/virtual_fuel.py (renamed from fuel/deploy/environments/virtual_fuel.py) | 0 | ||||
| -rw-r--r-- | deploy/execution_environment.py (renamed from fuel/deploy/execution_environment.py) | 0 | ||||
| -rw-r--r-- | deploy/fuel_patch/ks.cfg.patch (renamed from fuel/deploy/fuel_patch/ks.cfg.patch) | 0 | ||||
| -rw-r--r-- | deploy/install_fuel_master.py (renamed from fuel/deploy/install_fuel_master.py) | 0 | ||||
| -rw-r--r-- | deploy/reap.py (renamed from fuel/deploy/reap.py) | 0 | ||||
| -rw-r--r-- | deploy/ssh_client.py (renamed from fuel/deploy/ssh_client.py) | 0 | ||||
| -rw-r--r-- | deploy/templates/hardware_environment/conf/ericsson_montreal_lab/dea.yaml (renamed from fuel/deploy/templates/hardware_environment/conf/ericsson_montreal_lab/dea.yaml) | 0 | ||||
| -rw-r--r-- | deploy/templates/hardware_environment/conf/ericsson_montreal_lab/dha.yaml (renamed from fuel/deploy/templates/hardware_environment/conf/ericsson_montreal_lab/dha.yaml) | 0 | ||||
| -rw-r--r-- | deploy/templates/hardware_environment/conf/ericsson_montreal_lab/plugins_conf/.gitkeep (renamed from fuel/deploy/templates/hardware_environment/conf/ericsson_montreal_lab/plugins_conf/.gitkeep) | 0 | ||||
| -rw-r--r-- | deploy/templates/hardware_environment/conf/linux_foundation_lab/pod1/dea.yaml (renamed from fuel/deploy/templates/hardware_environment/conf/linux_foundation_lab/pod1/dea.yaml) | 0 | ||||
| -rw-r--r-- | deploy/templates/hardware_environment/conf/linux_foundation_lab/pod1/dha.yaml (renamed from fuel/deploy/templates/hardware_environment/conf/linux_foundation_lab/pod1/dha.yaml) | 0 | ||||
| -rw-r--r-- | deploy/templates/hardware_environment/conf/linux_foundation_lab/pod1/plugins_conf/.gitkeep (renamed from fuel/deploy/templates/hardware_environment/conf/linux_foundation_lab/pod1/plugins_conf/.gitkeep) | 0 | ||||
| -rw-r--r-- | deploy/templates/hardware_environment/conf/linux_foundation_lab/pod2/dea.yaml (renamed from fuel/deploy/templates/hardware_environment/conf/linux_foundation_lab/pod2/dea.yaml) | 0 | ||||
| -rw-r--r-- | deploy/templates/hardware_environment/conf/linux_foundation_lab/pod2/dha.yaml (renamed from fuel/deploy/templates/hardware_environment/conf/linux_foundation_lab/pod2/dha.yaml) | 0 | ||||
| -rw-r--r-- | deploy/templates/hardware_environment/conf/linux_foundation_lab/pod2/plugins_conf/.gitkeep (renamed from fuel/deploy/templates/hardware_environment/conf/linux_foundation_lab/pod2/plugins_conf/.gitkeep) | 0 | ||||
| -rw-r--r-- | deploy/templates/hardware_environment/conf/opnfv_box/dea.yaml (renamed from fuel/deploy/templates/hardware_environment/conf/opnfv_box/dea.yaml) | 0 | ||||
| -rw-r--r-- | deploy/templates/hardware_environment/conf/opnfv_box/dha.yaml (renamed from fuel/deploy/templates/hardware_environment/conf/opnfv_box/dha.yaml) | 0 | ||||
| -rw-r--r-- | deploy/templates/hardware_environment/conf/opnfv_box/plugins_conf/.gitkeep (renamed from fuel/deploy/templates/hardware_environment/conf/opnfv_box/plugins_conf/.gitkeep) | 0 | ||||
| -rw-r--r-- | deploy/templates/hardware_environment/vms/fuel.xml (renamed from fuel/deploy/templates/hardware_environment/vms/fuel.xml) | 0 | ||||
| -rw-r--r-- | deploy/templates/plugins/.gitkeep (renamed from fuel/deploy/templates/plugins/.gitkeep) | 0 | ||||
| -rw-r--r-- | deploy/templates/virtual_environment/conf/dea.yaml (renamed from fuel/deploy/templates/virtual_environment/conf/dea.yaml) | 0 | ||||
| -rw-r--r-- | deploy/templates/virtual_environment/conf/dha.yaml (renamed from fuel/deploy/templates/virtual_environment/conf/dha.yaml) | 0 | ||||
| -rw-r--r-- | deploy/templates/virtual_environment/conf/plugins_conf/.gitkeep (renamed from fuel/deploy/templates/virtual_environment/conf/plugins_conf/.gitkeep) | 0 | ||||
| -rw-r--r-- | deploy/templates/virtual_environment/networks/fuel1.xml (renamed from fuel/deploy/templates/virtual_environment/networks/fuel1.xml) | 0 | ||||
| -rw-r--r-- | deploy/templates/virtual_environment/networks/fuel2.xml (renamed from fuel/deploy/templates/virtual_environment/networks/fuel2.xml) | 0 | ||||
| -rw-r--r-- | deploy/templates/virtual_environment/networks/fuel3.xml (renamed from fuel/deploy/templates/virtual_environment/networks/fuel3.xml) | 0 | ||||
| -rw-r--r-- | deploy/templates/virtual_environment/networks/fuel4.xml (renamed from fuel/deploy/templates/virtual_environment/networks/fuel4.xml) | 0 | ||||
| -rw-r--r-- | deploy/templates/virtual_environment/vms/compute.xml (renamed from fuel/deploy/templates/virtual_environment/vms/compute.xml) | 0 | ||||
| -rw-r--r-- | deploy/templates/virtual_environment/vms/controller.xml (renamed from fuel/deploy/templates/virtual_environment/vms/controller.xml) | 0 | ||||
| -rw-r--r-- | deploy/templates/virtual_environment/vms/fuel.xml (renamed from fuel/deploy/templates/virtual_environment/vms/fuel.xml) | 0 | ||||
| -rw-r--r-- | deploy/transplant_fuel_settings.py (renamed from fuel/deploy/transplant_fuel_settings.py) | 0 | ||||
| -rw-r--r-- | docs/.DS_Store (renamed from fuel/docs/.DS_Store) | bin | 6148 -> 6148 bytes | |||
| -rw-r--r-- | docs/src/build-instructions.rst (renamed from fuel/docs/src/build-instructions.rst) | 0 | ||||
| -rw-r--r-- | docs/src/installation-instructions.rst (renamed from fuel/docs/src/installation-instructions.rst) | 0 | ||||
| -rw-r--r-- | docs/src/release-notes.rst (renamed from fuel/docs/src/release-notes.rst) | 0 | ||||
| -rw-r--r-- | fuel/.DS_Store | bin | 6148 -> 0 bytes | |||
| -rw-r--r-- | fuel/prototypes/auto-deploy/README.rst | 24 | ||||
| -rw-r--r-- | fuel/prototypes/auto-deploy/TODO.txt | 34 | ||||
| -rw-r--r-- | fuel/prototypes/auto-deploy/configs/ericsson_montreal/dea.yaml | 983 | ||||
| -rw-r--r-- | fuel/prototypes/auto-deploy/configs/lf_pod1/dea_ha.yaml | 969 | ||||
| -rw-r--r-- | fuel/prototypes/auto-deploy/configs/lf_pod1/dea_no-ha.yaml | 969 | ||||
| -rw-r--r-- | fuel/prototypes/auto-deploy/configs/lf_pod1/dha.yaml | 66 | ||||
| -rw-r--r-- | fuel/prototypes/auto-deploy/configs/lf_pod1/fuel-opnfv.xml | 132 | ||||
| -rw-r--r-- | fuel/prototypes/auto-deploy/configs/lf_pod1/jump1_networking.txt | 4 | ||||
| -rwxr-xr-x | fuel/prototypes/auto-deploy/create_templates/create_templates.sh | 189 | ||||
| -rwxr-xr-x | fuel/prototypes/auto-deploy/create_templates/generate_fuel_node_info.py | 36 | ||||
| -rwxr-xr-x | fuel/prototypes/auto-deploy/create_templates/generate_node_info.py | 61 | ||||
| -rwxr-xr-x | fuel/prototypes/auto-deploy/create_templates/reap_fuel_settings.py | 47 | ||||
| -rwxr-xr-x | fuel/prototypes/auto-deploy/create_templates/reap_network_scheme.py | 38 | ||||
| -rwxr-xr-x | fuel/prototypes/auto-deploy/create_templates/reap_network_settings.py | 48 | ||||
| -rwxr-xr-x | fuel/prototypes/auto-deploy/create_templates/reap_opnfv_astute.py | 49 | ||||
| -rwxr-xr-x | fuel/prototypes/auto-deploy/create_templates/reap_settings.py | 37 | ||||
| -rwxr-xr-x | fuel/prototypes/auto-deploy/deploy/deploy.sh | 193 | ||||
| -rwxr-xr-x | fuel/prototypes/auto-deploy/deploy/dha-adapters/dhaParse.py | 87 | ||||
| -rwxr-xr-x | fuel/prototypes/auto-deploy/deploy/dha-adapters/ipmi.sh | 449 | ||||
| -rwxr-xr-x | fuel/prototypes/auto-deploy/deploy/dha-adapters/libvirt.sh | 334 | ||||
| -rwxr-xr-x | fuel/prototypes/auto-deploy/deploy/functions/common.sh | 67 | ||||
| -rwxr-xr-x | fuel/prototypes/auto-deploy/deploy/functions/dea-api.sh | 171 | ||||
| -rwxr-xr-x | fuel/prototypes/auto-deploy/deploy/functions/deaParse.py | 85 | ||||
| -rwxr-xr-x | fuel/prototypes/auto-deploy/deploy/functions/deploy_env.sh | 140 | ||||
| -rwxr-xr-x | fuel/prototypes/auto-deploy/deploy/functions/install_iso.sh | 91 | ||||
| -rw-r--r-- | fuel/prototypes/auto-deploy/deploy/functions/isolinux.cfg.patch | 14 | ||||
| -rw-r--r-- | fuel/prototypes/auto-deploy/deploy/functions/ks.cfg.patch | 19 | ||||
| -rwxr-xr-x | fuel/prototypes/auto-deploy/deploy/functions/patch-iso.sh | 85 | ||||
| -rwxr-xr-x | fuel/prototypes/auto-deploy/deploy/tools/transplant0.sh | 40 | ||||
| -rwxr-xr-x | fuel/prototypes/auto-deploy/deploy/tools/transplant1.sh | 67 | ||||
| -rwxr-xr-x | fuel/prototypes/auto-deploy/deploy/tools/transplant2.sh | 98 | ||||
| -rwxr-xr-x | fuel/prototypes/auto-deploy/deploy/tools/transplant_fuel_settings.py | 50 | ||||
| -rwxr-xr-x | fuel/prototypes/auto-deploy/deploy/tools/transplant_interfaces.py | 77 | ||||
| -rwxr-xr-x | fuel/prototypes/auto-deploy/deploy/tools/transplant_network_scheme.py | 42 | ||||
| -rwxr-xr-x | fuel/prototypes/auto-deploy/deploy/tools/transplant_network_settings.py | 52 | ||||
| -rwxr-xr-x | fuel/prototypes/auto-deploy/deploy/tools/transplant_opnfv_settings.py | 42 | ||||
| -rwxr-xr-x | fuel/prototypes/auto-deploy/deploy/tools/transplant_settings.py | 36 | ||||
| -rwxr-xr-x | fuel/prototypes/auto-deploy/deploy/verify_dea.sh | 79 | ||||
| -rwxr-xr-x | fuel/prototypes/auto-deploy/deploy/verify_dha.sh | 125 | ||||
| -rw-r--r-- | fuel/prototypes/auto-deploy/documentation/1-introduction.txt | 36 | ||||
| -rw-r--r-- | fuel/prototypes/auto-deploy/documentation/2-dea.txt | 1082 | ||||
| -rw-r--r-- | fuel/prototypes/auto-deploy/documentation/3-dha.txt | 65 | ||||
| -rw-r--r-- | fuel/prototypes/auto-deploy/documentation/4-dha-adapter-api.txt | 128 | ||||
| -rw-r--r-- | fuel/prototypes/auto-deploy/documentation/5-dea-api.txt | 47 | ||||
| -rw-r--r-- | fuel/prototypes/auto-deploy/examples/ipmi/README.txt | 10 | ||||
| -rw-r--r-- | fuel/prototypes/auto-deploy/examples/ipmi/conf/README.txt | 12 | ||||
| -rw-r--r-- | fuel/prototypes/auto-deploy/examples/ipmi/conf/dea.yaml | 983 | ||||
| -rw-r--r-- | fuel/prototypes/auto-deploy/examples/ipmi/conf/dha.yaml | 52 | ||||
| -rw-r--r-- | fuel/prototypes/auto-deploy/examples/ipmi/conf/vm/vFuel | 115 | ||||
| -rwxr-xr-x | fuel/prototypes/auto-deploy/examples/ipmi/install-ubuntu-packages.sh | 16 | ||||
| -rw-r--r-- | fuel/prototypes/auto-deploy/examples/libvirt/README.txt | 25 | ||||
| -rw-r--r-- | fuel/prototypes/auto-deploy/examples/libvirt/conf/dea.yaml | 975 | ||||
| -rw-r--r-- | fuel/prototypes/auto-deploy/examples/libvirt/conf/dha.yaml | 49 | ||||
| -rw-r--r-- | fuel/prototypes/auto-deploy/examples/libvirt/conf/networks/fuel1 | 12 | ||||
| -rw-r--r-- | fuel/prototypes/auto-deploy/examples/libvirt/conf/networks/fuel2 | 5 | ||||
| -rw-r--r-- | fuel/prototypes/auto-deploy/examples/libvirt/conf/networks/fuel3 | 5 | ||||
| -rw-r--r-- | fuel/prototypes/auto-deploy/examples/libvirt/conf/networks/fuel4 | 12 | ||||
| -rw-r--r-- | fuel/prototypes/auto-deploy/examples/libvirt/conf/vms/compute4 | 107 | ||||
| -rw-r--r-- | fuel/prototypes/auto-deploy/examples/libvirt/conf/vms/compute5 | 106 | ||||
| -rw-r--r-- | fuel/prototypes/auto-deploy/examples/libvirt/conf/vms/controller1 | 106 | ||||
| -rw-r--r-- | fuel/prototypes/auto-deploy/examples/libvirt/conf/vms/fuel-master | 102 | ||||
| -rwxr-xr-x | fuel/prototypes/auto-deploy/examples/libvirt/install-ubuntu-packages.sh | 16 | ||||
| -rwxr-xr-x | fuel/prototypes/auto-deploy/examples/libvirt/setup_example_vms.sh | 105 | ||||
| -rwxr-xr-x | fuel/prototypes/auto-deploy/examples/libvirt/tools/cleanup_example_vms.sh | 58 | ||||
| -rwxr-xr-x | fuel/prototypes/auto-deploy/examples/libvirt/tools/dump_setup.sh | 68 | ||||
| -rwxr-xr-x | fuel/prototypes/auto-deploy/list_fixmes.sh | 19 |
190 files changed, 0 insertions, 10445 deletions
diff --git a/fuel/build/Makefile b/build/Makefile index 6e7041dc0..6e7041dc0 100644 --- a/fuel/build/Makefile +++ b/build/Makefile diff --git a/fuel/build/README b/build/README index a6e15694c..a6e15694c 100644 --- a/fuel/build/README +++ b/build/README diff --git a/fuel/build/add_opnfv_packages b/build/add_opnfv_packages index 44af92ea7..44af92ea7 100644 --- a/fuel/build/add_opnfv_packages +++ b/build/add_opnfv_packages diff --git a/fuel/build/apply_patches b/build/apply_patches index 6925ff6b7..6925ff6b7 100644 --- a/fuel/build/apply_patches +++ b/build/apply_patches diff --git a/fuel/build/cache.mk b/build/cache.mk index f6db01797..f6db01797 100644 --- a/fuel/build/cache.mk +++ b/build/cache.mk diff --git a/fuel/build/cache.sh b/build/cache.sh index c8cd1b03d..c8cd1b03d 100755 --- a/fuel/build/cache.sh +++ b/build/cache.sh diff --git a/fuel/build/check_dependencies.sh b/build/check_dependencies.sh index cbcb98ab3..cbcb98ab3 100755 --- a/fuel/build/check_dependencies.sh +++ b/build/check_dependencies.sh diff --git a/fuel/build/config.mk b/build/config.mk index fad4c765c..fad4c765c 100644 --- a/fuel/build/config.mk +++ b/build/config.mk diff --git a/fuel/build/docker/Dockerfile b/build/docker/Dockerfile index f3d122db9..f3d122db9 100644 --- a/fuel/build/docker/Dockerfile +++ b/build/docker/Dockerfile diff --git a/fuel/build/docker/Makefile b/build/docker/Makefile index a2434447a..a2434447a 100644 --- a/fuel/build/docker/Makefile +++ b/build/docker/Makefile diff --git a/fuel/build/docker/README b/build/docker/README index e5ccdfab6..e5ccdfab6 100644 --- a/fuel/build/docker/README +++ b/build/docker/README diff --git a/fuel/build/docker/runcontext b/build/docker/runcontext index f9065a01f..f9065a01f 100755 --- a/fuel/build/docker/runcontext +++ b/build/docker/runcontext diff --git a/fuel/build/docker/ubuntu-builder/enable_dockerx2 b/build/docker/ubuntu-builder/enable_dockerx2 index 1511c70ea..1511c70ea 100644 --- a/fuel/build/docker/ubuntu-builder/enable_dockerx2 +++ b/build/docker/ubuntu-builder/enable_dockerx2 diff --git a/fuel/build/docker/ubuntu-builder/setcontext b/build/docker/ubuntu-builder/setcontext index bc28994a9..bc28994a9 100755 --- a/fuel/build/docker/ubuntu-builder/setcontext +++ b/build/docker/ubuntu-builder/setcontext diff --git a/fuel/build/f_example_control_bond/Makefile b/build/f_example_control_bond/Makefile index 0949737bc..0949737bc 100644 --- a/fuel/build/f_example_control_bond/Makefile +++ b/build/f_example_control_bond/Makefile diff --git a/fuel/build/f_example_control_bond/README b/build/f_example_control_bond/README index 4449b2ff2..4449b2ff2 100644 --- a/fuel/build/f_example_control_bond/README +++ b/build/f_example_control_bond/README diff --git a/fuel/build/f_example_control_bond/puppet/modules/opnfv/files/control-bond b/build/f_example_control_bond/puppet/modules/opnfv/files/control-bond index bf2930d73..bf2930d73 100644 --- a/fuel/build/f_example_control_bond/puppet/modules/opnfv/files/control-bond +++ b/build/f_example_control_bond/puppet/modules/opnfv/files/control-bond diff --git a/fuel/build/f_example_control_bond/puppet/modules/opnfv/manifests/control-bond.pp b/build/f_example_control_bond/puppet/modules/opnfv/manifests/control-bond.pp index 22fe78171..22fe78171 100644 --- a/fuel/build/f_example_control_bond/puppet/modules/opnfv/manifests/control-bond.pp +++ b/build/f_example_control_bond/puppet/modules/opnfv/manifests/control-bond.pp diff --git a/fuel/build/f_example_packadd/Makefile b/build/f_example_packadd/Makefile index a64293dcb..a64293dcb 100644 --- a/fuel/build/f_example_packadd/Makefile +++ b/build/f_example_packadd/Makefile diff --git a/fuel/build/f_example_packadd/README b/build/f_example_packadd/README index 55fa7c1a1..55fa7c1a1 100644 --- a/fuel/build/f_example_packadd/README +++ b/build/f_example_packadd/README diff --git a/fuel/build/f_example_packadd/foobar_1.0-1/DEBIAN/conffiles b/build/f_example_packadd/foobar_1.0-1/DEBIAN/conffiles index bad6a0ef5..bad6a0ef5 100644 --- a/fuel/build/f_example_packadd/foobar_1.0-1/DEBIAN/conffiles +++ b/build/f_example_packadd/foobar_1.0-1/DEBIAN/conffiles diff --git a/fuel/build/f_example_packadd/foobar_1.0-1/DEBIAN/control b/build/f_example_packadd/foobar_1.0-1/DEBIAN/control index f3f0eb603..f3f0eb603 100644 --- a/fuel/build/f_example_packadd/foobar_1.0-1/DEBIAN/control +++ b/build/f_example_packadd/foobar_1.0-1/DEBIAN/control diff --git a/fuel/build/f_example_packadd/foobar_1.0-1/DEBIAN/postinst b/build/f_example_packadd/foobar_1.0-1/DEBIAN/postinst index f48f26075..f48f26075 100755 --- a/fuel/build/f_example_packadd/foobar_1.0-1/DEBIAN/postinst +++ b/build/f_example_packadd/foobar_1.0-1/DEBIAN/postinst diff --git a/fuel/build/f_example_packadd/foobar_1.0-1/etc/foobar/foobar.conf b/build/f_example_packadd/foobar_1.0-1/etc/foobar/foobar.conf index e0eee5c7a..e0eee5c7a 100644 --- a/fuel/build/f_example_packadd/foobar_1.0-1/etc/foobar/foobar.conf +++ b/build/f_example_packadd/foobar_1.0-1/etc/foobar/foobar.conf diff --git a/fuel/build/f_example_packadd/foobar_1.0-1/usr/bin/foobar b/build/f_example_packadd/foobar_1.0-1/usr/bin/foobar index c9651a463..c9651a463 100755 --- a/fuel/build/f_example_packadd/foobar_1.0-1/usr/bin/foobar +++ b/build/f_example_packadd/foobar_1.0-1/usr/bin/foobar diff --git a/fuel/build/f_example_packadd/foobar_1.0-1/usr/share/doc/foobar/changelog.Debian b/build/f_example_packadd/foobar_1.0-1/usr/share/doc/foobar/changelog.Debian index fe776f33e..fe776f33e 100644 --- a/fuel/build/f_example_packadd/foobar_1.0-1/usr/share/doc/foobar/changelog.Debian +++ b/build/f_example_packadd/foobar_1.0-1/usr/share/doc/foobar/changelog.Debian diff --git a/fuel/build/f_example_packadd/foobar_1.0-1/usr/share/doc/foobar/copyright b/build/f_example_packadd/foobar_1.0-1/usr/share/doc/foobar/copyright index 4279ce4e2..4279ce4e2 100644 --- a/fuel/build/f_example_packadd/foobar_1.0-1/usr/share/doc/foobar/copyright +++ b/build/f_example_packadd/foobar_1.0-1/usr/share/doc/foobar/copyright diff --git a/fuel/build/f_example_packadd/puppet/modules/opnfv/manifests/foobar.pp b/build/f_example_packadd/puppet/modules/opnfv/manifests/foobar.pp index c6219baa8..c6219baa8 100644 --- a/fuel/build/f_example_packadd/puppet/modules/opnfv/manifests/foobar.pp +++ b/build/f_example_packadd/puppet/modules/opnfv/manifests/foobar.pp diff --git a/fuel/build/f_isoroot/Makefile b/build/f_isoroot/Makefile index 3831a09f0..3831a09f0 100644 --- a/fuel/build/f_isoroot/Makefile +++ b/build/f_isoroot/Makefile diff --git a/fuel/build/f_isoroot/README b/build/f_isoroot/README index eb54c0827..eb54c0827 100644 --- a/fuel/build/f_isoroot/README +++ b/build/f_isoroot/README diff --git a/fuel/build/f_isoroot/cache.mk b/build/f_isoroot/cache.mk index 2df3b6bd1..2df3b6bd1 100644 --- a/fuel/build/f_isoroot/cache.mk +++ b/build/f_isoroot/cache.mk diff --git a/fuel/build/f_isoroot/f_bootstrap/Makefile b/build/f_isoroot/f_bootstrap/Makefile index a958aa2d6..a958aa2d6 100644 --- a/fuel/build/f_isoroot/f_bootstrap/Makefile +++ b/build/f_isoroot/f_bootstrap/Makefile diff --git a/fuel/build/f_isoroot/f_bootstrap/README b/build/f_isoroot/f_bootstrap/README index 5da954ca4..5da954ca4 100644 --- a/fuel/build/f_isoroot/f_bootstrap/README +++ b/build/f_isoroot/f_bootstrap/README diff --git a/fuel/build/f_isoroot/f_bootstrap/bootstrap_admin_node.sh b/build/f_isoroot/f_bootstrap/bootstrap_admin_node.sh index 065d0cb7d..065d0cb7d 100755 --- a/fuel/build/f_isoroot/f_bootstrap/bootstrap_admin_node.sh +++ b/build/f_isoroot/f_bootstrap/bootstrap_admin_node.sh diff --git a/fuel/build/f_isoroot/f_bootstrap/bootstrap_admin_node.sh.orig b/build/f_isoroot/f_bootstrap/bootstrap_admin_node.sh.orig index 1bc349314..1bc349314 100755 --- a/fuel/build/f_isoroot/f_bootstrap/bootstrap_admin_node.sh.orig +++ b/build/f_isoroot/f_bootstrap/bootstrap_admin_node.sh.orig diff --git a/fuel/build/f_isoroot/f_bootstrap/post-scripts/00_post_example.sh b/build/f_isoroot/f_bootstrap/post-scripts/00_post_example.sh index 7ac896589..7ac896589 100755 --- a/fuel/build/f_isoroot/f_bootstrap/post-scripts/00_post_example.sh +++ b/build/f_isoroot/f_bootstrap/post-scripts/00_post_example.sh diff --git a/fuel/build/f_isoroot/f_bootstrap/post-scripts/03_install_repo.sh b/build/f_isoroot/f_bootstrap/post-scripts/03_install_repo.sh index 427a55add..427a55add 100755 --- a/fuel/build/f_isoroot/f_bootstrap/post-scripts/03_install_repo.sh +++ b/build/f_isoroot/f_bootstrap/post-scripts/03_install_repo.sh diff --git a/fuel/build/f_isoroot/f_bootstrap/pre-scripts/00_pre_example.sh b/build/f_isoroot/f_bootstrap/pre-scripts/00_pre_example.sh index ac427bf87..ac427bf87 100755 --- a/fuel/build/f_isoroot/f_bootstrap/pre-scripts/00_pre_example.sh +++ b/build/f_isoroot/f_bootstrap/pre-scripts/00_pre_example.sh diff --git a/fuel/build/f_isoroot/f_kscfg/Makefile b/build/f_isoroot/f_kscfg/Makefile index fe740418d..fe740418d 100644 --- a/fuel/build/f_isoroot/f_kscfg/Makefile +++ b/build/f_isoroot/f_kscfg/Makefile diff --git a/fuel/build/f_isoroot/f_kscfg/README b/build/f_isoroot/f_kscfg/README index c85efde77..c85efde77 100644 --- a/fuel/build/f_isoroot/f_kscfg/README +++ b/build/f_isoroot/f_kscfg/README diff --git a/fuel/build/f_isoroot/f_kscfg/ks.cfg b/build/f_isoroot/f_kscfg/ks.cfg index 8c20971f8..8c20971f8 100644 --- a/fuel/build/f_isoroot/f_kscfg/ks.cfg +++ b/build/f_isoroot/f_kscfg/ks.cfg diff --git a/fuel/build/f_isoroot/f_kscfg/ks.cfg.orig b/build/f_isoroot/f_kscfg/ks.cfg.orig index 148ef9908..148ef9908 100644 --- a/fuel/build/f_isoroot/f_kscfg/ks.cfg.orig +++ b/build/f_isoroot/f_kscfg/ks.cfg.orig diff --git a/fuel/build/f_isoroot/f_odlpluginbuild/Makefile b/build/f_isoroot/f_odlpluginbuild/Makefile index a63cdadf8..a63cdadf8 100644 --- a/fuel/build/f_isoroot/f_odlpluginbuild/Makefile +++ b/build/f_isoroot/f_odlpluginbuild/Makefile diff --git a/fuel/build/f_isoroot/f_odlpluginbuild/config/opendaylight_config.yaml b/build/f_isoroot/f_odlpluginbuild/config/opendaylight_config.yaml index 183ef9ca9..183ef9ca9 100644 --- a/fuel/build/f_isoroot/f_odlpluginbuild/config/opendaylight_config.yaml +++ b/build/f_isoroot/f_odlpluginbuild/config/opendaylight_config.yaml diff --git a/fuel/build/f_isoroot/f_repobuild/Makefile b/build/f_isoroot/f_repobuild/Makefile index d7db2dd90..d7db2dd90 100644 --- a/fuel/build/f_isoroot/f_repobuild/Makefile +++ b/build/f_isoroot/f_repobuild/Makefile diff --git a/fuel/build/f_isoroot/f_repobuild/select_ubuntu_repo.sh b/build/f_isoroot/f_repobuild/select_ubuntu_repo.sh index cb05fe136..cb05fe136 100755 --- a/fuel/build/f_isoroot/f_repobuild/select_ubuntu_repo.sh +++ b/build/f_isoroot/f_repobuild/select_ubuntu_repo.sh diff --git a/fuel/build/fuel-main_5.patch b/build/fuel-main_5.patch index ec75626d0..ec75626d0 100644 --- a/fuel/build/fuel-main_5.patch +++ b/build/fuel-main_5.patch diff --git a/fuel/build/fuel-main_6.patch b/build/fuel-main_6.patch index 2659e2d17..2659e2d17 100644 --- a/fuel/build/fuel-main_6.patch +++ b/build/fuel-main_6.patch diff --git a/fuel/build/install/apt-ftparchive-deb.conf b/build/install/apt-ftparchive-deb.conf index 0d15aec6f..0d15aec6f 100644 --- a/fuel/build/install/apt-ftparchive-deb.conf +++ b/build/install/apt-ftparchive-deb.conf diff --git a/fuel/build/install/apt-ftparchive-release.conf b/build/install/apt-ftparchive-release.conf index 02706bd7d..02706bd7d 100644 --- a/fuel/build/install/apt-ftparchive-release.conf +++ b/build/install/apt-ftparchive-release.conf diff --git a/fuel/build/install/apt-ftparchive-udeb.conf b/build/install/apt-ftparchive-udeb.conf index 3b5b239a6..3b5b239a6 100644 --- a/fuel/build/install/apt-ftparchive-udeb.conf +++ b/build/install/apt-ftparchive-udeb.conf diff --git a/fuel/build/install/install.sh b/build/install/install.sh index 6155a4162..6155a4162 100755 --- a/fuel/build/install/install.sh +++ b/build/install/install.sh diff --git a/fuel/build/install/uninstall.sh b/build/install/uninstall.sh index a9e74bc39..a9e74bc39 100755 --- a/fuel/build/install/uninstall.sh +++ b/build/install/uninstall.sh diff --git a/fuel/build/patch-packages/Makefile b/build/patch-packages/Makefile index 339c9e7cf..339c9e7cf 100644 --- a/fuel/build/patch-packages/Makefile +++ b/build/patch-packages/Makefile diff --git a/fuel/build/patch-packages/tools/correct_deps b/build/patch-packages/tools/correct_deps index cfb7d538f..cfb7d538f 100755 --- a/fuel/build/patch-packages/tools/correct_deps +++ b/build/patch-packages/tools/correct_deps diff --git a/fuel/build/patch-packages/tools/deb_pack b/build/patch-packages/tools/deb_pack index f5d42dec3..f5d42dec3 100755 --- a/fuel/build/patch-packages/tools/deb_pack +++ b/build/patch-packages/tools/deb_pack diff --git a/fuel/build/patch-packages/tools/deb_unpack b/build/patch-packages/tools/deb_unpack index aaa60b743..aaa60b743 100755 --- a/fuel/build/patch-packages/tools/deb_unpack +++ b/build/patch-packages/tools/deb_unpack diff --git a/fuel/build/patch-packages/tools/udeb_pack b/build/patch-packages/tools/udeb_pack index e961a7320..e961a7320 100755 --- a/fuel/build/patch-packages/tools/udeb_pack +++ b/build/patch-packages/tools/udeb_pack diff --git a/fuel/build/patch-packages/tools/udeb_unpack b/build/patch-packages/tools/udeb_unpack index ed9cd21aa..ed9cd21aa 100755 --- a/fuel/build/patch-packages/tools/udeb_unpack +++ b/build/patch-packages/tools/udeb_unpack diff --git a/fuel/build/patch-packages/tr_example/Makefile b/build/patch-packages/tr_example/Makefile index b7cab3590..b7cab3590 100644 --- a/fuel/build/patch-packages/tr_example/Makefile +++ b/build/patch-packages/tr_example/Makefile diff --git a/fuel/build/repo_info.sh b/build/repo_info.sh index 347ede7f7..347ede7f7 100755 --- a/fuel/build/repo_info.sh +++ b/build/repo_info.sh diff --git a/fuel/ci/README b/ci/README index aab823bc0..aab823bc0 100644 --- a/fuel/ci/README +++ b/ci/README diff --git a/fuel/ci/build.sh b/ci/build.sh index 62abba173..62abba173 100755 --- a/fuel/ci/build.sh +++ b/ci/build.sh diff --git a/fuel/ci/deploy.sh b/ci/deploy.sh index d5b70d0d6..d5b70d0d6 100755 --- a/fuel/ci/deploy.sh +++ b/ci/deploy.sh diff --git a/fuel/deploy/README b/deploy/README index 167078bf8..167078bf8 100644 --- a/fuel/deploy/README +++ b/deploy/README diff --git a/fuel/deploy/__init__.py b/deploy/__init__.py index fb73157f9..fb73157f9 100644 --- a/fuel/deploy/__init__.py +++ b/deploy/__init__.py diff --git a/fuel/deploy/cloud/configure_environment.py b/deploy/cloud/configure_environment.py index ed89fa600..ed89fa600 100644 --- a/fuel/deploy/cloud/configure_environment.py +++ b/deploy/cloud/configure_environment.py diff --git a/fuel/deploy/cloud/configure_network.py b/deploy/cloud/configure_network.py index b3ff9e9e0..b3ff9e9e0 100644 --- a/fuel/deploy/cloud/configure_network.py +++ b/deploy/cloud/configure_network.py diff --git a/fuel/deploy/cloud/configure_nodes.py b/deploy/cloud/configure_nodes.py index a456679ab..a456679ab 100644 --- a/fuel/deploy/cloud/configure_nodes.py +++ b/deploy/cloud/configure_nodes.py diff --git a/fuel/deploy/cloud/configure_settings.py b/deploy/cloud/configure_settings.py index c773e1b61..c773e1b61 100644 --- a/fuel/deploy/cloud/configure_settings.py +++ b/deploy/cloud/configure_settings.py diff --git a/fuel/deploy/cloud/deploy.py b/deploy/cloud/deploy.py index 14d6a9621..14d6a9621 100644 --- a/fuel/deploy/cloud/deploy.py +++ b/deploy/cloud/deploy.py diff --git a/fuel/deploy/cloud/deployment.py b/deploy/cloud/deployment.py index 12c1f8978..12c1f8978 100644 --- a/fuel/deploy/cloud/deployment.py +++ b/deploy/cloud/deployment.py diff --git a/fuel/deploy/common.py b/deploy/common.py index 17fd2174a..17fd2174a 100644 --- a/fuel/deploy/common.py +++ b/deploy/common.py diff --git a/fuel/deploy/dea.py b/deploy/dea.py index 2d2b28ae8..2d2b28ae8 100644 --- a/fuel/deploy/dea.py +++ b/deploy/dea.py diff --git a/fuel/deploy/deploy.py b/deploy/deploy.py index 4e209a932..4e209a932 100644 --- a/fuel/deploy/deploy.py +++ b/deploy/deploy.py diff --git a/fuel/deploy/deploy_env.py b/deploy/deploy_env.py index 735ea66a3..735ea66a3 100644 --- a/fuel/deploy/deploy_env.py +++ b/deploy/deploy_env.py diff --git a/fuel/deploy/dha.py b/deploy/dha.py index cb413cbb0..cb413cbb0 100644 --- a/fuel/deploy/dha.py +++ b/deploy/dha.py diff --git a/fuel/deploy/dha_adapters/__init__.py b/deploy/dha_adapters/__init__.py index fb73157f9..fb73157f9 100644 --- a/fuel/deploy/dha_adapters/__init__.py +++ b/deploy/dha_adapters/__init__.py diff --git a/fuel/deploy/dha_adapters/amt_adapter.py b/deploy/dha_adapters/amt_adapter.py index 02025b9dd..02025b9dd 100644 --- a/fuel/deploy/dha_adapters/amt_adapter.py +++ b/deploy/dha_adapters/amt_adapter.py diff --git a/fuel/deploy/dha_adapters/hardware_adapter.py b/deploy/dha_adapters/hardware_adapter.py index 2cd5ab842..2cd5ab842 100644 --- a/fuel/deploy/dha_adapters/hardware_adapter.py +++ b/deploy/dha_adapters/hardware_adapter.py diff --git a/fuel/deploy/dha_adapters/hp_adapter.py b/deploy/dha_adapters/hp_adapter.py index 13bb3491a..13bb3491a 100644 --- a/fuel/deploy/dha_adapters/hp_adapter.py +++ b/deploy/dha_adapters/hp_adapter.py diff --git a/fuel/deploy/dha_adapters/ipmi_adapter.py b/deploy/dha_adapters/ipmi_adapter.py index 8fda4f9f0..8fda4f9f0 100644 --- a/fuel/deploy/dha_adapters/ipmi_adapter.py +++ b/deploy/dha_adapters/ipmi_adapter.py diff --git a/fuel/deploy/dha_adapters/libvirt_adapter.py b/deploy/dha_adapters/libvirt_adapter.py index d6a30d75e..d6a30d75e 100644 --- a/fuel/deploy/dha_adapters/libvirt_adapter.py +++ b/deploy/dha_adapters/libvirt_adapter.py diff --git a/fuel/deploy/environments/__init__.py b/deploy/environments/__init__.py index fb73157f9..fb73157f9 100644 --- a/fuel/deploy/environments/__init__.py +++ b/deploy/environments/__init__.py diff --git a/fuel/deploy/environments/execution_environment.py b/deploy/environments/execution_environment.py index 38e5bcdf7..38e5bcdf7 100644 --- a/fuel/deploy/environments/execution_environment.py +++ b/deploy/environments/execution_environment.py diff --git a/fuel/deploy/environments/libvirt_environment.py b/deploy/environments/libvirt_environment.py index af2d3f8fb..af2d3f8fb 100644 --- a/fuel/deploy/environments/libvirt_environment.py +++ b/deploy/environments/libvirt_environment.py diff --git a/fuel/deploy/environments/virtual_fuel.py b/deploy/environments/virtual_fuel.py index 705eee48b..705eee48b 100644 --- a/fuel/deploy/environments/virtual_fuel.py +++ b/deploy/environments/virtual_fuel.py diff --git a/fuel/deploy/execution_environment.py b/deploy/execution_environment.py index b2d268253..b2d268253 100644 --- a/fuel/deploy/execution_environment.py +++ b/deploy/execution_environment.py diff --git a/fuel/deploy/fuel_patch/ks.cfg.patch b/deploy/fuel_patch/ks.cfg.patch index 189695792..189695792 100644 --- a/fuel/deploy/fuel_patch/ks.cfg.patch +++ b/deploy/fuel_patch/ks.cfg.patch diff --git a/fuel/deploy/install_fuel_master.py b/deploy/install_fuel_master.py index e3a7327c0..e3a7327c0 100644 --- a/fuel/deploy/install_fuel_master.py +++ b/deploy/install_fuel_master.py diff --git a/fuel/deploy/reap.py b/deploy/reap.py index b7080cdae..b7080cdae 100644 --- a/fuel/deploy/reap.py +++ b/deploy/reap.py diff --git a/fuel/deploy/ssh_client.py b/deploy/ssh_client.py index df780961f..df780961f 100644 --- a/fuel/deploy/ssh_client.py +++ b/deploy/ssh_client.py diff --git a/fuel/deploy/templates/hardware_environment/conf/ericsson_montreal_lab/dea.yaml b/deploy/templates/hardware_environment/conf/ericsson_montreal_lab/dea.yaml index c7d741880..c7d741880 100644 --- a/fuel/deploy/templates/hardware_environment/conf/ericsson_montreal_lab/dea.yaml +++ b/deploy/templates/hardware_environment/conf/ericsson_montreal_lab/dea.yaml diff --git a/fuel/deploy/templates/hardware_environment/conf/ericsson_montreal_lab/dha.yaml b/deploy/templates/hardware_environment/conf/ericsson_montreal_lab/dha.yaml index ca446f680..ca446f680 100644 --- a/fuel/deploy/templates/hardware_environment/conf/ericsson_montreal_lab/dha.yaml +++ b/deploy/templates/hardware_environment/conf/ericsson_montreal_lab/dha.yaml diff --git a/fuel/deploy/templates/hardware_environment/conf/ericsson_montreal_lab/plugins_conf/.gitkeep b/deploy/templates/hardware_environment/conf/ericsson_montreal_lab/plugins_conf/.gitkeep index e69de29bb..e69de29bb 100644 --- a/fuel/deploy/templates/hardware_environment/conf/ericsson_montreal_lab/plugins_conf/.gitkeep +++ b/deploy/templates/hardware_environment/conf/ericsson_montreal_lab/plugins_conf/.gitkeep diff --git a/fuel/deploy/templates/hardware_environment/conf/linux_foundation_lab/pod1/dea.yaml b/deploy/templates/hardware_environment/conf/linux_foundation_lab/pod1/dea.yaml index e2d752198..e2d752198 100644 --- a/fuel/deploy/templates/hardware_environment/conf/linux_foundation_lab/pod1/dea.yaml +++ b/deploy/templates/hardware_environment/conf/linux_foundation_lab/pod1/dea.yaml diff --git a/fuel/deploy/templates/hardware_environment/conf/linux_foundation_lab/pod1/dha.yaml b/deploy/templates/hardware_environment/conf/linux_foundation_lab/pod1/dha.yaml index 724d6d833..724d6d833 100644 --- a/fuel/deploy/templates/hardware_environment/conf/linux_foundation_lab/pod1/dha.yaml +++ b/deploy/templates/hardware_environment/conf/linux_foundation_lab/pod1/dha.yaml diff --git a/fuel/deploy/templates/hardware_environment/conf/linux_foundation_lab/pod1/plugins_conf/.gitkeep b/deploy/templates/hardware_environment/conf/linux_foundation_lab/pod1/plugins_conf/.gitkeep index e69de29bb..e69de29bb 100644 --- a/fuel/deploy/templates/hardware_environment/conf/linux_foundation_lab/pod1/plugins_conf/.gitkeep +++ b/deploy/templates/hardware_environment/conf/linux_foundation_lab/pod1/plugins_conf/.gitkeep diff --git a/fuel/deploy/templates/hardware_environment/conf/linux_foundation_lab/pod2/dea.yaml b/deploy/templates/hardware_environment/conf/linux_foundation_lab/pod2/dea.yaml index 64362793f..64362793f 100644 --- a/fuel/deploy/templates/hardware_environment/conf/linux_foundation_lab/pod2/dea.yaml +++ b/deploy/templates/hardware_environment/conf/linux_foundation_lab/pod2/dea.yaml diff --git a/fuel/deploy/templates/hardware_environment/conf/linux_foundation_lab/pod2/dha.yaml b/deploy/templates/hardware_environment/conf/linux_foundation_lab/pod2/dha.yaml index cfc97094c..cfc97094c 100644 --- a/fuel/deploy/templates/hardware_environment/conf/linux_foundation_lab/pod2/dha.yaml +++ b/deploy/templates/hardware_environment/conf/linux_foundation_lab/pod2/dha.yaml diff --git a/fuel/deploy/templates/hardware_environment/conf/linux_foundation_lab/pod2/plugins_conf/.gitkeep b/deploy/templates/hardware_environment/conf/linux_foundation_lab/pod2/plugins_conf/.gitkeep index e69de29bb..e69de29bb 100644 --- a/fuel/deploy/templates/hardware_environment/conf/linux_foundation_lab/pod2/plugins_conf/.gitkeep +++ b/deploy/templates/hardware_environment/conf/linux_foundation_lab/pod2/plugins_conf/.gitkeep diff --git a/fuel/deploy/templates/hardware_environment/conf/opnfv_box/dea.yaml b/deploy/templates/hardware_environment/conf/opnfv_box/dea.yaml index fa6da9c96..fa6da9c96 100644 --- a/fuel/deploy/templates/hardware_environment/conf/opnfv_box/dea.yaml +++ b/deploy/templates/hardware_environment/conf/opnfv_box/dea.yaml diff --git a/fuel/deploy/templates/hardware_environment/conf/opnfv_box/dha.yaml b/deploy/templates/hardware_environment/conf/opnfv_box/dha.yaml index b127ac919..b127ac919 100644 --- a/fuel/deploy/templates/hardware_environment/conf/opnfv_box/dha.yaml +++ b/deploy/templates/hardware_environment/conf/opnfv_box/dha.yaml diff --git a/fuel/deploy/templates/hardware_environment/conf/opnfv_box/plugins_conf/.gitkeep b/deploy/templates/hardware_environment/conf/opnfv_box/plugins_conf/.gitkeep index e69de29bb..e69de29bb 100644 --- a/fuel/deploy/templates/hardware_environment/conf/opnfv_box/plugins_conf/.gitkeep +++ b/deploy/templates/hardware_environment/conf/opnfv_box/plugins_conf/.gitkeep diff --git a/fuel/deploy/templates/hardware_environment/vms/fuel.xml b/deploy/templates/hardware_environment/vms/fuel.xml index e3e3f80bb..e3e3f80bb 100644 --- a/fuel/deploy/templates/hardware_environment/vms/fuel.xml +++ b/deploy/templates/hardware_environment/vms/fuel.xml diff --git a/fuel/deploy/templates/plugins/.gitkeep b/deploy/templates/plugins/.gitkeep index e69de29bb..e69de29bb 100644 --- a/fuel/deploy/templates/plugins/.gitkeep +++ b/deploy/templates/plugins/.gitkeep diff --git a/fuel/deploy/templates/virtual_environment/conf/dea.yaml b/deploy/templates/virtual_environment/conf/dea.yaml index c764e03e5..c764e03e5 100644 --- a/fuel/deploy/templates/virtual_environment/conf/dea.yaml +++ b/deploy/templates/virtual_environment/conf/dea.yaml diff --git a/fuel/deploy/templates/virtual_environment/conf/dha.yaml b/deploy/templates/virtual_environment/conf/dha.yaml index b671dd311..b671dd311 100644 --- a/fuel/deploy/templates/virtual_environment/conf/dha.yaml +++ b/deploy/templates/virtual_environment/conf/dha.yaml diff --git a/fuel/deploy/templates/virtual_environment/conf/plugins_conf/.gitkeep b/deploy/templates/virtual_environment/conf/plugins_conf/.gitkeep index e69de29bb..e69de29bb 100644 --- a/fuel/deploy/templates/virtual_environment/conf/plugins_conf/.gitkeep +++ b/deploy/templates/virtual_environment/conf/plugins_conf/.gitkeep diff --git a/fuel/deploy/templates/virtual_environment/networks/fuel1.xml b/deploy/templates/virtual_environment/networks/fuel1.xml index 7b2b15423..7b2b15423 100644 --- a/fuel/deploy/templates/virtual_environment/networks/fuel1.xml +++ b/deploy/templates/virtual_environment/networks/fuel1.xml diff --git a/fuel/deploy/templates/virtual_environment/networks/fuel2.xml b/deploy/templates/virtual_environment/networks/fuel2.xml index 615c92094..615c92094 100644 --- a/fuel/deploy/templates/virtual_environment/networks/fuel2.xml +++ b/deploy/templates/virtual_environment/networks/fuel2.xml diff --git a/fuel/deploy/templates/virtual_environment/networks/fuel3.xml b/deploy/templates/virtual_environment/networks/fuel3.xml index 2383e6c1f..2383e6c1f 100644 --- a/fuel/deploy/templates/virtual_environment/networks/fuel3.xml +++ b/deploy/templates/virtual_environment/networks/fuel3.xml diff --git a/fuel/deploy/templates/virtual_environment/networks/fuel4.xml b/deploy/templates/virtual_environment/networks/fuel4.xml index 5b69f912d..5b69f912d 100644 --- a/fuel/deploy/templates/virtual_environment/networks/fuel4.xml +++ b/deploy/templates/virtual_environment/networks/fuel4.xml diff --git a/fuel/deploy/templates/virtual_environment/vms/compute.xml b/deploy/templates/virtual_environment/vms/compute.xml index fbef4bda7..fbef4bda7 100644 --- a/fuel/deploy/templates/virtual_environment/vms/compute.xml +++ b/deploy/templates/virtual_environment/vms/compute.xml diff --git a/fuel/deploy/templates/virtual_environment/vms/controller.xml b/deploy/templates/virtual_environment/vms/controller.xml index 3ff28218d..3ff28218d 100644 --- a/fuel/deploy/templates/virtual_environment/vms/controller.xml +++ b/deploy/templates/virtual_environment/vms/controller.xml diff --git a/fuel/deploy/templates/virtual_environment/vms/fuel.xml b/deploy/templates/virtual_environment/vms/fuel.xml index 1a3286001..1a3286001 100644 --- a/fuel/deploy/templates/virtual_environment/vms/fuel.xml +++ b/deploy/templates/virtual_environment/vms/fuel.xml diff --git a/fuel/deploy/transplant_fuel_settings.py b/deploy/transplant_fuel_settings.py index e57a4fbc6..e57a4fbc6 100644 --- a/fuel/deploy/transplant_fuel_settings.py +++ b/deploy/transplant_fuel_settings.py diff --git a/fuel/docs/.DS_Store b/docs/.DS_Store Binary files differindex 9a874b576..9a874b576 100644 --- a/fuel/docs/.DS_Store +++ b/docs/.DS_Store diff --git a/fuel/docs/src/build-instructions.rst b/docs/src/build-instructions.rst index 08b560375..08b560375 100644 --- a/fuel/docs/src/build-instructions.rst +++ b/docs/src/build-instructions.rst diff --git a/fuel/docs/src/installation-instructions.rst b/docs/src/installation-instructions.rst index aedbb53d5..aedbb53d5 100644 --- a/fuel/docs/src/installation-instructions.rst +++ b/docs/src/installation-instructions.rst diff --git a/fuel/docs/src/release-notes.rst b/docs/src/release-notes.rst index 435789767..435789767 100644 --- a/fuel/docs/src/release-notes.rst +++ b/docs/src/release-notes.rst diff --git a/fuel/.DS_Store b/fuel/.DS_Store Binary files differdeleted file mode 100644 index b1bc858e9..000000000 --- a/fuel/.DS_Store +++ /dev/null diff --git a/fuel/prototypes/auto-deploy/README.rst b/fuel/prototypes/auto-deploy/README.rst deleted file mode 100644 index 35898b052..000000000 --- a/fuel/prototypes/auto-deploy/README.rst +++ /dev/null @@ -1,24 +0,0 @@ -** DEA/DHA deployment prototype** - -This is a continuation of the specific libvirt deployment prototype into a generic concept supporting a hardware plugin architecture in the deployment engine. - -Conceptually the deployer contains of a number of entities: - -* The main deployment engine, deploy.sh. The deploy script needs three pieces of information: - * The ISO file to deploy - * The dea.yaml file describing the Fuel deployment - * The dha.yaml file describing the hardware configuration -* The Deployment Hardware Adapters (one per support hardware type). The adapter is an implementation of the DHA API for a specific hardware. -* The Deployment Hardware Adapter configuration (dha.yaml). The DHA configuration specifies the hardware configuration in terms of number of nodes and includes both general properties and specific information for the hardware adapter (such as IPMI configuration, libvirt VM names etc). -* The Deployment Environment Adapter configuration (dea.yaml). The DEA configuration describes an actual Fuel deployment, complete with network settings, node roles, interface configurations and more. The nodes identities in the dea.yaml must line up with those in the dha.yaml. - -Both the dea.yaml and dha.yaml can be created from an existing Fuel deployment, in a way making a xerox copy of it for re-deployment. For this, the create_templates structure is copied to the Fuel master and the create_templates.sh is run there. - -In the examples/libvirt directory, VM and network definitions for libvirt together with matching dea.yaml and dha.yaml can be found. The DEA configuration is made using a opnfv-59 deployment. - -There is also a hybrid libirt/IPMI adapter with an example dea.yaml and dha.yaml for a small one controller + one compute deploy in examples/ipmi. - -The details and API description for DEA and DHA can be found in the documentation directory. - -See the READMEs in the examples dirctories to get going with a Fuel deployment for your environment - or write and contribute your own hardware adapter for your environment! - diff --git a/fuel/prototypes/auto-deploy/TODO.txt b/fuel/prototypes/auto-deploy/TODO.txt deleted file mode 100644 index 3dcdfb7a0..000000000 --- a/fuel/prototypes/auto-deploy/TODO.txt +++ /dev/null @@ -1,34 +0,0 @@ -*** FIXMEs can automatically be extracted from the code by running -*** list_fixmes.sh! - -In transplant2.sh, grafting can not operate on the DEA node ID but -must consider the DHA MAC address instead. It will work as long as -the interface setup on all nodes is identical or if the powerOnStrategy -of the dha.yaml is sequential but it needs to be fixed down the road. - -Fix the NTP server pointer on computes (currently fixed, needs to be -calculated - OPNFV clause). Alternatively, add data to feed into -pre-deploy in the dea.yaml. Or... Add the information requested from -the script into settings.yaml instead and make the pre-deploy script -only "refine" these settings? - -Move the network transformations out from the two compute: and -controller: clauses and add them to the individual nodes as well? -Potentially needed if e.g. a Cinder node is a separate node type! - -The release is currently hardcoded to Ubuntu, make in general. - -Investigate how to reliable detect that the kickstart has started - is -it possible to set the IP even when installation is made by cdrom and -trigger on that? See FIXME in install_iso.sh. - -The Fuel gateway in dea_getFuelGateway is always returning the .1 of -the Fuel IP - should be possible to use another scheme? - -Verify that nodes in DEA corresponds with nodes in DHA. - -Verify that API versions in DEA, DHA and API are aligned. - -Fix dhaParse and dheParse so they exit gracefully when parsing of YAML -file fails. - diff --git a/fuel/prototypes/auto-deploy/configs/ericsson_montreal/dea.yaml b/fuel/prototypes/auto-deploy/configs/ericsson_montreal/dea.yaml deleted file mode 100644 index d454bc573..000000000 --- a/fuel/prototypes/auto-deploy/configs/ericsson_montreal/dea.yaml +++ /dev/null @@ -1,983 +0,0 @@ -title: Deployment Environment Adapter (DEA) -# DEA API version supported -version: 1.1 -created: Tue May 5 15:33:07 UTC 2015 -comment: -nodes: -- id: 1 - interfaces: - eth0: - - fuelweb_admin - eth2: - - public - - management - - storage - - private - role: controller -- id: 2 - interfaces: - eth0: - - fuelweb_admin - eth2: - - public - - management - - storage - - private - role: compute -environment_mode: multinode -environment_name: Stefan3_auto -fuel: - ADMIN_NETWORK: - dhcp_pool_end: 10.30.0.254 - dhcp_pool_start: 10.30.0.3 - ipaddress: 10.30.0.2 - netmask: 255.255.255.0 - DNS_DOMAIN: opnfvericsson.ca - DNS_SEARCH: opnfvericsson.ca - DNS_UPSTREAM: 10.118.32.193 - FUEL_ACCESS: - password: admin - user: admin - HOSTNAME: mrberg-fuel - NTP1: 0.ca.pool.ntp.org - NTP2: 1.ca.pool.ntp.org - NTP3: 2.ca.pool.ntp.org -controller: -- action: add-br - name: br-eth0 -- action: add-port - bridge: br-eth0 - name: eth0 -- action: add-br - name: br-eth1 -- action: add-port - bridge: br-eth1 - name: eth1 -- action: add-br - name: br-eth2 -- action: add-port - bridge: br-eth2 - name: eth2 -- action: add-br - name: br-eth3 -- action: add-port - bridge: br-eth3 - name: eth3 -- action: add-br - name: br-eth4 -- action: add-port - bridge: br-eth4 - name: eth4 -- action: add-br - name: br-eth5 -- action: add-port - bridge: br-eth5 - name: eth5 -- action: add-br - name: br-ex -- action: add-br - name: br-mgmt -- action: add-br - name: br-storage -- action: add-br - name: br-fw-admin -- action: add-patch - bridges: - - br-eth2 - - br-storage - tags: - - 220 - - 0 - vlan_ids: - - 220 - - 0 -- action: add-patch - bridges: - - br-eth2 - - br-mgmt - tags: - - 320 - - 0 - vlan_ids: - - 320 - - 0 -- action: add-patch - bridges: - - br-eth0 - - br-fw-admin - trunks: - - 0 -- action: add-patch - bridges: - - br-eth2 - - br-ex - tags: - - 120 - - 0 - vlan_ids: - - 120 - - 0 -- action: add-br - name: br-prv -- action: add-patch - bridges: - - br-eth2 - - br-prv -compute: -- action: add-br - name: br-eth0 -- action: add-port - bridge: br-eth0 - name: eth0 -- action: add-br - name: br-eth1 -- action: add-port - bridge: br-eth1 - name: eth1 -- action: add-br - name: br-eth2 -- action: add-port - bridge: br-eth2 - name: eth2 -- action: add-br - name: br-eth3 -- action: add-port - bridge: br-eth3 - name: eth3 -- action: add-br - name: br-eth4 -- action: add-port - bridge: br-eth4 - name: eth4 -- action: add-br - name: br-eth5 -- action: add-port - bridge: br-eth5 - name: eth5 -- action: add-br - name: br-mgmt -- action: add-br - name: br-storage -- action: add-br - name: br-fw-admin -- action: add-patch - bridges: - - br-eth2 - - br-storage - tags: - - 220 - - 0 - vlan_ids: - - 220 - - 0 -- action: add-patch - bridges: - - br-eth2 - - br-mgmt - tags: - - 320 - - 0 - vlan_ids: - - 320 - - 0 -- action: add-patch - bridges: - - br-eth0 - - br-fw-admin - trunks: - - 0 -- action: add-br - name: br-prv -- action: add-patch - bridges: - - br-eth2 - - br-prv -opnfv: - compute: {} - controller: {} -network: - networking_parameters: - base_mac: fa:16:3e:00:00:00 - dns_nameservers: - - 10.118.32.193 - - 8.8.8.8 - floating_ranges: - - - 172.16.0.130 - - 172.16.0.254 - gre_id_range: - - 2 - - 65535 - internal_cidr: 192.168.111.0/24 - internal_gateway: 192.168.111.1 - net_l23_provider: ovs - segmentation_type: vlan - vlan_range: - - 2022 - - 2023 - networks: - - cidr: 172.16.0.0/24 - gateway: 172.16.0.1 - ip_ranges: - - - 172.16.0.2 - - 172.16.0.126 - meta: - assign_vip: true - cidr: 172.16.0.0/24 - configurable: true - floating_range_var: floating_ranges - ip_range: - - 172.16.0.2 - - 172.16.0.126 - map_priority: 1 - name: public - notation: ip_ranges - render_addr_mask: public - render_type: null - use_gateway: true - vlan_start: null - name: public - vlan_start: 120 - - cidr: 192.168.0.0/24 - gateway: null - ip_ranges: - - - 192.168.0.2 - - 192.168.0.254 - meta: - assign_vip: true - cidr: 192.168.0.0/24 - configurable: true - map_priority: 2 - name: management - notation: cidr - render_addr_mask: internal - render_type: cidr - use_gateway: false - vlan_start: 101 - name: management - vlan_start: 320 - - cidr: 192.168.1.0/24 - gateway: null - ip_ranges: - - - 192.168.1.2 - - 192.168.1.254 - meta: - assign_vip: false - cidr: 192.168.1.0/24 - configurable: true - map_priority: 2 - name: storage - notation: cidr - render_addr_mask: storage - render_type: cidr - use_gateway: false - vlan_start: 102 - name: storage - vlan_start: 220 - - cidr: null - gateway: null - ip_ranges: [] - meta: - assign_vip: false - configurable: false - map_priority: 2 - name: private - neutron_vlan_range: true - notation: null - render_addr_mask: null - render_type: null - seg_type: vlan - use_gateway: false - vlan_start: null - name: private - vlan_start: null - - cidr: 10.30.0.0/24 - gateway: null - ip_ranges: - - - 10.30.0.3 - - 10.30.0.254 - meta: - assign_vip: false - configurable: false - map_priority: 0 - notation: ip_ranges - render_addr_mask: null - render_type: null - unmovable: true - use_gateway: true - name: fuelweb_admin - vlan_start: null -settings: - editable: - access: - email: - description: Email address for Administrator - label: email - type: text - value: admin@localhost - weight: 40 - metadata: - label: Access - weight: 10 - password: - description: Password for Administrator - label: password - type: password - value: admin - weight: 20 - tenant: - description: Tenant (project) name for Administrator - label: tenant - regex: - error: Invalid tenant name - source: ^(?!services$)(?!nova$)(?!glance$)(?!keystone$)(?!neutron$)(?!cinder$)(?!swift$)(?!ceph$)(?![Gg]uest$).* - type: text - value: admin - weight: 30 - user: - description: Username for Administrator - label: username - regex: - error: Invalid username - source: ^(?!services$)(?!nova$)(?!glance$)(?!keystone$)(?!neutron$)(?!cinder$)(?!swift$)(?!ceph$)(?![Gg]uest$).* - type: text - value: admin - weight: 10 - additional_components: - ceilometer: - description: If selected, Ceilometer component will be installed - label: Install Ceilometer - type: checkbox - value: false - weight: 40 - heat: - description: '' - label: '' - type: hidden - value: true - weight: 30 - metadata: - label: Additional Components - weight: 20 - murano: - description: If selected, Murano component will be installed - label: Install Murano - restrictions: - - cluster:net_provider != 'neutron' - type: checkbox - value: false - weight: 20 - sahara: - description: If selected, Sahara component will be installed - label: Install Sahara - type: checkbox - value: false - weight: 10 - common: - auth_key: - description: Public key(s) to include in authorized_keys on deployed nodes - label: Public Key - type: text - value: '' - weight: 70 - auto_assign_floating_ip: - description: If selected, OpenStack will automatically assign a floating IP - to a new instance - label: Auto assign floating IP - restrictions: - - cluster:net_provider == 'neutron' - type: checkbox - value: false - weight: 40 - compute_scheduler_driver: - label: Scheduler driver - type: radio - value: nova.scheduler.filter_scheduler.FilterScheduler - values: - - data: nova.scheduler.filter_scheduler.FilterScheduler - description: Currently the most advanced OpenStack scheduler. See the OpenStack - documentation for details. - label: Filter scheduler - - data: nova.scheduler.simple.SimpleScheduler - description: This is 'naive' scheduler which tries to find the least loaded - host - label: Simple scheduler - weight: 40 - debug: - description: Debug logging mode provides more information, but requires more - disk space. - label: OpenStack debug logging - type: checkbox - value: false - weight: 20 - disable_offload: - description: If set, generic segmentation offload (gso) and generic receive - offload (gro) on physical nics will be disabled. See ethtool man. - label: Disable generic offload on physical nics - restrictions: - - action: hide - condition: cluster:net_provider == 'neutron' and networking_parameters:segmentation_type - == 'gre' - type: checkbox - value: true - weight: 80 - libvirt_type: - label: Hypervisor type - type: radio - value: kvm - values: - - data: kvm - description: Choose this type of hypervisor if you run OpenStack on hardware - label: KVM - restrictions: - - settings:common.libvirt_type.value == 'vcenter' - - data: qemu - description: Choose this type of hypervisor if you run OpenStack on virtual - hosts. - label: QEMU - restrictions: - - settings:common.libvirt_type.value == 'vcenter' - - data: vcenter - description: Choose this type of hypervisor if you run OpenStack in a vCenter - environment. - label: vCenter - restrictions: - - settings:common.libvirt_type.value != 'vcenter' or cluster:net_provider - == 'neutron' - weight: 30 - metadata: - label: Common - weight: 30 - nova_quota: - description: Quotas are used to limit CPU and memory usage for tenants. Enabling - quotas will increase load on the Nova database. - label: Nova quotas - type: checkbox - value: false - weight: 25 - resume_guests_state_on_host_boot: - description: Whether to resume previous guests state when the host reboots. - If enabled, this option causes guests assigned to the host to resume their - previous state. If the guest was running a restart will be attempted when - nova-compute starts. If the guest was not running previously, a restart - will not be attempted. - label: Resume guests state on host boot - type: checkbox - value: true - weight: 60 - use_cow_images: - description: For most cases you will want qcow format. If it's disabled, raw - image format will be used to run VMs. OpenStack with raw format currently - does not support snapshotting. - label: Use qcow format for images - type: checkbox - value: true - weight: 50 - corosync: - group: - description: '' - label: Group - type: text - value: 226.94.1.1 - weight: 10 - metadata: - label: Corosync - restrictions: - - action: hide - condition: 'true' - weight: 50 - port: - description: '' - label: Port - type: text - value: '12000' - weight: 20 - verified: - description: Set True only if multicast is configured correctly on router. - label: Need to pass network verification. - type: checkbox - value: false - weight: 10 - external_dns: - dns_list: - description: List of upstream DNS servers, separated by comma - label: DNS list - type: text - value: 10.118.32.193, 8.8.8.8 - weight: 10 - metadata: - label: Upstream DNS - weight: 90 - external_ntp: - metadata: - label: Upstream NTP - weight: 100 - ntp_list: - description: List of upstream NTP servers, separated by comma - label: NTP servers list - type: text - value: 0.pool.ntp.org, 1.pool.ntp.org - weight: 10 - kernel_params: - kernel: - description: Default kernel parameters - label: Initial parameters - type: text - value: console=ttyS0,9600 console=tty0 rootdelay=90 nomodeset - weight: 45 - metadata: - label: Kernel parameters - weight: 40 - neutron_mellanox: - metadata: - enabled: true - label: Mellanox Neutron components - toggleable: false - weight: 50 - plugin: - label: Mellanox drivers and SR-IOV plugin - type: radio - value: disabled - values: - - data: disabled - description: If selected, Mellanox drivers, Neutron and Cinder plugin will - not be installed. - label: Mellanox drivers and plugins disabled - restrictions: - - settings:storage.iser.value == true - - data: drivers_only - description: If selected, Mellanox Ethernet drivers will be installed to - support networking over Mellanox NIC. Mellanox Neutron plugin will not - be installed. - label: Install only Mellanox drivers - restrictions: - - settings:common.libvirt_type.value != 'kvm' - - data: ethernet - description: If selected, both Mellanox Ethernet drivers and Mellanox network - acceleration (Neutron) plugin will be installed. - label: Install Mellanox drivers and SR-IOV plugin - restrictions: - - settings:common.libvirt_type.value != 'kvm' or not (cluster:net_provider - == 'neutron' and networking_parameters:segmentation_type == 'vlan') - weight: 60 - vf_num: - description: Note that one virtual function will be reserved to the storage - network, in case of choosing iSER. - label: Number of virtual NICs - restrictions: - - settings:neutron_mellanox.plugin.value != 'ethernet' - type: text - value: '16' - weight: 70 - nsx_plugin: - connector_type: - description: Default network transport type to use - label: NSX connector type - type: select - value: stt - values: - - data: gre - label: GRE - - data: ipsec_gre - label: GRE over IPSec - - data: stt - label: STT - - data: ipsec_stt - label: STT over IPSec - - data: bridge - label: Bridge - weight: 80 - l3_gw_service_uuid: - description: UUID for the default L3 gateway service to use with this cluster - label: L3 service UUID - regex: - error: Invalid L3 gateway service UUID - source: '[a-f\d]{8}-[a-f\d]{4}-[a-f\d]{4}-[a-f\d]{4}-[a-f\d]{12}' - type: text - value: '' - weight: 50 - metadata: - enabled: false - label: VMware NSX - restrictions: - - action: hide - condition: cluster:net_provider != 'neutron' or networking_parameters:net_l23_provider - != 'nsx' - weight: 20 - nsx_controllers: - description: One or more IPv4[:port] addresses of NSX controller node, separated - by comma (e.g. 10.30.30.2,192.168.110.254:443) - label: NSX controller endpoint - regex: - error: Invalid controller endpoints, specify valid IPv4[:port] pair - source: ^(([\d]|[1-9][\d]|1[\d]{2}|2[0-4][\d]|25[0-5])\.){3}([\d]|[1-9][\d]|1[\d]{2}|2[0-4][\d]|25[0-5])(:(6553[0-5]|655[0-2][\d]|65[0-4][\d]{2}|6[0-4][\d]{3}|5[\d]{4}|[\d][\d]{0,3}))?(,(([\d]|[1-9][\d]|1[\d]{2}|2[0-4][\d]|25[0-5])\.){3}([\d]|[1-9][\d]|1[\d]{2}|2[0-4][\d]|25[0-5])(:(6553[0-5]|655[0-2][\d]|65[0-4][\d]{2}|6[0-4][\d]{3}|5[\d]{4}|[\d][\d]{0,3}))?)*$ - type: text - value: '' - weight: 60 - nsx_password: - description: Password for Administrator - label: NSX password - regex: - error: Empty password - source: \S - type: password - value: '' - weight: 30 - nsx_username: - description: NSX administrator's username - label: NSX username - regex: - error: Empty username - source: \S - type: text - value: admin - weight: 20 - packages_url: - description: URL to NSX specific packages - label: URL to NSX bits - regex: - error: Invalid URL, specify valid HTTP/HTTPS URL with IPv4 address (e.g. - http://10.20.0.2/nsx) - source: ^https?://(([\d]|[1-9][\d]|1[\d]{2}|2[0-4][\d]|25[0-5])\.){3}([\d]|[1-9][\d]|1[\d]{2}|2[0-4][\d]|25[0-5])(:(6553[0-5]|655[0-2][\d]|65[0-4][\d]{2}|6[0-4][\d]{3}|5[\d]{4}|[\d][\d]{0,3}))?(/.*)?$ - type: text - value: '' - weight: 70 - replication_mode: - description: '' - label: NSX cluster has Service nodes - type: checkbox - value: true - weight: 90 - transport_zone_uuid: - description: UUID of the pre-existing default NSX Transport zone - label: Transport zone UUID - regex: - error: Invalid transport zone UUID - source: '[a-f\d]{8}-[a-f\d]{4}-[a-f\d]{4}-[a-f\d]{4}-[a-f\d]{12}' - type: text - value: '' - weight: 40 - provision: - metadata: - label: Provision - restrictions: - - action: hide - condition: not ('experimental' in version:feature_groups) - weight: 80 - method: - description: Which provision method to use for this cluster. - label: Provision method - type: radio - value: cobbler - values: - - data: image - description: Copying pre-built images on a disk. - label: Image - - data: cobbler - description: Install from scratch using anaconda or debian-installer. - label: Classic (use anaconda or debian-installer) - public_network_assignment: - assign_to_all_nodes: - description: When disabled, public network will be assigned to controllers - and zabbix-server only - label: Assign public network to all nodes - type: checkbox - value: false - weight: 10 - metadata: - label: Public network assignment - restrictions: - - action: hide - condition: cluster:net_provider != 'neutron' - weight: 50 - storage: - ephemeral_ceph: - description: Configures Nova to store ephemeral volumes in RBD. This works - best if Ceph is enabled for volumes and images, too. Enables live migration - of all types of Ceph backed VMs (without this option, live migration will - only work with VMs launched from Cinder volumes). - label: Ceph RBD for ephemeral volumes (Nova) - restrictions: - - settings:common.libvirt_type.value == 'vcenter' - type: checkbox - value: false - weight: 75 - images_ceph: - description: Configures Glance to use the Ceph RBD backend to store images. - If enabled, this option will prevent Swift from installing. - label: Ceph RBD for images (Glance) - type: checkbox - value: false - weight: 30 - images_vcenter: - description: Configures Glance to use the vCenter/ESXi backend to store images. - If enabled, this option will prevent Swift from installing. - label: VMWare vCenter/ESXi datastore for images (Glance) - restrictions: - - settings:common.libvirt_type.value != 'vcenter' - type: checkbox - value: false - weight: 35 - iser: - description: 'High performance block storage: Cinder volumes over iSER protocol - (iSCSI over RDMA). This feature requires SR-IOV capabilities in the NIC, - and will use a dedicated virtual function for the storage network.' - label: iSER protocol for volumes (Cinder) - restrictions: - - settings:storage.volumes_lvm.value != true or settings:common.libvirt_type.value - != 'kvm' - type: checkbox - value: false - weight: 11 - metadata: - label: Storage - weight: 60 - objects_ceph: - description: Configures RadosGW front end for Ceph RBD. This exposes S3 and - Swift API Interfaces. If enabled, this option will prevent Swift from installing. - label: Ceph RadosGW for objects (Swift API) - restrictions: - - settings:storage.images_ceph.value == false - type: checkbox - value: false - weight: 80 - osd_pool_size: - description: Configures the default number of object replicas in Ceph. This - number must be equal to or lower than the number of deployed 'Storage - - Ceph OSD' nodes. - label: Ceph object replication factor - regex: - error: Invalid number - source: ^[1-9]\d*$ - restrictions: - - settings:common.libvirt_type.value == 'vcenter' - type: text - value: '2' - weight: 85 - vc_datacenter: - description: Inventory path to a datacenter. If you want to use ESXi host - as datastore, it should be "ha-datacenter". - label: Datacenter name - regex: - error: Empty datacenter - source: \S - restrictions: - - action: hide - condition: settings:storage.images_vcenter.value == false or settings:common.libvirt_type.value - != 'vcenter' - type: text - value: '' - weight: 65 - vc_datastore: - description: Datastore associated with the datacenter. - label: Datastore name - regex: - error: Empty datastore - source: \S - restrictions: - - action: hide - condition: settings:storage.images_vcenter.value == false or settings:common.libvirt_type.value - != 'vcenter' - type: text - value: '' - weight: 60 - vc_host: - description: IP Address of vCenter/ESXi - label: vCenter/ESXi IP - regex: - error: Specify valid IPv4 address - source: ^(([\d]|[1-9][\d]|1[\d]{2}|2[0-4][\d]|25[0-5])\.){3}([\d]|[1-9][\d]|1[\d]{2}|2[0-4][\d]|25[0-5])$ - restrictions: - - action: hide - condition: settings:storage.images_vcenter.value == false or settings:common.libvirt_type.value - != 'vcenter' - type: text - value: '' - weight: 45 - vc_image_dir: - description: The name of the directory where the glance images will be stored - in the VMware datastore. - label: Datastore Images directory - regex: - error: Empty images directory - source: \S - restrictions: - - action: hide - condition: settings:storage.images_vcenter.value == false or settings:common.libvirt_type.value - != 'vcenter' - type: text - value: /openstack_glance - weight: 70 - vc_password: - description: vCenter/ESXi admin password - label: Password - regex: - error: Empty password - source: \S - restrictions: - - action: hide - condition: settings:storage.images_vcenter.value == false or settings:common.libvirt_type.value - != 'vcenter' - type: password - value: '' - weight: 55 - vc_user: - description: vCenter/ESXi admin username - label: Username - regex: - error: Empty username - source: \S - restrictions: - - action: hide - condition: settings:storage.images_vcenter.value == false or settings:common.libvirt_type.value - != 'vcenter' - type: text - value: '' - weight: 50 - volumes_ceph: - description: Configures Cinder to store volumes in Ceph RBD images. - label: Ceph RBD for volumes (Cinder) - restrictions: - - settings:storage.volumes_lvm.value == true or settings:common.libvirt_type.value - == 'vcenter' - type: checkbox - value: false - weight: 20 - volumes_lvm: - description: Requires at least one Storage - Cinder LVM node. - label: Cinder LVM over iSCSI for volumes - restrictions: - - settings:storage.volumes_ceph.value == true - type: checkbox - value: false - weight: 10 - volumes_vmdk: - description: Configures Cinder to store volumes via VMware vCenter. - label: VMware vCenter for volumes (Cinder) - restrictions: - - settings:common.libvirt_type.value != 'vcenter' or settings:storage.volumes_lvm.value - == true - type: checkbox - value: false - weight: 15 - syslog: - metadata: - label: Syslog - weight: 50 - syslog_port: - description: Remote syslog port - label: Port - regex: - error: Invalid Syslog port - source: ^([1-9][0-9]{0,3}|[1-5][0-9]{4}|6[0-4][0-9]{3}|65[0-4][0-9]{2}|655[0-2][0-9]|6553[0-5])$ - type: text - value: '514' - weight: 20 - syslog_server: - description: Remote syslog hostname - label: Hostname - type: text - value: '' - weight: 10 - syslog_transport: - label: Syslog transport protocol - type: radio - value: tcp - values: - - data: udp - description: '' - label: UDP - - data: tcp - description: '' - label: TCP - weight: 30 - vcenter: - cluster: - description: vCenter cluster name. If you have multiple clusters, use comma - to separate names - label: Cluster - regex: - error: Invalid cluster list - source: ^([^,\ ]+([\ ]*[^,\ ])*)(,[^,\ ]+([\ ]*[^,\ ])*)*$ - type: text - value: '' - weight: 40 - datastore_regex: - description: The Datastore regexp setting specifies the data stores to use - with Compute. For example, "nas.*". If you want to use all available datastores, - leave this field blank - label: Datastore regexp - regex: - error: Invalid datastore regexp - source: ^(\S.*\S|\S|)$ - type: text - value: '' - weight: 50 - host_ip: - description: IP Address of vCenter - label: vCenter IP - regex: - error: Specify valid IPv4 address - source: ^(([\d]|[1-9][\d]|1[\d]{2}|2[0-4][\d]|25[0-5])\.){3}([\d]|[1-9][\d]|1[\d]{2}|2[0-4][\d]|25[0-5])$ - type: text - value: '' - weight: 10 - metadata: - label: vCenter - restrictions: - - action: hide - condition: settings:common.libvirt_type.value != 'vcenter' - weight: 20 - use_vcenter: - description: '' - label: '' - type: hidden - value: true - weight: 5 - vc_password: - description: vCenter admin password - label: Password - regex: - error: Empty password - source: \S - type: password - value: admin - weight: 30 - vc_user: - description: vCenter admin username - label: Username - regex: - error: Empty username - source: \S - type: text - value: admin - weight: 20 - vlan_interface: - description: Physical ESXi host ethernet adapter for VLAN networking (e.g. - vmnic1). If empty "vmnic0" is used by default - label: ESXi VLAN interface - restrictions: - - action: hide - condition: cluster:net_provider != 'nova_network' or networking_parameters:net_manager - != 'VlanManager' - type: text - value: '' - weight: 60 - zabbix: - metadata: - label: Zabbix Access - restrictions: - - action: hide - condition: not ('experimental' in version:feature_groups) - weight: 70 - password: - description: Password for Zabbix Administrator - label: password - type: password - value: zabbix - weight: 20 - username: - description: Username for Zabbix Administrator - label: username - type: text - value: admin - weight: 10 diff --git a/fuel/prototypes/auto-deploy/configs/lf_pod1/dea_ha.yaml b/fuel/prototypes/auto-deploy/configs/lf_pod1/dea_ha.yaml deleted file mode 100644 index 25de4b98e..000000000 --- a/fuel/prototypes/auto-deploy/configs/lf_pod1/dea_ha.yaml +++ /dev/null @@ -1,969 +0,0 @@ -title: Deployment Environment Adapter (DEA) -# DEA API version supported -version: 1.1 -created: Thu May 21 13:34:13 CEST 2015 -comment: HA deployment with Ceph -nodes: -- id: 1 - interfaces: - eth0: - - public - eth1: - - fuelweb_admin - - management - - storage - - private - role: ceph-osd,controller -- id: 2 - interfaces: - eth0: - - public - eth1: - - fuelweb_admin - - management - - storage - - private - role: ceph-osd,controller -- id: 3 - interfaces: - eth0: - - public - eth1: - - fuelweb_admin - - management - - storage - - private - role: ceph-osd,controller -- id: 4 - interfaces: - eth0: - - public - eth1: - - fuelweb_admin - - management - - storage - - private - role: ceph-osd,compute -- id: 5 - interfaces: - eth0: - - public - eth1: - - fuelweb_admin - - management - - storage - - private - role: ceph-osd,compute -environment_mode: ha -environment_name: auto_ceph -fuel: - ADMIN_NETWORK: - dhcp_pool_end: 10.20.255.254 - dhcp_pool_start: 10.20.0.3 - ipaddress: 10.20.0.2 - netmask: 255.255.0.0 - DNS_DOMAIN: domain.tld - DNS_SEARCH: domain.tld - DNS_UPSTREAM: 8.8.8.8 - FUEL_ACCESS: - password: admin - user: admin - HOSTNAME: fuel-64-ceph - NTP1: 0.pool.ntp.org - NTP2: 1.pool.ntp.org - NTP3: 2.pool.ntp.org -controller: -- action: add-br - name: br-eth0 -- action: add-port - bridge: br-eth0 - name: eth0 -- action: add-br - name: br-eth1 -- action: add-port - bridge: br-eth1 - name: eth1 -- action: add-br - name: br-ex -- action: add-br - name: br-mgmt -- action: add-br - name: br-storage -- action: add-br - name: br-fw-admin -- action: add-patch - bridges: - - br-eth1 - - br-storage - tags: - - 301 - - 0 - vlan_ids: - - 301 - - 0 -- action: add-patch - bridges: - - br-eth1 - - br-mgmt - tags: - - 300 - - 0 - vlan_ids: - - 300 - - 0 -- action: add-patch - bridges: - - br-eth1 - - br-fw-admin - trunks: - - 0 -- action: add-patch - bridges: - - br-eth0 - - br-ex - trunks: - - 0 -- action: add-br - name: br-prv -- action: add-patch - bridges: - - br-eth1 - - br-prv -compute: -- action: add-br - name: br-eth0 -- action: add-port - bridge: br-eth0 - name: eth0 -- action: add-br - name: br-eth1 -- action: add-port - bridge: br-eth1 - name: eth1 -- action: add-br - name: br-mgmt -- action: add-br - name: br-storage -- action: add-br - name: br-fw-admin -- action: add-patch - bridges: - - br-eth1 - - br-storage - tags: - - 301 - - 0 - vlan_ids: - - 301 - - 0 -- action: add-patch - bridges: - - br-eth1 - - br-mgmt - tags: - - 300 - - 0 - vlan_ids: - - 300 - - 0 -- action: add-patch - bridges: - - br-eth1 - - br-fw-admin - trunks: - - 0 -- action: add-br - name: br-prv -- action: add-patch - bridges: - - br-eth1 - - br-prv -opnfv: - compute: {} - controller: {} -network: - networking_parameters: - base_mac: fa:16:3e:00:00:00 - dns_nameservers: - - 8.8.4.4 - - 8.8.8.8 - floating_ranges: - - - 172.30.9.80 - - 172.30.9.89 - gre_id_range: - - 2 - - 65535 - internal_cidr: 192.168.111.0/24 - internal_gateway: 192.168.111.1 - net_l23_provider: ovs - segmentation_type: vlan - vlan_range: - - 1000 - - 1010 - networks: - - cidr: 172.30.9.0/24 - gateway: 172.30.9.1 - ip_ranges: - - - 172.30.9.70 - - 172.30.9.79 - meta: - assign_vip: true - cidr: 172.16.0.0/24 - configurable: true - floating_range_var: floating_ranges - ip_range: - - 172.16.0.2 - - 172.16.0.126 - map_priority: 1 - name: public - notation: ip_ranges - render_addr_mask: public - render_type: null - use_gateway: true - vlan_start: null - name: public - vlan_start: null - - cidr: 192.168.0.0/24 - gateway: null - ip_ranges: - - - 192.168.0.2 - - 192.168.0.254 - meta: - assign_vip: true - cidr: 192.168.0.0/24 - configurable: true - map_priority: 2 - name: management - notation: cidr - render_addr_mask: internal - render_type: cidr - use_gateway: false - vlan_start: 101 - name: management - vlan_start: 300 - - cidr: 192.168.1.0/24 - gateway: null - ip_ranges: - - - 192.168.1.2 - - 192.168.1.254 - meta: - assign_vip: false - cidr: 192.168.1.0/24 - configurable: true - map_priority: 2 - name: storage - notation: cidr - render_addr_mask: storage - render_type: cidr - use_gateway: false - vlan_start: 102 - name: storage - vlan_start: 301 - - cidr: null - gateway: null - ip_ranges: [] - meta: - assign_vip: false - configurable: false - map_priority: 2 - name: private - neutron_vlan_range: true - notation: null - render_addr_mask: null - render_type: null - seg_type: vlan - use_gateway: false - vlan_start: null - name: private - vlan_start: null - - cidr: 10.20.0.0/16 - gateway: null - ip_ranges: - - - 10.20.0.3 - - 10.20.255.254 - meta: - assign_vip: false - configurable: false - map_priority: 0 - notation: ip_ranges - render_addr_mask: null - render_type: null - unmovable: true - use_gateway: true - name: fuelweb_admin - vlan_start: null -settings: - editable: - access: - email: - description: Email address for Administrator - label: email - type: text - value: admin@localhost - weight: 40 - metadata: - label: Access - weight: 10 - password: - description: Password for Administrator - label: password - type: password - value: admin - weight: 20 - tenant: - description: Tenant (project) name for Administrator - label: tenant - regex: - error: Invalid tenant name - source: ^(?!services$)(?!nova$)(?!glance$)(?!keystone$)(?!neutron$)(?!cinder$)(?!swift$)(?!ceph$)(?![Gg]uest$).* - type: text - value: admin - weight: 30 - user: - description: Username for Administrator - label: username - regex: - error: Invalid username - source: ^(?!services$)(?!nova$)(?!glance$)(?!keystone$)(?!neutron$)(?!cinder$)(?!swift$)(?!ceph$)(?![Gg]uest$).* - type: text - value: admin - weight: 10 - additional_components: - ceilometer: - description: If selected, Ceilometer component will be installed - label: Install Ceilometer - type: checkbox - value: false - weight: 40 - heat: - description: '' - label: '' - type: hidden - value: true - weight: 30 - metadata: - label: Additional Components - weight: 20 - murano: - description: If selected, Murano component will be installed - label: Install Murano - restrictions: - - cluster:net_provider != 'neutron' - type: checkbox - value: false - weight: 20 - sahara: - description: If selected, Sahara component will be installed - label: Install Sahara - type: checkbox - value: false - weight: 10 - common: - auth_key: - description: Public key(s) to include in authorized_keys on deployed nodes - label: Public Key - type: text - value: '' - weight: 70 - auto_assign_floating_ip: - description: If selected, OpenStack will automatically assign a floating IP - to a new instance - label: Auto assign floating IP - restrictions: - - cluster:net_provider == 'neutron' - type: checkbox - value: false - weight: 40 - compute_scheduler_driver: - label: Scheduler driver - type: radio - value: nova.scheduler.filter_scheduler.FilterScheduler - values: - - data: nova.scheduler.filter_scheduler.FilterScheduler - description: Currently the most advanced OpenStack scheduler. See the OpenStack - documentation for details. - label: Filter scheduler - - data: nova.scheduler.simple.SimpleScheduler - description: This is 'naive' scheduler which tries to find the least loaded - host - label: Simple scheduler - weight: 40 - debug: - description: Debug logging mode provides more information, but requires more - disk space. - label: OpenStack debug logging - type: checkbox - value: false - weight: 20 - disable_offload: - description: If set, generic segmentation offload (gso) and generic receive - offload (gro) on physical nics will be disabled. See ethtool man. - label: Disable generic offload on physical nics - restrictions: - - action: hide - condition: cluster:net_provider == 'neutron' and networking_parameters:segmentation_type - == 'gre' - type: checkbox - value: true - weight: 80 - libvirt_type: - label: Hypervisor type - type: radio - value: kvm - values: - - data: kvm - description: Choose this type of hypervisor if you run OpenStack on hardware - label: KVM - restrictions: - - settings:common.libvirt_type.value == 'vcenter' - - data: qemu - description: Choose this type of hypervisor if you run OpenStack on virtual - hosts. - label: QEMU - restrictions: - - settings:common.libvirt_type.value == 'vcenter' - - data: vcenter - description: Choose this type of hypervisor if you run OpenStack in a vCenter - environment. - label: vCenter - restrictions: - - settings:common.libvirt_type.value != 'vcenter' or cluster:net_provider - == 'neutron' - weight: 30 - metadata: - label: Common - weight: 30 - nova_quota: - description: Quotas are used to limit CPU and memory usage for tenants. Enabling - quotas will increase load on the Nova database. - label: Nova quotas - type: checkbox - value: false - weight: 25 - resume_guests_state_on_host_boot: - description: Whether to resume previous guests state when the host reboots. - If enabled, this option causes guests assigned to the host to resume their - previous state. If the guest was running a restart will be attempted when - nova-compute starts. If the guest was not running previously, a restart - will not be attempted. - label: Resume guests state on host boot - type: checkbox - value: true - weight: 60 - use_cow_images: - description: For most cases you will want qcow format. If it's disabled, raw - image format will be used to run VMs. OpenStack with raw format currently - does not support snapshotting. - label: Use qcow format for images - type: checkbox - value: true - weight: 50 - corosync: - group: - description: '' - label: Group - type: text - value: 226.94.1.1 - weight: 10 - metadata: - label: Corosync - restrictions: - - action: hide - condition: 'true' - weight: 50 - port: - description: '' - label: Port - type: text - value: '12000' - weight: 20 - verified: - description: Set True only if multicast is configured correctly on router. - label: Need to pass network verification. - type: checkbox - value: false - weight: 10 - external_dns: - dns_list: - description: List of upstream DNS servers, separated by comma - label: DNS list - type: text - value: 8.8.8.8, 8.8.4.4 - weight: 10 - metadata: - label: Upstream DNS - weight: 90 - external_ntp: - metadata: - label: Upstream NTP - weight: 100 - ntp_list: - description: List of upstream NTP servers, separated by comma - label: NTP servers list - type: text - value: 0.pool.ntp.org, 1.pool.ntp.org - weight: 10 - kernel_params: - kernel: - description: Default kernel parameters - label: Initial parameters - type: text - value: console=ttyS0,9600 console=tty0 rootdelay=90 nomodeset - weight: 45 - metadata: - label: Kernel parameters - weight: 40 - neutron_mellanox: - metadata: - enabled: true - label: Mellanox Neutron components - toggleable: false - weight: 50 - plugin: - label: Mellanox drivers and SR-IOV plugin - type: radio - value: disabled - values: - - data: disabled - description: If selected, Mellanox drivers, Neutron and Cinder plugin will - not be installed. - label: Mellanox drivers and plugins disabled - restrictions: - - settings:storage.iser.value == true - - data: drivers_only - description: If selected, Mellanox Ethernet drivers will be installed to - support networking over Mellanox NIC. Mellanox Neutron plugin will not - be installed. - label: Install only Mellanox drivers - restrictions: - - settings:common.libvirt_type.value != 'kvm' - - data: ethernet - description: If selected, both Mellanox Ethernet drivers and Mellanox network - acceleration (Neutron) plugin will be installed. - label: Install Mellanox drivers and SR-IOV plugin - restrictions: - - settings:common.libvirt_type.value != 'kvm' or not (cluster:net_provider - == 'neutron' and networking_parameters:segmentation_type == 'vlan') - weight: 60 - vf_num: - description: Note that one virtual function will be reserved to the storage - network, in case of choosing iSER. - label: Number of virtual NICs - restrictions: - - settings:neutron_mellanox.plugin.value != 'ethernet' - type: text - value: '16' - weight: 70 - nsx_plugin: - connector_type: - description: Default network transport type to use - label: NSX connector type - type: select - value: stt - values: - - data: gre - label: GRE - - data: ipsec_gre - label: GRE over IPSec - - data: stt - label: STT - - data: ipsec_stt - label: STT over IPSec - - data: bridge - label: Bridge - weight: 80 - l3_gw_service_uuid: - description: UUID for the default L3 gateway service to use with this cluster - label: L3 service UUID - regex: - error: Invalid L3 gateway service UUID - source: '[a-f\d]{8}-[a-f\d]{4}-[a-f\d]{4}-[a-f\d]{4}-[a-f\d]{12}' - type: text - value: '' - weight: 50 - metadata: - enabled: false - label: VMware NSX - restrictions: - - action: hide - condition: cluster:net_provider != 'neutron' or networking_parameters:net_l23_provider - != 'nsx' - weight: 20 - nsx_controllers: - description: One or more IPv4[:port] addresses of NSX controller node, separated - by comma (e.g. 10.30.30.2,192.168.110.254:443) - label: NSX controller endpoint - regex: - error: Invalid controller endpoints, specify valid IPv4[:port] pair - source: ^(([\d]|[1-9][\d]|1[\d]{2}|2[0-4][\d]|25[0-5])\.){3}([\d]|[1-9][\d]|1[\d]{2}|2[0-4][\d]|25[0-5])(:(6553[0-5]|655[0-2][\d]|65[0-4][\d]{2}|6[0-4][\d]{3}|5[\d]{4}|[\d][\d]{0,3}))?(,(([\d]|[1-9][\d]|1[\d]{2}|2[0-4][\d]|25[0-5])\.){3}([\d]|[1-9][\d]|1[\d]{2}|2[0-4][\d]|25[0-5])(:(6553[0-5]|655[0-2][\d]|65[0-4][\d]{2}|6[0-4][\d]{3}|5[\d]{4}|[\d][\d]{0,3}))?)*$ - type: text - value: '' - weight: 60 - nsx_password: - description: Password for Administrator - label: NSX password - regex: - error: Empty password - source: \S - type: password - value: '' - weight: 30 - nsx_username: - description: NSX administrator's username - label: NSX username - regex: - error: Empty username - source: \S - type: text - value: admin - weight: 20 - packages_url: - description: URL to NSX specific packages - label: URL to NSX bits - regex: - error: Invalid URL, specify valid HTTP/HTTPS URL with IPv4 address (e.g. - http://10.20.0.2/nsx) - source: ^https?://(([\d]|[1-9][\d]|1[\d]{2}|2[0-4][\d]|25[0-5])\.){3}([\d]|[1-9][\d]|1[\d]{2}|2[0-4][\d]|25[0-5])(:(6553[0-5]|655[0-2][\d]|65[0-4][\d]{2}|6[0-4][\d]{3}|5[\d]{4}|[\d][\d]{0,3}))?(/.*)?$ - type: text - value: '' - weight: 70 - replication_mode: - description: '' - label: NSX cluster has Service nodes - type: checkbox - value: true - weight: 90 - transport_zone_uuid: - description: UUID of the pre-existing default NSX Transport zone - label: Transport zone UUID - regex: - error: Invalid transport zone UUID - source: '[a-f\d]{8}-[a-f\d]{4}-[a-f\d]{4}-[a-f\d]{4}-[a-f\d]{12}' - type: text - value: '' - weight: 40 - provision: - metadata: - label: Provision - restrictions: - - action: hide - condition: not ('experimental' in version:feature_groups) - weight: 80 - method: - description: Which provision method to use for this cluster. - label: Provision method - type: radio - value: cobbler - values: - - data: image - description: Copying pre-built images on a disk. - label: Image - - data: cobbler - description: Install from scratch using anaconda or debian-installer. - label: Classic (use anaconda or debian-installer) - public_network_assignment: - assign_to_all_nodes: - description: When disabled, public network will be assigned to controllers - and zabbix-server only - label: Assign public network to all nodes - type: checkbox - value: false - weight: 10 - metadata: - label: Public network assignment - restrictions: - - action: hide - condition: cluster:net_provider != 'neutron' - weight: 50 - storage: - ephemeral_ceph: - description: Configures Nova to store ephemeral volumes in RBD. This works - best if Ceph is enabled for volumes and images, too. Enables live migration - of all types of Ceph backed VMs (without this option, live migration will - only work with VMs launched from Cinder volumes). - label: Ceph RBD for ephemeral volumes (Nova) - restrictions: - - settings:common.libvirt_type.value == 'vcenter' - type: checkbox - value: true - weight: 75 - images_ceph: - description: Configures Glance to use the Ceph RBD backend to store images. - If enabled, this option will prevent Swift from installing. - label: Ceph RBD for images (Glance) - type: checkbox - value: true - weight: 30 - images_vcenter: - description: Configures Glance to use the vCenter/ESXi backend to store images. - If enabled, this option will prevent Swift from installing. - label: VMWare vCenter/ESXi datastore for images (Glance) - restrictions: - - settings:common.libvirt_type.value != 'vcenter' - type: checkbox - value: false - weight: 35 - iser: - description: 'High performance block storage: Cinder volumes over iSER protocol - (iSCSI over RDMA). This feature requires SR-IOV capabilities in the NIC, - and will use a dedicated virtual function for the storage network.' - label: iSER protocol for volumes (Cinder) - restrictions: - - settings:storage.volumes_lvm.value != true or settings:common.libvirt_type.value - != 'kvm' - type: checkbox - value: false - weight: 11 - metadata: - label: Storage - weight: 60 - objects_ceph: - description: Configures RadosGW front end for Ceph RBD. This exposes S3 and - Swift API Interfaces. If enabled, this option will prevent Swift from installing. - label: Ceph RadosGW for objects (Swift API) - restrictions: - - settings:storage.images_ceph.value == false - type: checkbox - value: false - weight: 80 - osd_pool_size: - description: Configures the default number of object replicas in Ceph. This - number must be equal to or lower than the number of deployed 'Storage - - Ceph OSD' nodes. - label: Ceph object replication factor - regex: - error: Invalid number - source: ^[1-9]\d*$ - restrictions: - - settings:common.libvirt_type.value == 'vcenter' - type: text - value: '2' - weight: 85 - vc_datacenter: - description: Inventory path to a datacenter. If you want to use ESXi host - as datastore, it should be "ha-datacenter". - label: Datacenter name - regex: - error: Empty datacenter - source: \S - restrictions: - - action: hide - condition: settings:storage.images_vcenter.value == false or settings:common.libvirt_type.value - != 'vcenter' - type: text - value: '' - weight: 65 - vc_datastore: - description: Datastore associated with the datacenter. - label: Datastore name - regex: - error: Empty datastore - source: \S - restrictions: - - action: hide - condition: settings:storage.images_vcenter.value == false or settings:common.libvirt_type.value - != 'vcenter' - type: text - value: '' - weight: 60 - vc_host: - description: IP Address of vCenter/ESXi - label: vCenter/ESXi IP - regex: - error: Specify valid IPv4 address - source: ^(([\d]|[1-9][\d]|1[\d]{2}|2[0-4][\d]|25[0-5])\.){3}([\d]|[1-9][\d]|1[\d]{2}|2[0-4][\d]|25[0-5])$ - restrictions: - - action: hide - condition: settings:storage.images_vcenter.value == false or settings:common.libvirt_type.value - != 'vcenter' - type: text - value: '' - weight: 45 - vc_image_dir: - description: The name of the directory where the glance images will be stored - in the VMware datastore. - label: Datastore Images directory - regex: - error: Empty images directory - source: \S - restrictions: - - action: hide - condition: settings:storage.images_vcenter.value == false or settings:common.libvirt_type.value - != 'vcenter' - type: text - value: /openstack_glance - weight: 70 - vc_password: - description: vCenter/ESXi admin password - label: Password - regex: - error: Empty password - source: \S - restrictions: - - action: hide - condition: settings:storage.images_vcenter.value == false or settings:common.libvirt_type.value - != 'vcenter' - type: password - value: '' - weight: 55 - vc_user: - description: vCenter/ESXi admin username - label: Username - regex: - error: Empty username - source: \S - restrictions: - - action: hide - condition: settings:storage.images_vcenter.value == false or settings:common.libvirt_type.value - != 'vcenter' - type: text - value: '' - weight: 50 - volumes_ceph: - description: Configures Cinder to store volumes in Ceph RBD images. - label: Ceph RBD for volumes (Cinder) - restrictions: - - settings:storage.volumes_lvm.value == true or settings:common.libvirt_type.value - == 'vcenter' - type: checkbox - value: true - weight: 20 - volumes_lvm: - description: Requires at least one Storage - Cinder LVM node. - label: Cinder LVM over iSCSI for volumes - restrictions: - - settings:storage.volumes_ceph.value == true - type: checkbox - value: false - weight: 10 - volumes_vmdk: - description: Configures Cinder to store volumes via VMware vCenter. - label: VMware vCenter for volumes (Cinder) - restrictions: - - settings:common.libvirt_type.value != 'vcenter' or settings:storage.volumes_lvm.value - == true - type: checkbox - value: false - weight: 15 - syslog: - metadata: - label: Syslog - weight: 50 - syslog_port: - description: Remote syslog port - label: Port - regex: - error: Invalid Syslog port - source: ^([1-9][0-9]{0,3}|[1-5][0-9]{4}|6[0-4][0-9]{3}|65[0-4][0-9]{2}|655[0-2][0-9]|6553[0-5])$ - type: text - value: '514' - weight: 20 - syslog_server: - description: Remote syslog hostname - label: Hostname - type: text - value: '' - weight: 10 - syslog_transport: - label: Syslog transport protocol - type: radio - value: tcp - values: - - data: udp - description: '' - label: UDP - - data: tcp - description: '' - label: TCP - weight: 30 - vcenter: - cluster: - description: vCenter cluster name. If you have multiple clusters, use comma - to separate names - label: Cluster - regex: - error: Invalid cluster list - source: ^([^,\ ]+([\ ]*[^,\ ])*)(,[^,\ ]+([\ ]*[^,\ ])*)*$ - type: text - value: '' - weight: 40 - datastore_regex: - description: The Datastore regexp setting specifies the data stores to use - with Compute. For example, "nas.*". If you want to use all available datastores, - leave this field blank - label: Datastore regexp - regex: - error: Invalid datastore regexp - source: ^(\S.*\S|\S|)$ - type: text - value: '' - weight: 50 - host_ip: - description: IP Address of vCenter - label: vCenter IP - regex: - error: Specify valid IPv4 address - source: ^(([\d]|[1-9][\d]|1[\d]{2}|2[0-4][\d]|25[0-5])\.){3}([\d]|[1-9][\d]|1[\d]{2}|2[0-4][\d]|25[0-5])$ - type: text - value: '' - weight: 10 - metadata: - label: vCenter - restrictions: - - action: hide - condition: settings:common.libvirt_type.value != 'vcenter' - weight: 20 - use_vcenter: - description: '' - label: '' - type: hidden - value: true - weight: 5 - vc_password: - description: vCenter admin password - label: Password - regex: - error: Empty password - source: \S - type: password - value: admin - weight: 30 - vc_user: - description: vCenter admin username - label: Username - regex: - error: Empty username - source: \S - type: text - value: admin - weight: 20 - vlan_interface: - description: Physical ESXi host ethernet adapter for VLAN networking (e.g. - vmnic1). If empty "vmnic0" is used by default - label: ESXi VLAN interface - restrictions: - - action: hide - condition: cluster:net_provider != 'nova_network' or networking_parameters:net_manager - != 'VlanManager' - type: text - value: '' - weight: 60 - zabbix: - metadata: - label: Zabbix Access - restrictions: - - action: hide - condition: not ('experimental' in version:feature_groups) - weight: 70 - password: - description: Password for Zabbix Administrator - label: password - type: password - value: zabbix - weight: 20 - username: - description: Username for Zabbix Administrator - label: username - type: text - value: admin - weight: 10 diff --git a/fuel/prototypes/auto-deploy/configs/lf_pod1/dea_no-ha.yaml b/fuel/prototypes/auto-deploy/configs/lf_pod1/dea_no-ha.yaml deleted file mode 100644 index 3abbdce93..000000000 --- a/fuel/prototypes/auto-deploy/configs/lf_pod1/dea_no-ha.yaml +++ /dev/null @@ -1,969 +0,0 @@ -title: Deployment Environment Adapter (DEA) -# DEA API version supported -version: 1.1 -created: Thu May 21 13:34:13 CEST 2015 -comment: No HA deployment with Ceph -nodes: -- id: 1 - interfaces: - eth0: - - public - eth1: - - fuelweb_admin - - management - - storage - - private - role: ceph-osd,controller -- id: 2 - interfaces: - eth0: - - public - eth1: - - fuelweb_admin - - management - - storage - - private - role: ceph-osd,compute -- id: 3 - interfaces: - eth0: - - public - eth1: - - fuelweb_admin - - management - - storage - - private - role: ceph-osd,compute -- id: 4 - interfaces: - eth0: - - public - eth1: - - fuelweb_admin - - management - - storage - - private - role: ceph-osd,compute -- id: 5 - interfaces: - eth0: - - public - eth1: - - fuelweb_admin - - management - - storage - - private - role: ceph-osd,compute -environment_mode: multinode -environment_name: auto_ceph_noha -fuel: - ADMIN_NETWORK: - dhcp_pool_end: 10.20.255.254 - dhcp_pool_start: 10.20.0.3 - ipaddress: 10.20.0.2 - netmask: 255.255.0.0 - DNS_DOMAIN: domain.tld - DNS_SEARCH: domain.tld - DNS_UPSTREAM: 8.8.8.8 - FUEL_ACCESS: - password: admin - user: admin - HOSTNAME: fuel-64-ceph - NTP1: 0.pool.ntp.org - NTP2: 1.pool.ntp.org - NTP3: 2.pool.ntp.org -controller: -- action: add-br - name: br-eth0 -- action: add-port - bridge: br-eth0 - name: eth0 -- action: add-br - name: br-eth1 -- action: add-port - bridge: br-eth1 - name: eth1 -- action: add-br - name: br-ex -- action: add-br - name: br-mgmt -- action: add-br - name: br-storage -- action: add-br - name: br-fw-admin -- action: add-patch - bridges: - - br-eth1 - - br-storage - tags: - - 301 - - 0 - vlan_ids: - - 301 - - 0 -- action: add-patch - bridges: - - br-eth1 - - br-mgmt - tags: - - 300 - - 0 - vlan_ids: - - 300 - - 0 -- action: add-patch - bridges: - - br-eth1 - - br-fw-admin - trunks: - - 0 -- action: add-patch - bridges: - - br-eth0 - - br-ex - trunks: - - 0 -- action: add-br - name: br-prv -- action: add-patch - bridges: - - br-eth1 - - br-prv -compute: -- action: add-br - name: br-eth0 -- action: add-port - bridge: br-eth0 - name: eth0 -- action: add-br - name: br-eth1 -- action: add-port - bridge: br-eth1 - name: eth1 -- action: add-br - name: br-mgmt -- action: add-br - name: br-storage -- action: add-br - name: br-fw-admin -- action: add-patch - bridges: - - br-eth1 - - br-storage - tags: - - 301 - - 0 - vlan_ids: - - 301 - - 0 -- action: add-patch - bridges: - - br-eth1 - - br-mgmt - tags: - - 300 - - 0 - vlan_ids: - - 300 - - 0 -- action: add-patch - bridges: - - br-eth1 - - br-fw-admin - trunks: - - 0 -- action: add-br - name: br-prv -- action: add-patch - bridges: - - br-eth1 - - br-prv -opnfv: - compute: {} - controller: {} -network: - networking_parameters: - base_mac: fa:16:3e:00:00:00 - dns_nameservers: - - 8.8.4.4 - - 8.8.8.8 - floating_ranges: - - - 172.30.9.80 - - 172.30.9.89 - gre_id_range: - - 2 - - 65535 - internal_cidr: 192.168.111.0/24 - internal_gateway: 192.168.111.1 - net_l23_provider: ovs - segmentation_type: vlan - vlan_range: - - 1000 - - 1010 - networks: - - cidr: 172.30.9.0/24 - gateway: 172.30.9.1 - ip_ranges: - - - 172.30.9.70 - - 172.30.9.79 - meta: - assign_vip: true - cidr: 172.16.0.0/24 - configurable: true - floating_range_var: floating_ranges - ip_range: - - 172.16.0.2 - - 172.16.0.126 - map_priority: 1 - name: public - notation: ip_ranges - render_addr_mask: public - render_type: null - use_gateway: true - vlan_start: null - name: public - vlan_start: null - - cidr: 192.168.0.0/24 - gateway: null - ip_ranges: - - - 192.168.0.2 - - 192.168.0.254 - meta: - assign_vip: true - cidr: 192.168.0.0/24 - configurable: true - map_priority: 2 - name: management - notation: cidr - render_addr_mask: internal - render_type: cidr - use_gateway: false - vlan_start: 101 - name: management - vlan_start: 300 - - cidr: 192.168.1.0/24 - gateway: null - ip_ranges: - - - 192.168.1.2 - - 192.168.1.254 - meta: - assign_vip: false - cidr: 192.168.1.0/24 - configurable: true - map_priority: 2 - name: storage - notation: cidr - render_addr_mask: storage - render_type: cidr - use_gateway: false - vlan_start: 102 - name: storage - vlan_start: 301 - - cidr: null - gateway: null - ip_ranges: [] - meta: - assign_vip: false - configurable: false - map_priority: 2 - name: private - neutron_vlan_range: true - notation: null - render_addr_mask: null - render_type: null - seg_type: vlan - use_gateway: false - vlan_start: null - name: private - vlan_start: null - - cidr: 10.20.0.0/16 - gateway: null - ip_ranges: - - - 10.20.0.3 - - 10.20.255.254 - meta: - assign_vip: false - configurable: false - map_priority: 0 - notation: ip_ranges - render_addr_mask: null - render_type: null - unmovable: true - use_gateway: true - name: fuelweb_admin - vlan_start: null -settings: - editable: - access: - email: - description: Email address for Administrator - label: email - type: text - value: admin@localhost - weight: 40 - metadata: - label: Access - weight: 10 - password: - description: Password for Administrator - label: password - type: password - value: admin - weight: 20 - tenant: - description: Tenant (project) name for Administrator - label: tenant - regex: - error: Invalid tenant name - source: ^(?!services$)(?!nova$)(?!glance$)(?!keystone$)(?!neutron$)(?!cinder$)(?!swift$)(?!ceph$)(?![Gg]uest$).* - type: text - value: admin - weight: 30 - user: - description: Username for Administrator - label: username - regex: - error: Invalid username - source: ^(?!services$)(?!nova$)(?!glance$)(?!keystone$)(?!neutron$)(?!cinder$)(?!swift$)(?!ceph$)(?![Gg]uest$).* - type: text - value: admin - weight: 10 - additional_components: - ceilometer: - description: If selected, Ceilometer component will be installed - label: Install Ceilometer - type: checkbox - value: false - weight: 40 - heat: - description: '' - label: '' - type: hidden - value: true - weight: 30 - metadata: - label: Additional Components - weight: 20 - murano: - description: If selected, Murano component will be installed - label: Install Murano - restrictions: - - cluster:net_provider != 'neutron' - type: checkbox - value: false - weight: 20 - sahara: - description: If selected, Sahara component will be installed - label: Install Sahara - type: checkbox - value: false - weight: 10 - common: - auth_key: - description: Public key(s) to include in authorized_keys on deployed nodes - label: Public Key - type: text - value: '' - weight: 70 - auto_assign_floating_ip: - description: If selected, OpenStack will automatically assign a floating IP - to a new instance - label: Auto assign floating IP - restrictions: - - cluster:net_provider == 'neutron' - type: checkbox - value: false - weight: 40 - compute_scheduler_driver: - label: Scheduler driver - type: radio - value: nova.scheduler.filter_scheduler.FilterScheduler - values: - - data: nova.scheduler.filter_scheduler.FilterScheduler - description: Currently the most advanced OpenStack scheduler. See the OpenStack - documentation for details. - label: Filter scheduler - - data: nova.scheduler.simple.SimpleScheduler - description: This is 'naive' scheduler which tries to find the least loaded - host - label: Simple scheduler - weight: 40 - debug: - description: Debug logging mode provides more information, but requires more - disk space. - label: OpenStack debug logging - type: checkbox - value: false - weight: 20 - disable_offload: - description: If set, generic segmentation offload (gso) and generic receive - offload (gro) on physical nics will be disabled. See ethtool man. - label: Disable generic offload on physical nics - restrictions: - - action: hide - condition: cluster:net_provider == 'neutron' and networking_parameters:segmentation_type - == 'gre' - type: checkbox - value: true - weight: 80 - libvirt_type: - label: Hypervisor type - type: radio - value: kvm - values: - - data: kvm - description: Choose this type of hypervisor if you run OpenStack on hardware - label: KVM - restrictions: - - settings:common.libvirt_type.value == 'vcenter' - - data: qemu - description: Choose this type of hypervisor if you run OpenStack on virtual - hosts. - label: QEMU - restrictions: - - settings:common.libvirt_type.value == 'vcenter' - - data: vcenter - description: Choose this type of hypervisor if you run OpenStack in a vCenter - environment. - label: vCenter - restrictions: - - settings:common.libvirt_type.value != 'vcenter' or cluster:net_provider - == 'neutron' - weight: 30 - metadata: - label: Common - weight: 30 - nova_quota: - description: Quotas are used to limit CPU and memory usage for tenants. Enabling - quotas will increase load on the Nova database. - label: Nova quotas - type: checkbox - value: false - weight: 25 - resume_guests_state_on_host_boot: - description: Whether to resume previous guests state when the host reboots. - If enabled, this option causes guests assigned to the host to resume their - previous state. If the guest was running a restart will be attempted when - nova-compute starts. If the guest was not running previously, a restart - will not be attempted. - label: Resume guests state on host boot - type: checkbox - value: true - weight: 60 - use_cow_images: - description: For most cases you will want qcow format. If it's disabled, raw - image format will be used to run VMs. OpenStack with raw format currently - does not support snapshotting. - label: Use qcow format for images - type: checkbox - value: true - weight: 50 - corosync: - group: - description: '' - label: Group - type: text - value: 226.94.1.1 - weight: 10 - metadata: - label: Corosync - restrictions: - - action: hide - condition: 'true' - weight: 50 - port: - description: '' - label: Port - type: text - value: '12000' - weight: 20 - verified: - description: Set True only if multicast is configured correctly on router. - label: Need to pass network verification. - type: checkbox - value: false - weight: 10 - external_dns: - dns_list: - description: List of upstream DNS servers, separated by comma - label: DNS list - type: text - value: 8.8.8.8, 8.8.4.4 - weight: 10 - metadata: - label: Upstream DNS - weight: 90 - external_ntp: - metadata: - label: Upstream NTP - weight: 100 - ntp_list: - description: List of upstream NTP servers, separated by comma - label: NTP servers list - type: text - value: 0.pool.ntp.org, 1.pool.ntp.org - weight: 10 - kernel_params: - kernel: - description: Default kernel parameters - label: Initial parameters - type: text - value: console=ttyS0,9600 console=tty0 rootdelay=90 nomodeset - weight: 45 - metadata: - label: Kernel parameters - weight: 40 - neutron_mellanox: - metadata: - enabled: true - label: Mellanox Neutron components - toggleable: false - weight: 50 - plugin: - label: Mellanox drivers and SR-IOV plugin - type: radio - value: disabled - values: - - data: disabled - description: If selected, Mellanox drivers, Neutron and Cinder plugin will - not be installed. - label: Mellanox drivers and plugins disabled - restrictions: - - settings:storage.iser.value == true - - data: drivers_only - description: If selected, Mellanox Ethernet drivers will be installed to - support networking over Mellanox NIC. Mellanox Neutron plugin will not - be installed. - label: Install only Mellanox drivers - restrictions: - - settings:common.libvirt_type.value != 'kvm' - - data: ethernet - description: If selected, both Mellanox Ethernet drivers and Mellanox network - acceleration (Neutron) plugin will be installed. - label: Install Mellanox drivers and SR-IOV plugin - restrictions: - - settings:common.libvirt_type.value != 'kvm' or not (cluster:net_provider - == 'neutron' and networking_parameters:segmentation_type == 'vlan') - weight: 60 - vf_num: - description: Note that one virtual function will be reserved to the storage - network, in case of choosing iSER. - label: Number of virtual NICs - restrictions: - - settings:neutron_mellanox.plugin.value != 'ethernet' - type: text - value: '16' - weight: 70 - nsx_plugin: - connector_type: - description: Default network transport type to use - label: NSX connector type - type: select - value: stt - values: - - data: gre - label: GRE - - data: ipsec_gre - label: GRE over IPSec - - data: stt - label: STT - - data: ipsec_stt - label: STT over IPSec - - data: bridge - label: Bridge - weight: 80 - l3_gw_service_uuid: - description: UUID for the default L3 gateway service to use with this cluster - label: L3 service UUID - regex: - error: Invalid L3 gateway service UUID - source: '[a-f\d]{8}-[a-f\d]{4}-[a-f\d]{4}-[a-f\d]{4}-[a-f\d]{12}' - type: text - value: '' - weight: 50 - metadata: - enabled: false - label: VMware NSX - restrictions: - - action: hide - condition: cluster:net_provider != 'neutron' or networking_parameters:net_l23_provider - != 'nsx' - weight: 20 - nsx_controllers: - description: One or more IPv4[:port] addresses of NSX controller node, separated - by comma (e.g. 10.30.30.2,192.168.110.254:443) - label: NSX controller endpoint - regex: - error: Invalid controller endpoints, specify valid IPv4[:port] pair - source: ^(([\d]|[1-9][\d]|1[\d]{2}|2[0-4][\d]|25[0-5])\.){3}([\d]|[1-9][\d]|1[\d]{2}|2[0-4][\d]|25[0-5])(:(6553[0-5]|655[0-2][\d]|65[0-4][\d]{2}|6[0-4][\d]{3}|5[\d]{4}|[\d][\d]{0,3}))?(,(([\d]|[1-9][\d]|1[\d]{2}|2[0-4][\d]|25[0-5])\.){3}([\d]|[1-9][\d]|1[\d]{2}|2[0-4][\d]|25[0-5])(:(6553[0-5]|655[0-2][\d]|65[0-4][\d]{2}|6[0-4][\d]{3}|5[\d]{4}|[\d][\d]{0,3}))?)*$ - type: text - value: '' - weight: 60 - nsx_password: - description: Password for Administrator - label: NSX password - regex: - error: Empty password - source: \S - type: password - value: '' - weight: 30 - nsx_username: - description: NSX administrator's username - label: NSX username - regex: - error: Empty username - source: \S - type: text - value: admin - weight: 20 - packages_url: - description: URL to NSX specific packages - label: URL to NSX bits - regex: - error: Invalid URL, specify valid HTTP/HTTPS URL with IPv4 address (e.g. - http://10.20.0.2/nsx) - source: ^https?://(([\d]|[1-9][\d]|1[\d]{2}|2[0-4][\d]|25[0-5])\.){3}([\d]|[1-9][\d]|1[\d]{2}|2[0-4][\d]|25[0-5])(:(6553[0-5]|655[0-2][\d]|65[0-4][\d]{2}|6[0-4][\d]{3}|5[\d]{4}|[\d][\d]{0,3}))?(/.*)?$ - type: text - value: '' - weight: 70 - replication_mode: - description: '' - label: NSX cluster has Service nodes - type: checkbox - value: true - weight: 90 - transport_zone_uuid: - description: UUID of the pre-existing default NSX Transport zone - label: Transport zone UUID - regex: - error: Invalid transport zone UUID - source: '[a-f\d]{8}-[a-f\d]{4}-[a-f\d]{4}-[a-f\d]{4}-[a-f\d]{12}' - type: text - value: '' - weight: 40 - provision: - metadata: - label: Provision - restrictions: - - action: hide - condition: not ('experimental' in version:feature_groups) - weight: 80 - method: - description: Which provision method to use for this cluster. - label: Provision method - type: radio - value: cobbler - values: - - data: image - description: Copying pre-built images on a disk. - label: Image - - data: cobbler - description: Install from scratch using anaconda or debian-installer. - label: Classic (use anaconda or debian-installer) - public_network_assignment: - assign_to_all_nodes: - description: When disabled, public network will be assigned to controllers - and zabbix-server only - label: Assign public network to all nodes - type: checkbox - value: false - weight: 10 - metadata: - label: Public network assignment - restrictions: - - action: hide - condition: cluster:net_provider != 'neutron' - weight: 50 - storage: - ephemeral_ceph: - description: Configures Nova to store ephemeral volumes in RBD. This works - best if Ceph is enabled for volumes and images, too. Enables live migration - of all types of Ceph backed VMs (without this option, live migration will - only work with VMs launched from Cinder volumes). - label: Ceph RBD for ephemeral volumes (Nova) - restrictions: - - settings:common.libvirt_type.value == 'vcenter' - type: checkbox - value: true - weight: 75 - images_ceph: - description: Configures Glance to use the Ceph RBD backend to store images. - If enabled, this option will prevent Swift from installing. - label: Ceph RBD for images (Glance) - type: checkbox - value: true - weight: 30 - images_vcenter: - description: Configures Glance to use the vCenter/ESXi backend to store images. - If enabled, this option will prevent Swift from installing. - label: VMWare vCenter/ESXi datastore for images (Glance) - restrictions: - - settings:common.libvirt_type.value != 'vcenter' - type: checkbox - value: false - weight: 35 - iser: - description: 'High performance block storage: Cinder volumes over iSER protocol - (iSCSI over RDMA). This feature requires SR-IOV capabilities in the NIC, - and will use a dedicated virtual function for the storage network.' - label: iSER protocol for volumes (Cinder) - restrictions: - - settings:storage.volumes_lvm.value != true or settings:common.libvirt_type.value - != 'kvm' - type: checkbox - value: false - weight: 11 - metadata: - label: Storage - weight: 60 - objects_ceph: - description: Configures RadosGW front end for Ceph RBD. This exposes S3 and - Swift API Interfaces. If enabled, this option will prevent Swift from installing. - label: Ceph RadosGW for objects (Swift API) - restrictions: - - settings:storage.images_ceph.value == false - type: checkbox - value: false - weight: 80 - osd_pool_size: - description: Configures the default number of object replicas in Ceph. This - number must be equal to or lower than the number of deployed 'Storage - - Ceph OSD' nodes. - label: Ceph object replication factor - regex: - error: Invalid number - source: ^[1-9]\d*$ - restrictions: - - settings:common.libvirt_type.value == 'vcenter' - type: text - value: '2' - weight: 85 - vc_datacenter: - description: Inventory path to a datacenter. If you want to use ESXi host - as datastore, it should be "ha-datacenter". - label: Datacenter name - regex: - error: Empty datacenter - source: \S - restrictions: - - action: hide - condition: settings:storage.images_vcenter.value == false or settings:common.libvirt_type.value - != 'vcenter' - type: text - value: '' - weight: 65 - vc_datastore: - description: Datastore associated with the datacenter. - label: Datastore name - regex: - error: Empty datastore - source: \S - restrictions: - - action: hide - condition: settings:storage.images_vcenter.value == false or settings:common.libvirt_type.value - != 'vcenter' - type: text - value: '' - weight: 60 - vc_host: - description: IP Address of vCenter/ESXi - label: vCenter/ESXi IP - regex: - error: Specify valid IPv4 address - source: ^(([\d]|[1-9][\d]|1[\d]{2}|2[0-4][\d]|25[0-5])\.){3}([\d]|[1-9][\d]|1[\d]{2}|2[0-4][\d]|25[0-5])$ - restrictions: - - action: hide - condition: settings:storage.images_vcenter.value == false or settings:common.libvirt_type.value - != 'vcenter' - type: text - value: '' - weight: 45 - vc_image_dir: - description: The name of the directory where the glance images will be stored - in the VMware datastore. - label: Datastore Images directory - regex: - error: Empty images directory - source: \S - restrictions: - - action: hide - condition: settings:storage.images_vcenter.value == false or settings:common.libvirt_type.value - != 'vcenter' - type: text - value: /openstack_glance - weight: 70 - vc_password: - description: vCenter/ESXi admin password - label: Password - regex: - error: Empty password - source: \S - restrictions: - - action: hide - condition: settings:storage.images_vcenter.value == false or settings:common.libvirt_type.value - != 'vcenter' - type: password - value: '' - weight: 55 - vc_user: - description: vCenter/ESXi admin username - label: Username - regex: - error: Empty username - source: \S - restrictions: - - action: hide - condition: settings:storage.images_vcenter.value == false or settings:common.libvirt_type.value - != 'vcenter' - type: text - value: '' - weight: 50 - volumes_ceph: - description: Configures Cinder to store volumes in Ceph RBD images. - label: Ceph RBD for volumes (Cinder) - restrictions: - - settings:storage.volumes_lvm.value == true or settings:common.libvirt_type.value - == 'vcenter' - type: checkbox - value: true - weight: 20 - volumes_lvm: - description: Requires at least one Storage - Cinder LVM node. - label: Cinder LVM over iSCSI for volumes - restrictions: - - settings:storage.volumes_ceph.value == true - type: checkbox - value: false - weight: 10 - volumes_vmdk: - description: Configures Cinder to store volumes via VMware vCenter. - label: VMware vCenter for volumes (Cinder) - restrictions: - - settings:common.libvirt_type.value != 'vcenter' or settings:storage.volumes_lvm.value - == true - type: checkbox - value: false - weight: 15 - syslog: - metadata: - label: Syslog - weight: 50 - syslog_port: - description: Remote syslog port - label: Port - regex: - error: Invalid Syslog port - source: ^([1-9][0-9]{0,3}|[1-5][0-9]{4}|6[0-4][0-9]{3}|65[0-4][0-9]{2}|655[0-2][0-9]|6553[0-5])$ - type: text - value: '514' - weight: 20 - syslog_server: - description: Remote syslog hostname - label: Hostname - type: text - value: '' - weight: 10 - syslog_transport: - label: Syslog transport protocol - type: radio - value: tcp - values: - - data: udp - description: '' - label: UDP - - data: tcp - description: '' - label: TCP - weight: 30 - vcenter: - cluster: - description: vCenter cluster name. If you have multiple clusters, use comma - to separate names - label: Cluster - regex: - error: Invalid cluster list - source: ^([^,\ ]+([\ ]*[^,\ ])*)(,[^,\ ]+([\ ]*[^,\ ])*)*$ - type: text - value: '' - weight: 40 - datastore_regex: - description: The Datastore regexp setting specifies the data stores to use - with Compute. For example, "nas.*". If you want to use all available datastores, - leave this field blank - label: Datastore regexp - regex: - error: Invalid datastore regexp - source: ^(\S.*\S|\S|)$ - type: text - value: '' - weight: 50 - host_ip: - description: IP Address of vCenter - label: vCenter IP - regex: - error: Specify valid IPv4 address - source: ^(([\d]|[1-9][\d]|1[\d]{2}|2[0-4][\d]|25[0-5])\.){3}([\d]|[1-9][\d]|1[\d]{2}|2[0-4][\d]|25[0-5])$ - type: text - value: '' - weight: 10 - metadata: - label: vCenter - restrictions: - - action: hide - condition: settings:common.libvirt_type.value != 'vcenter' - weight: 20 - use_vcenter: - description: '' - label: '' - type: hidden - value: true - weight: 5 - vc_password: - description: vCenter admin password - label: Password - regex: - error: Empty password - source: \S - type: password - value: admin - weight: 30 - vc_user: - description: vCenter admin username - label: Username - regex: - error: Empty username - source: \S - type: text - value: admin - weight: 20 - vlan_interface: - description: Physical ESXi host ethernet adapter for VLAN networking (e.g. - vmnic1). If empty "vmnic0" is used by default - label: ESXi VLAN interface - restrictions: - - action: hide - condition: cluster:net_provider != 'nova_network' or networking_parameters:net_manager - != 'VlanManager' - type: text - value: '' - weight: 60 - zabbix: - metadata: - label: Zabbix Access - restrictions: - - action: hide - condition: not ('experimental' in version:feature_groups) - weight: 70 - password: - description: Password for Zabbix Administrator - label: password - type: password - value: zabbix - weight: 20 - username: - description: Username for Zabbix Administrator - label: username - type: text - value: admin - weight: 10 diff --git a/fuel/prototypes/auto-deploy/configs/lf_pod1/dha.yaml b/fuel/prototypes/auto-deploy/configs/lf_pod1/dha.yaml deleted file mode 100644 index 9d02f5ce6..000000000 --- a/fuel/prototypes/auto-deploy/configs/lf_pod1/dha.yaml +++ /dev/null @@ -1,66 +0,0 @@ -title: Deployment Hardware Adapter (DHA) -# DHA API version supported -version: 1.1 -created: Fri May 8 08:03:49 UTC 2015 -comment: Config for LF Pod1 - -# Adapter to use for this definition -adapter: ipmi - -# Node list. -# Mandatory properties are id and role. -# The MAC address of the PXE boot interface for Fuel is not -# mandatory to be defined. -# All other properties are adapter specific. - -nodes: -- id: 1 - pxeMac: 00:25:b5:b0:00:ef - ipmiIp: 172.30.8.69 - ipmiUser: admin - ipmiPass: octopus -- id: 2 - pxeMac: 00:25:b5:b0:00:cf - ipmiIp: 172.30.8.78 - ipmiUser: admin - ipmiPass: octopus -- id: 3 - pxeMac: 00:25:b5:b0:00:8f - ipmiIp: 172.30.8.68 - ipmiUser: admin - ipmiPass: octopus -- id: 4 - pxeMac: 00:25:b5:b0:00:6f - ipmiIp: 172.30.8.77 - ipmiUser: admin - ipmiPass: octopus -- id: 5 - pxeMac: 00:25:b5:b0:00:4f - ipmiIp: 172.30.8.67 - ipmiUser: admin - ipmiPass: octopus -# Adding the Fuel node as node id 6 which may not be correct - please -# adjust as needed. -- id: 6 - pxeMac: 52:54:00:dd:9c:43 - libvirtName: fuel-opnfv - isFuel: yes - -# Deployment power on strategy -# all: Turn on all nodes at once. There will be no correlation -# between the DHA and DEA node numbering. MAC addresses -# will be used to select the node roles though. -# sequence: Turn on the nodes in sequence starting with the lowest order -# node and wait for the node to be detected by Fuel. Not until -# the node has been detected and assigned a role will the next -# node be turned on. -powerOnStrategy: sequence - -# If fuelCustomInstall is set to true, Fuel is assumed to be installed by -# calling the DHA adapter function "dha_fuelCustomInstall()" with two -# arguments: node ID and the ISO file name to deploy. The custom install -# function is then to handle all necessary logic to boot the Fuel master -# from the ISO and then return. -# Allowed values: true, false - -fuelCustomInstall: true diff --git a/fuel/prototypes/auto-deploy/configs/lf_pod1/fuel-opnfv.xml b/fuel/prototypes/auto-deploy/configs/lf_pod1/fuel-opnfv.xml deleted file mode 100644 index c121c3aae..000000000 --- a/fuel/prototypes/auto-deploy/configs/lf_pod1/fuel-opnfv.xml +++ /dev/null @@ -1,132 +0,0 @@ -<domain type='kvm' id='13'> - <name>fuel-opnfv</name> - <uuid>de9d18ee-afc3-4b5a-8ede-3a007ffb3c2f</uuid> - <memory unit='KiB'>4194304</memory> - <currentMemory unit='KiB'>4194304</currentMemory> - <vcpu placement='static'>4</vcpu> - <resource> - <partition>/machine</partition> - </resource> - <os> - <type arch='x86_64' machine='pc-i440fx-rhel7.0.0'>hvm</type> - <boot dev='hd'/> - <boot dev='cdrom'/> - <bootmenu enable='yes'/> - </os> - <features> - <acpi/> - <apic/> - <pae/> - </features> - <cpu mode='custom' match='exact'> - <model fallback='allow'>SandyBridge</model> - </cpu> - <clock offset='utc'> - <timer name='rtc' tickpolicy='catchup'/> - <timer name='pit' tickpolicy='delay'/> - <timer name='hpet' present='no'/> - </clock> - <on_poweroff>destroy</on_poweroff> - <on_reboot>restart</on_reboot> - <on_crash>restart</on_crash> - <pm> - <suspend-to-mem enabled='no'/> - <suspend-to-disk enabled='no'/> - </pm> - <devices> - <emulator>/usr/libexec/qemu-kvm</emulator> - <disk type='file' device='disk'> - <driver name='qemu' type='raw'/> - <source file='/home/images/fuel-opnfv.raw'/> - <backingStore/> - <target dev='vda' bus='virtio'/> - <alias name='virtio-disk0'/> - <address type='pci' domain='0x0000' bus='0x00' slot='0x09' function='0x0'/> - </disk> - <disk type='file' device='cdrom'> - <driver name='qemu' type='raw'/> - <source file='/root/fueltmp/deploy-opnfv-64.iso'/> - <backingStore/> - <target dev='hdb' bus='ide' tray='open'/> - <readonly/> - <alias name='ide0-0-1'/> - <address type='drive' controller='0' bus='0' target='0' unit='1'/> - </disk> - <controller type='usb' index='0' model='ich9-ehci1'> - <alias name='usb0'/> - <address type='pci' domain='0x0000' bus='0x00' slot='0x05' function='0x7'/> - </controller> - <controller type='usb' index='0' model='ich9-uhci1'> - <alias name='usb0'/> - <master startport='0'/> - <address type='pci' domain='0x0000' bus='0x00' slot='0x05' function='0x0' multifunction='on'/> - </controller> - <controller type='usb' index='0' model='ich9-uhci2'> - <alias name='usb0'/> - <master startport='2'/> - <address type='pci' domain='0x0000' bus='0x00' slot='0x05' function='0x1'/> - </controller> - <controller type='usb' index='0' model='ich9-uhci3'> - <alias name='usb0'/> - <master startport='4'/> - <address type='pci' domain='0x0000' bus='0x00' slot='0x05' function='0x2'/> - </controller> - <controller type='pci' index='0' model='pci-root'> - <alias name='pci.0'/> - </controller> - <controller type='ide' index='0'> - <alias name='ide0'/> - <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x1'/> - </controller> - <controller type='virtio-serial' index='0'> - <alias name='virtio-serial0'/> - <address type='pci' domain='0x0000' bus='0x00' slot='0x06' function='0x0'/> - </controller> - <interface type='bridge'> - <mac address='52:54:00:dd:9c:43'/> - <source bridge='pxebr'/> - <target dev='vnet0'/> - <model type='virtio'/> - <alias name='net0'/> - <address type='pci' domain='0x0000' bus='0x00' slot='0x08' function='0x0'/> - </interface> - <serial type='pty'> - <source path='/dev/pts/2'/> - <target port='0'/> - <alias name='serial0'/> - </serial> - <console type='pty' tty='/dev/pts/2'> - <source path='/dev/pts/2'/> - <target type='serial' port='0'/> - <alias name='serial0'/> - </console> - <channel type='spicevmc'> - <target type='virtio' name='com.redhat.spice.0' state='disconnected'/> - <alias name='channel0'/> - <address type='virtio-serial' controller='0' bus='0' port='1'/> - </channel> - <input type='mouse' bus='ps2'/> - <input type='keyboard' bus='ps2'/> - <graphics type='spice' port='5900' autoport='yes' listen='127.0.0.1'> - <listen type='address' address='127.0.0.1'/> - </graphics> - <sound model='ich6'> - <alias name='sound0'/> - <address type='pci' domain='0x0000' bus='0x00' slot='0x04' function='0x0'/> - </sound> - <video> - <model type='qxl' ram='65536' vram='65536' vgamem='16384' heads='1'/> - <alias name='video0'/> - <address type='pci' domain='0x0000' bus='0x00' slot='0x02' function='0x0'/> - </video> - <memballoon model='virtio'> - <alias name='balloon0'/> - <address type='pci' domain='0x0000' bus='0x00' slot='0x07' function='0x0'/> - </memballoon> - </devices> - <seclabel type='dynamic' model='selinux' relabel='yes'> - <label>system_u:system_r:svirt_t:s0:c28,c552</label> - <imagelabel>system_u:object_r:svirt_image_t:s0:c28,c552</imagelabel> - </seclabel> -</domain> - diff --git a/fuel/prototypes/auto-deploy/configs/lf_pod1/jump1_networking.txt b/fuel/prototypes/auto-deploy/configs/lf_pod1/jump1_networking.txt deleted file mode 100644 index cf385639c..000000000 --- a/fuel/prototypes/auto-deploy/configs/lf_pod1/jump1_networking.txt +++ /dev/null @@ -1,4 +0,0 @@ -bridge name bridge id STP enabled interfaces -br0 8000.0025b5a0008f no enp8s0.0 -pxebr 8000.0025b5b000ff no enp7s0.0 -virbr0 8000.525400e134af yes virbr0-nic diff --git a/fuel/prototypes/auto-deploy/create_templates/create_templates.sh b/fuel/prototypes/auto-deploy/create_templates/create_templates.sh deleted file mode 100755 index 8a43930cd..000000000 --- a/fuel/prototypes/auto-deploy/create_templates/create_templates.sh +++ /dev/null @@ -1,189 +0,0 @@ -#!/bin/bash -############################################################################## -# Copyright (c) 2015 Ericsson AB and others. -# stefan.k.berg@ericsson.com -# jonas.bjurel@ericsson.com -# All rights reserved. This program and the accompanying materials -# are made available under the terms of the Apache License, Version 2.0 -# which accompanies this distribution, and is available at -# http://www.apache.org/licenses/LICENSE-2.0 -############################################################################## - -cleanup () { - if [ -n "$tmpDir" ]; then - rm -Rf $tmpDir - fi -} - -trap cleanup exit - -error_exit () { - echo "Error: $@" >&2 - exit 1 -} - -tmpDir=`mktemp -d /tmp/deaXXXX` - -export PATH=`dirname $0`:$PATH - -if [ $# -lt 2 ]; then - error_exit "`basename $0`: <deafile> <dhafile> <comment>" -fi - -deafile=$1 -dhafile=$2 -shift 2 - -if [ $# -ne 0 ]; then - comment="$@" -else - comment="" -fi - -if [ -f $deafile ]; then - error_exit "$deafile already exists" -elif [ -f $dhafile ]; then - error_exit "$dhafile already exists" -fi - -# Create headers - -cat >$deafile << EOF -title: Deployment Environment Adapter (DEA) -# DEA API version supported -version: 1.1 -created: `date` -comment: $comment -EOF - -cat >$dhafile << EOF -title: Deployment Hardware Adapter (DHA) -# DHA API version supported -version: 1.1 -created: `date` -comment: $comment - -# Adapter to use for this definition -adapter: - -# Node list. -# Mandatory properties are id and role. -# The MAC address of the PXE boot interface for Fuel is not -# mandatory to be defined. -# All other properties are adapter specific. - -EOF - -if [ `fuel env | tail -n +3 | grep -v '^$' | wc -l` -ne 1 ]; then - error_exit "Not exactly one environment" -fi -envId=`fuel env | tail -n +3 | grep -v '^$' | awk '{ print $1 }'` - -computeId=`fuel node | grep compute | grep True | head -1 | awk '{ print $1}'` -controllerId=`fuel node | grep controller | grep True | head -1 | awk '{ print $1}'` - -if [ -z "$computeId" ]; then - error_exit "Could not find any compute node" -elif [ -z "$controllerId" ]; then - error_exit "Could not find any controller node" -fi - -fuel deployment --env $envId --download --dir $tmpDir > /dev/null || \ - error_exit "Could not get deployment info" -fuel settings --env $envId --download --dir $tmpDir > /dev/null || \ - error_exit "Could not get settings" -fuel network --env $envId --download --dir $tmpDir > /dev/null || \ - error_exit "Could not get network settings" - -# Create node structure for DEA mapping to the DHA -# Note! Nodes will be renumbered to always start with id 1 -echo "nodes:" >> $deafile -echo "nodes:" >> $dhafile -minNode=`fuel node | tail -n +3 | sed 's/ .*//' | sort -n | head -1` -for realNodeId in `fuel node | tail -n +3 | sed 's/ .*//' | sort -n` -do - nodeId=$[realNodeId - minNode + 1] - role=`fuel node --node-id $realNodeId | tail -n +3 | cut -d "|" -f 7 | sed 's/ //g'` || \ - error_exit "Could not get role for node $realNodeId" - - if [ -z "$role" ]; then - error_exit "Node $realNodeId has no role - is this environment really deployed?" - fi - - fuel node --node-id $realNodeId --network --download --dir $tmpDir > /dev/null || \ - error_exit "Could not get network info for node $controllerId" - - generate_node_info.py $nodeId $role $tmpDir/node_${realNodeId}/interfaces.yaml $dhafile | \ - grep -v "^nodes:" >> $deafile || \ - error_exit "Could not extract info for node $realNodeId" -done - -cat >>$dhafile <<EOF -# Adding the Fuel node as node id $[nodeId + 1] which may not be correct - please -# adjust as needed. -EOF -generate_fuel_node_info.py $[nodeId +1] $dhafile || \ - error_exit "Could not extract info for the Fuel node" - -# Environment mode -echo "environment_mode: `fuel env | tail -n +3 | cut -d "|" -f 4 | sed 's/ //g' | sed 's/ha_compact/ha/'`" \ - >>$deafile || error_exit "Could not get environment mode" - -echo "environment_name: `fuel env | tail -n +3 | cut -d "|" -f 3 | sed 's/ //g'`" \ - >>$deafile || error_exit "Could not get environment mode" - -reap_fuel_settings.py $deafile fuel || \ - error_exit "Could not extract Fuel node settings" - -# TODO: Potentially move the network scheme into each node of the DEA nodes structure -# TODO: instead (this may be too generic to support all node types) -reap_network_scheme.py $tmpDir/deployment_${envId}/*controller_${controllerId}.yaml \ - $deafile controller || error_exit "Could not extract network scheme for controller" - -# TODO: Potentially move the network scheme into each node of the DEA nodes structure -# TODO: instead (this may be too generic to support all node types) -reap_network_scheme.py $tmpDir/deployment_${envId}/compute_${computeId}.yaml $deafile \ - compute || error_exit "Could not extract network scheme for compute" - -reap_opnfv_astute.py $tmpDir/deployment_${envId}/*controller_${controllerId}.yaml \ - $tmpDir/deployment_${envId}/compute_${computeId}.yaml ${deafile} || \ - error_exit "Could not extract opnfv info from astute" - -reap_network_settings.py $tmpDir/network_${envId}.yaml $deafile network || \ - error_exit "Could not extract network settings" - - -reap_settings.py $tmpDir/settings_${envId}.yaml $deafile settings || \ - error_exit "Could not extract settings" - -# Last part of the DHA file -cat >>$dhafile << EOF - -# Deployment power on strategy -# all: Turn on all nodes at once. There will be no correlation -# between the DHA and DEA node numbering. MAC addresses -# will be used to select the node roles though. -# sequence: Turn on the nodes in sequence starting with the lowest order -# node and wait for the node to be detected by Fuel. Not until -# the node has been detected and assigned a role will the next -# node be turned on. -powerOnStrategy: sequence - -# If fuelCustomInstall is set to true, Fuel is assumed to be installed by -# calling the DHA adapter function "dha_fuelCustomInstall()" with two -# arguments: node ID and the ISO file name to deploy. The custom install -# function is then to handle all necessary logic to boot the Fuel master -# from the ISO and then return. -# Allowed values: true, false - -fuelCustomInstall: false -EOF - -# Cleanup due to a currently unknown Fuel behavior adding this -# output at certain stages, this information should not be present: -sed -i '/ management_vip: ' $deafile -sed -i '/ public_vip: ' $deafile - - -echo "DEA file is available at $deafile" -echo "DHA file is available at $dhafile (this is just a template)" diff --git a/fuel/prototypes/auto-deploy/create_templates/generate_fuel_node_info.py b/fuel/prototypes/auto-deploy/create_templates/generate_fuel_node_info.py deleted file mode 100755 index 845d2ab5b..000000000 --- a/fuel/prototypes/auto-deploy/create_templates/generate_fuel_node_info.py +++ /dev/null @@ -1,36 +0,0 @@ -#!/usr/bin/python -############################################################################## -# Copyright (c) 2015 Ericsson AB and others. -# stefan.k.berg@ericsson.com -# jonas.bjurel@ericsson.com -# All rights reserved. This program and the accompanying materials -# are made available under the terms of the Apache License, Version 2.0 -# which accompanies this distribution, and is available at -# http://www.apache.org/licenses/LICENSE-2.0 -############################################################################## - -import yaml -import re -import sys -import os - -if len(sys.argv) != 3: - sys.stderr.write("Usage: "+sys.argv[0]+" <nodeid> <dhafile>\n") - sys.exit(1) - -nodeId=int(sys.argv[1]) -dhafile=sys.argv[2] - -f1 = open("/etc/fuel/astute.yaml", 'r') -doc = yaml.load(f1) -f1.close() - -dhaMac = doc["ADMIN_NETWORK"]["mac"] - -# Write contribution to DHA file -f2 = open(dhafile, 'a') -f2.write("- id: " + str(nodeId) + "\n") -f2.write(" pxeMac: " + dhaMac + "\n") -f2.write(" isFuel: yes\n") -f2.close() - diff --git a/fuel/prototypes/auto-deploy/create_templates/generate_node_info.py b/fuel/prototypes/auto-deploy/create_templates/generate_node_info.py deleted file mode 100755 index a475cdb1f..000000000 --- a/fuel/prototypes/auto-deploy/create_templates/generate_node_info.py +++ /dev/null @@ -1,61 +0,0 @@ -#!/usr/bin/python -############################################################################## -# Copyright (c) 2015 Ericsson AB and others. -# stefan.k.berg@ericsson.com -# jonas.bjurel@ericsson.com -# All rights reserved. This program and the accompanying materials -# are made available under the terms of the Apache License, Version 2.0 -# which accompanies this distribution, and is available at -# http://www.apache.org/licenses/LICENSE-2.0 -############################################################################## - -import yaml -import re -import sys -import os - -if len(sys.argv) != 5: - sys.stderr.write("Usage: "+sys.argv[0]+" <nodeid> <role> <infile> <dhafile>\n") - sys.exit(1) - -infile = sys.argv[3] -if not os.path.exists(infile): - sys.stderr.write("ERROR: The file "+infile+" could not be opened\n") - sys.exit(1) - -nodeId=int(sys.argv[1]) -nodeRole=sys.argv[2] -dhafile=sys.argv[4] - -f1 = open(infile, 'r') -doc = yaml.load(f1) -f1.close() - -out = {} - -node = {} -node["id"] = nodeId -node["role"] = nodeRole -node["interfaces"] = {} - - -for interface in doc: - iface = {} - networks = [] - for network in interface["assigned_networks"]: - networks.append(network["name"]) - if network["name"] == "fuelweb_admin": - dhaMac = interface["mac"] - if networks: - node["interfaces"][interface["name"]] = networks - -out = [node] - -sys.stdout.write(yaml.dump(out, default_flow_style=False)) - -# Write contribution to DHA file -f2 = open(dhafile, 'a') -f2.write("- id: " + str(nodeId) + "\n") -f2.write(" pxeMac: " + dhaMac + "\n") -f2.close() - diff --git a/fuel/prototypes/auto-deploy/create_templates/reap_fuel_settings.py b/fuel/prototypes/auto-deploy/create_templates/reap_fuel_settings.py deleted file mode 100755 index a8ddba9bc..000000000 --- a/fuel/prototypes/auto-deploy/create_templates/reap_fuel_settings.py +++ /dev/null @@ -1,47 +0,0 @@ -#!/usr/bin/python -############################################################################## -# Copyright (c) 2015 Ericsson AB and others. -# stefan.k.berg@ericsson.com -# jonas.bjurel@ericsson.com -# All rights reserved. This program and the accompanying materials -# are made available under the terms of the Apache License, Version 2.0 -# which accompanies this distribution, and is available at -# http://www.apache.org/licenses/LICENSE-2.0 -############################################################################## - -import yaml -import re -import sys -import os - -if len(sys.argv) != 3: - sys.stderr.write("Usage: "+sys.argv[0]+" <outfile> <outnamespace>\n") - sys.exit(1) - -infile = "/etc/fuel/astute.yaml" -if not os.path.exists(infile): - sys.stderr.write("ERROR: The file "+infile+" could not be opened\n") - sys.exit(1) - -outfile = sys.argv[1] -namespace = sys.argv[2] - -f1 = open(infile, 'r') -doc = yaml.load(f1) -f1.close() - -out = {} -out[namespace] = {} - -# Delete unique data -del(doc["ADMIN_NETWORK"]["mac"]) -del(doc["ADMIN_NETWORK"]["interface"]) - -for copy in [ "ADMIN_NETWORK", "HOSTNAME", "DNS_DOMAIN", "DNS_SEARCH", - "DNS_UPSTREAM", "NTP1", "NTP2", "NTP3", "ADMIN_NETWORK", "FUEL_ACCESS" ]: - out[namespace][copy] = doc[copy] - -f2 = open(outfile, 'a') -f2.write(yaml.dump(out, default_flow_style=False)) -f2.close() - diff --git a/fuel/prototypes/auto-deploy/create_templates/reap_network_scheme.py b/fuel/prototypes/auto-deploy/create_templates/reap_network_scheme.py deleted file mode 100755 index 19c18bfc9..000000000 --- a/fuel/prototypes/auto-deploy/create_templates/reap_network_scheme.py +++ /dev/null @@ -1,38 +0,0 @@ -#!/usr/bin/python -############################################################################## -# Copyright (c) 2015 Ericsson AB and others. -# stefan.k.berg@ericsson.com -# jonas.bjurel@ericsson.com -# All rights reserved. This program and the accompanying materials -# are made available under the terms of the Apache License, Version 2.0 -# which accompanies this distribution, and is available at -# http://www.apache.org/licenses/LICENSE-2.0 -############################################################################## - -import yaml -import re -import sys -import os - -if len(sys.argv) != 4: - sys.stderr.write("Usage: "+sys.argv[0]+" <infile> <outfile> <outnamespace>\n") - sys.exit(1) - -infile = sys.argv[1] -if not os.path.exists(infile): - sys.stderr.write("ERROR: The file "+infile+" could not be opened\n") - sys.exit(1) - -outfile = sys.argv[2] -namespace = sys.argv[3] - -f1 = open(infile, 'r') -doc = yaml.load(f1) -f1.close() - -out = {} -out[namespace] = doc["network_scheme"]["transformations"] -f2 = open(outfile, 'a') -f2.write(yaml.dump(out, default_flow_style=False)) -f2.close() - diff --git a/fuel/prototypes/auto-deploy/create_templates/reap_network_settings.py b/fuel/prototypes/auto-deploy/create_templates/reap_network_settings.py deleted file mode 100755 index b03a0634c..000000000 --- a/fuel/prototypes/auto-deploy/create_templates/reap_network_settings.py +++ /dev/null @@ -1,48 +0,0 @@ -#!/usr/bin/python -############################################################################## -# Copyright (c) 2015 Ericsson AB and others. -# stefan.k.berg@ericsson.com -# jonas.bjurel@ericsson.com -# All rights reserved. This program and the accompanying materials -# are made available under the terms of the Apache License, Version 2.0 -# which accompanies this distribution, and is available at -# http://www.apache.org/licenses/LICENSE-2.0 -############################################################################## - -import yaml -import re -import sys -import os - -if len(sys.argv) != 4: - sys.stderr.write("Usage: "+sys.argv[0]+" <infile> <outfile> <outnamespace>\n") - sys.exit(1) - -infile = sys.argv[1] -if not os.path.exists(infile): - sys.stderr.write("ERROR: The file "+infile+" could not be opened\n") - sys.exit(1) - -outfile = sys.argv[2] -namespace = sys.argv[3] - -f1 = open(infile, 'r') -doc = yaml.load(f1) -f1.close() - -for nw in doc["networks"]: - try: - del nw["id"] - except: - pass - - try: - del nw["group_id"] - except: - pass - -out = {} -out[namespace] = doc -f2 = open(outfile, 'a') -f2.write(yaml.dump(out, default_flow_style=False)) -f2.close() diff --git a/fuel/prototypes/auto-deploy/create_templates/reap_opnfv_astute.py b/fuel/prototypes/auto-deploy/create_templates/reap_opnfv_astute.py deleted file mode 100755 index 55fad0555..000000000 --- a/fuel/prototypes/auto-deploy/create_templates/reap_opnfv_astute.py +++ /dev/null @@ -1,49 +0,0 @@ -#!/usr/bin/python -############################################################################## -# Copyright (c) 2015 Ericsson AB and others. -# stefan.k.berg@ericsson.com -# jonas.bjurel@ericsson.com -# All rights reserved. This program and the accompanying materials -# are made available under the terms of the Apache License, Version 2.0 -# which accompanies this distribution, and is available at -# http://www.apache.org/licenses/LICENSE-2.0 -############################################################################## - -import yaml -import re -import sys -import os - -if len(sys.argv) != 4: - sys.stderr.write("Usage: "+sys.argv[0]+" <controllerfile> <computefile> <outfile>\n") - sys.exit(1) - -controller = sys.argv[1] -if not os.path.exists(controller): - sys.stderr.write("ERROR: The file "+controller+" could not be opened\n") - sys.exit(1) - -compute = sys.argv[2] -if not os.path.exists(compute): - sys.stderr.write("ERROR: The file "+compute+" could not be opened\n") - sys.exit(1) - -outfile = sys.argv[3] - -f_controller = open(controller, 'r') -doc_controller = yaml.load(f_controller) -f_controller.close() - -f_compute = open(compute, 'r') -doc_compute = yaml.load(f_compute) -f_compute.close() - -out = {} -out["opnfv"] = {} -out["opnfv"]["controller"] = doc_controller["opnfv"] -out["opnfv"]["compute"] = doc_compute["opnfv"] - -f2 = open(outfile, 'a') -f2.write(yaml.dump(out, default_flow_style=False)) -f2.close() - diff --git a/fuel/prototypes/auto-deploy/create_templates/reap_settings.py b/fuel/prototypes/auto-deploy/create_templates/reap_settings.py deleted file mode 100755 index 22794d245..000000000 --- a/fuel/prototypes/auto-deploy/create_templates/reap_settings.py +++ /dev/null @@ -1,37 +0,0 @@ -#!/usr/bin/python -############################################################################## -# Copyright (c) 2015 Ericsson AB and others. -# stefan.k.berg@ericsson.com -# jonas.bjurel@ericsson.com -# All rights reserved. This program and the accompanying materials -# are made available under the terms of the Apache License, Version 2.0 -# which accompanies this distribution, and is available at -# http://www.apache.org/licenses/LICENSE-2.0 -############################################################################## - -import yaml -import re -import sys -import os - -if len(sys.argv) != 4: - sys.stderr.write("Usage: "+sys.argv[0]+" <infile> <outfile> <outnamespace>\n") - sys.exit(1) - -infile = sys.argv[1] -if not os.path.exists(infile): - sys.stderr.write("ERROR: The file "+infile+" could not be opened\n") - sys.exit(1) - -outfile = sys.argv[2] -namespace = sys.argv[3] - -f1 = open(infile, 'r') -doc = yaml.load(f1) -f1.close() - -out = {} -out[namespace] = doc -f2 = open(outfile, 'a') -f2.write(yaml.dump(out, default_flow_style=False)) -f2.close() diff --git a/fuel/prototypes/auto-deploy/deploy/deploy.sh b/fuel/prototypes/auto-deploy/deploy/deploy.sh deleted file mode 100755 index f5aa634f9..000000000 --- a/fuel/prototypes/auto-deploy/deploy/deploy.sh +++ /dev/null @@ -1,193 +0,0 @@ -#!/bin/bash -############################################################################## -# Copyright (c) 2015 Ericsson AB and others. -# stefan.k.berg@ericsson.com -# jonas.bjurel@ericsson.com -# All rights reserved. This program and the accompanying materials -# are made available under the terms of the Apache License, Version 2.0 -# which accompanies this distribution, and is available at -# http://www.apache.org/licenses/LICENSE-2.0 -############################################################################## - -# Setup locations -topdir=$(dirname $(readlink -f $BASH_SOURCE)) -exampledir=$(cd $topdir/../examples; pwd) -functions=${topdir}/functions - -# Define common functions -. ${functions}/common.sh - -exit_handler() { - # Remove safety catch - kill -9 `ps -p $killpid -o pid --no-headers` \ - `ps --ppid $killpid -o pid --no-headers`\ - > /dev/null 2>&1 -} - -usage() -{ - cat <<EOF -Syntax: `basename $0` [-nf] <isofile> <deafile> <dhafile> -Arguments - -nf Do not install Fuel master -EOF -} - - -# maximum allowed deploy time (default three hours) -MAXDEPLOYTIME=${MAXDEPLOYTIME-3h} - -####### MAIN ######## - -time0=`date +%s` - -if [ "`whoami`" != "root" ]; then - error_exit "You need be root to run this script" -fi - -# Set initial veriables -nofuel=1 - - -# Check for arguments -if [ "$1" == "-nf" ]; then - nofuel=0 - shift -fi - -if [ $# -ne 3 ]; then - usage - exit 1 -fi - -# Setup tmpdir - if TMPDIR env variable is set, use that one -# else create in $HOME/fueltmp -if [ -n "${TMPDIR}" ]; then - if [ -d ${TMPDIR} ]; then - tmpdir=${TMPDIR}/fueltmp - echo "Using TMPDIR=${TMPDIR}, so tmpdir=${tmpdir}" - else - error_exit "No such directory for TMPDIR: ${TMPDIR}" - fi -else - tmpdir=${HOME}/fueltmp - echo "Default: tmpdir=$tmpdir" -fi - -# Umask must be changed so files created are readable by qemu -umask 0022 - -if [ -d $tmpdir ]; then - rm -Rf $tmpdir || error_exit "Could not remove tmpdir $tmpdir" -fi -mkdir $tmpdir || error_exit "Could not create tmpdir $tmpdir" - -isofile=$(cd `dirname $1`; echo `pwd`/`basename $1`) -deafile=$(cd `dirname $2`; echo `pwd`/`basename $2`) -dhafile=$(cd `dirname $3`; echo `pwd`/`basename $3`) - -if [ ! -f $isofile ]; then - error_exit "Could not find ISO file $isofile" -elif [ ! -f $deafile ]; then - error_exit "Could not find DEA file $deafile" -elif [ ! -f $dhafile ]; then - error_exit "Could not find DHA file $dhafile" -fi - -# Connect adapter -adapter=`grep "^adapter: " $dhafile | sed 's/.*: //'` -if [ -z "$adapter" ]; then - error_exit "No adapter in DHA file!" -elif [ ! -f $topdir/dha-adapters/${adapter}.sh ]; then - error_exit "Could not find adapter for $adapter" -else - . $topdir/dha-adapters/${adapter}.sh $dhafile -fi - -# Connect DEA API -. ${topdir}/functions/dea-api.sh $deafile - -# Enable safety catch -echo "Enabling auto-kill if deployment exceeds $MAXDEPLOYTIME" -(sleep $MAXDEPLOYTIME; echo "Auto-kill of deploy after a timeout of $MAXDEPLOYTIME"; kill $$) & -killpid=$! - -# Enable exit handler -trap exit_handler exit - -# Get Fuel node information -fuelIp=`dea getFuelIp` || error_exit "Could not get Fuel IP" -fuelNetmask=`dea getFuelNetmask` || error_exit "Could not get Fuel netmask" -fuelGateway=`dea getFuelGateway` || error_exit "Could not get Fuel Gateway" -fuelHostname=`dea getFuelHostname` || error_exit "Could not get Fuel hostname" -fuelDns=`dea getFuelDns` || error_exit "Could not get Fuel DNS" -fuelNodeId=`dha getFuelNodeId` || error_exit "Could not get fuel node id" -dha useFuelCustomInstall -fuelCustom=$? - -# Stop all VMs -for id in `dha getAllNodeIds` -do - if [ $nofuel -eq 0 -o $fuelCustom -eq 0 ]; then - if [ $fuelNodeId -ne $id ]; then - echo "Powering off id $id" - dha nodePowerOff $id - fi - else - echo "Powering off id $id" - dha nodePowerOff $id - fi -done - -# Install the Fuel master -if [ $nofuel -eq 1 ]; then - echo "Patching iso file" - - deployiso="${tmpdir}/deploy-`basename $isofile`" - ${functions}/patch-iso.sh $isofile $deployiso $tmpdir \ - $fuelIp $fuelNetmask $fuelGateway $fuelHostname $fuelDns \ - || error_exit "Failed to patch ISO" - - # Swap isofiles from now on - isofile=$deployiso - if dha useFuelCustomInstall; then - echo "Custom Fuel install" - dha fuelCustomInstall $isofile || error_exit "Failed to run Fuel custom install" - else - echo "Ordinary Fuel install" - . ${functions}/install_iso.sh || error_exit "Failed to install Fuel" - fi -else - echo "Not installing Fuel master" -fi - -. ${functions}/deploy_env.sh - -echo "Waiting for one minute for deploy to stabilize" -sleep 1m - -echo "Verifying node status after deployment" -# Any node with non-ready status? -ssh root@${fuelIp} fuel node 2>/dev/null | tail -n +3 | cut -d "|" -f 2 | \ - sed 's/ //g' | grep -v ready | wc -l | grep -q "^0$" -if [ $? -ne 0 ]; then - echo -e "Deploy failed to verify\n" - ssh root@${fuelIp} fuel node 2>/dev/null - error_exit "Exiting with error status" -else - echo -e "Deployment verified\n" - ssh root@${fuelIp} fuel node 2>/dev/null - echo -e "\nNow running sanity and smoke health checks" - echo -e "\n\n" - ssh root@${fuelIp} fuel health --env ${envId} --check sanity,smoke \ - --force - if [ $? -eq 0 ]; then - echo "Health checks passed!" - else - error_exit "One or several health checks failed!" - fi - - time1=`date +%s` - echo "Total deployment time: $[(time1-time0)/60] minutes" - exit 0 -fi diff --git a/fuel/prototypes/auto-deploy/deploy/dha-adapters/dhaParse.py b/fuel/prototypes/auto-deploy/deploy/dha-adapters/dhaParse.py deleted file mode 100755 index d2712c6d7..000000000 --- a/fuel/prototypes/auto-deploy/deploy/dha-adapters/dhaParse.py +++ /dev/null @@ -1,87 +0,0 @@ -#!/usr/bin/python -############################################################################## -# Copyright (c) 2015 Ericsson AB and others. -# stefan.k.berg@ericsson.com -# jonas.bjurel@ericsson.com -# All rights reserved. This program and the accompanying materials -# are made available under the terms of the Apache License, Version 2.0 -# which accompanies this distribution, and is available at -# http://www.apache.org/licenses/LICENSE-2.0 -############################################################################## - -import yaml -import re -import sys -import os - -def test(arr): - print "Nodes" - nodes = doc["nodes"] - for node in nodes: - print "Node %d " % node["id"] - print " Mac: %s" % node["adminMac"] - print " Role: %s" % node["role"] - -def get(arg): - try: - if doc[arg[0]]: - print doc[arg[0]] - else: - print "" - except KeyError: - print "" - -def getNodes(arg): - for node in doc["nodes"]: - print node["id"] - -# Get property arg2 from arg1 -def getNodeProperty(arg): - id=arg[0] - key=arg[1] - - for node in doc["nodes"]: - if node["id"] == int(id): - try: - if node[key]: - print node[key] - exit(0) - except: - print "" - exit(0) - exit(1) - - - -infile = sys.argv[1] - -if not os.path.exists(infile): - sys.stderr.write("ERROR: The file "+infile+" could not be opened\n") - sys.exit(1) - - -f1 = open(infile, 'r') -doc = yaml.load(f1) -f1.close() - -cmd = sys.argv[2] -args = sys.argv[3:] - -if cmd == "test": - test(args) -elif cmd == "getNodes": - getNodes(args) -elif cmd == "getNodeProperty": - getNodeProperty(args) -elif cmd == "get": - get(args) -else: - print "No such command: %s" % cmd - exit(1) - -#print "Dumping" -#print yaml.dump(doc, default_flow_style=False) - -#Functions: - -#getIdRole diff --git a/fuel/prototypes/auto-deploy/deploy/dha-adapters/ipmi.sh b/fuel/prototypes/auto-deploy/deploy/dha-adapters/ipmi.sh deleted file mode 100755 index 37deb024d..000000000 --- a/fuel/prototypes/auto-deploy/deploy/dha-adapters/ipmi.sh +++ /dev/null @@ -1,449 +0,0 @@ -#!/bin/bash -############################################################################## -# Copyright (c) 2015 Ericsson AB and others. -# stefan.k.berg@ericsson.com -# jonas.bjurel@ericsson.com -# All rights reserved. This program and the accompanying materials -# are made available under the terms of the Apache License, Version 2.0 -# which accompanies this distribution, and is available at -# http://www.apache.org/licenses/LICENSE-2.0 -############################################################################## - - - -######################################################################## -# Internal functions BEGIN - - -dha_f_err() -{ - local rc - local cmd - - rc=$1 - shift - - echo "$@" >&2 - echo "Exit with code $rc" >&2 - - exit $rc -} - -dha_f_run() -{ - $@ - rc=$? - if [ $rc -ne 0 ]; then - dha_f_err $rc "running $@" >&2 - exit $rc - fi -} - - -dha_f_ipmi() -{ - - local nodeId - local ipmiIp - local ipmiUser - local ipmiPass - local i - - nodeId=$1 - shift - - ipmiIp=$($DHAPARSE $DHAFILE getNodeProperty $nodeId ipmiIp) - ipmiUser=$($DHAPARSE $DHAFILE getNodeProperty $nodeId ipmiUser) - ipmiPass=$($DHAPARSE $DHAFILE getNodeProperty $nodeId ipmiPass) - - test -n "$ipmiIp" || error_exit "Could not get IPMI IP" - test -n "$ipmiUser" || error_exit "Could not get IPMI username" - test -n "$ipmiPass" || error_exit "Could not get IPMI password" - - # Repeat three times for good measure (some hardware seems - # weird) - for i in 1 2 - do - ipmitool -I lanplus -A password -H $ipmiIp -U $ipmiUser -P $ipmiPass \ - $@ >/dev/null 2>&1 - sleep 1 - done - ipmitool -I lanplus -A password -H $ipmiIp -U $ipmiUser -P $ipmiPass \ - $@ -} - -# Internal functions END -######################################################################## - - -true=0 -false=1 - -# API: Get the DHA API version supported by this adapter -dha_getApiVersion () -{ - echo "1.0" -} - -# API: Get the name of this adapter -dha_getAdapterName () -{ - echo "ipmi" -} - -# API: ### Node identity functions ### -# API: Node numbering is sequential. - -# API: Get a list of all defined node ids, sorted in ascending order -dha_getAllNodeIds() -{ - dha_f_run $DHAPARSE $DHAFILE getNodes | sort -n -} - - -# API: Get ID for Fuel node ID -dha_getFuelNodeId() -{ - for node in `dha_getAllNodeIds` - do - if [ -n "`dha_f_run $DHAPARSE $DHAFILE getNodeProperty $node isFuel`" ] - then - echo $node - fi - done -} - -# API: Get node property -# API: Argument 1: node id -# API: Argument 2: Property -dha_getNodeProperty() -{ - dha_f_run $DHAPARSE $DHAFILE getNodeProperty $1 $2 -} - - -# API: Get MAC address for the PXE interface of this node. If not -# API: defined, an empty string will be returned. -# API: Argument 1: Node id -dha_getNodePxeMac() -{ - dha_getNodeProperty $1 pxeMac -} - - -### Node operation functions ### - -# API: Use custom installation method for Fuel master? -# API: Returns 0 if true, 1 if false -dha_useFuelCustomInstall() -{ - $DHAPARSE $DHAFILE get fuelCustomInstall | grep -qi true - rc=$? - return $rc -} - -# API: Fuel custom installation method -# API: Leaving the Fuel master powered on and booting from ISO at exit -# API: Argument 1: Full path to ISO file to install -dha_fuelCustomInstall() -{ - if [ ! -e $1 ]; then - error_exit "Could not access ISO file $1" - fi - - dha_useFuelCustomInstall || dha_f_err 1 "dha_fuelCustomInstall not supported" - - fuelIp=`dea getFuelIp` || error_exit "Could not get fuel IP" - fuelNodeId=`dha getFuelNodeId` || error_exit "Could not get fuel node id" - virtName=`$DHAPARSE $DHAFILE getNodeProperty $fuelNodeId libvirtName` - - # Power off the node - virsh destroy $virtName - sleep 5 - - # Zero the MBR - fueldisk=`virsh dumpxml $virtName | \ - grep "<source file" | grep raw | sed "s/.*'\(.*\)'.*/\1/"` - disksize=`ls -l $fueldisk | awk '{ print $5 }'` - rm -f $fueldisk - fallocate -l $disksize $fueldisk - - # Set the boot order - for order in disk iso - do - if [ "$order" == "pxe" ]; then - bootline+="<boot dev='network'\/>\n" - elif [ "$order" == "disk" ]; then - bootline+="<boot dev='hd'/\>\n" - elif [ "$order" == "iso" ]; then - bootline+="<boot dev='cdrom'/\>\n" - else - error_exit "Unknown boot type: $order" - fi - done - - virsh dumpxml $virtName | grep -v "<boot dev.*>" | \ - sed "/<\/os>/i\ - ${bootline}" > $tmpdir/vm.xml || error_exit "Could not set bootorder" - virsh define $tmpdir/vm.xml || error_exit "Could not set bootorder" - - - # Get name of CD device - cdDev=`virsh domblklist $virtName | tail -n +3 | awk '{ print $1 }' | grep ^hd` - - # Eject and insert ISO - virsh change-media $virtName --config --eject $cdDev - sleep 5 - virsh change-media $virtName --config --insert $cdDev $1 || error_exit "Could not insert CD $1" - sleep 5 - - virsh start $virtName || error_exit "Could not start $virtName" - sleep 5 - - # wait for node up - echo "Waiting for Fuel master to accept SSH" - while true - do - ssh root@${fuelIp} date 2>/dev/null - if [ $? -eq 0 ]; then - break - fi - sleep 10 - done - - # Wait until fuelmenu is up - echo "Waiting for fuelmenu to come up" - menuPid="" - while [ -z "$menuPid" ] - do - menuPid=`ssh root@${fuelIp} "ps -ef" 2>&1 | grep fuelmenu | grep -v grep | awk '{ print $2 }'` - sleep 10 - done - - # This is where we inject our own astute.yaml settings - scp -q $deafile root@${fuelIp}:. || error_exit "Could not copy DEA file to Fuel" - echo "Uploading build tools to Fuel server" - ssh root@${fuelIp} rm -rf tools || error_exit "Error cleaning old tools structure" - scp -qrp $topdir/tools root@${fuelIp}:. || error_exit "Error copying tools" - echo "Running transplant #0" - ssh root@${fuelIp} "cd tools; ./transplant0.sh ../`basename $deafile`" \ - || error_exit "Error running transplant sequence #0" - - - - # Let the Fuel deployment continue - echo "Found menu as PID $menuPid, now killing it" - ssh root@${fuelIp} "kill $menuPid" 2>/dev/null - - # Wait until installation complete - echo "Waiting for bootstrap of Fuel node to complete" - while true - do - ssh root@${fuelIp} "ps -ef" 2>/dev/null \ - | grep -q /usr/local/sbin/bootstrap_admin_node - if [ $? -ne 0 ]; then - break - fi - sleep 10 - done - - echo "Waiting for one minute for Fuel to stabilize" - sleep 1m - -} - -# API: Get power on strategy from DHA -# API: Returns one of two values: -# API: all: Power on all nodes simultaneously -# API: sequence: Power on node by node, wait for Fuel detection -dha_getPowerOnStrategy() -{ - local strategy - - strategy=`$DHAPARSE $DHAFILE get powerOnStrategy` - - if [ "$strategy" == "all" ]; then - echo $strategy - elif - [ "$strategy" == "sequence" ]; then - echo $strategy - else - dha_f_err 1 "Could not parse strategy from DHA, got $strategy" - fi -} - -# API: Power on node -# API: Argument 1: node id -dha_nodePowerOn() -{ - local nodeId - - nodeId=$1 - state=$(dha_f_ipmi $1 chassis power status) || error_exit "Could not get IPMI power status" - echo "state $state" - - - if [ "$(echo $state | sed 's/.* //')" == "off" ]; then - dha_f_ipmi $1 chassis power on - fi -} - -# API: Power off node -# API: Argument 1: node id -dha_nodePowerOff() -{ - local nodeId - - nodeId=$1 - state=$(dha_f_ipmi $1 chassis power status) || error_exit "Could not get IPMI power status" - echo "state $state" - - - if [ "$(echo $state | sed 's/.* //')" != "off" ]; then - dha_f_ipmi $1 chassis power off - fi -} - -# API: Reset node -# API: Argument 1: node id -dha_nodeReset() -{ - local nodeId - - nodeId=$1 - state=$(dha_f_ipmi $1 chassis power reset) || error_exit "Could not get IPMI power status" - echo "state $state" - - - if [ "$(echo $state | sed 's/.* //')" != "off" ]; then - dha_f_ipmi $1 chassis power reset - fi -} - -# Boot order and ISO boot file - -# API: Is the node able to commit boot order without power toggle? -# API: Argument 1: node id -# API: Returns 0 if true, 1 if false -dha_nodeCanSetBootOrderLive() -{ - return $true -} - -# API: Set node boot order -# API: Argument 1: node id -# API: Argument 2: Space separated line of boot order - boot ids are "pxe", "disk" and "iso" -# Strategy for IPMI: Always set boot order to persistent except in the case of CDROM. -dha_nodeSetBootOrder() -{ - local id - local order - - id=$1 - shift - order=$1 - - if [ "$order" == "pxe" ]; then - dha_f_ipmi $id chassis bootdev pxe options=persistent || error_exit "Could not get IPMI power status" - elif [ "$order" == "iso" ]; then - dha_f_ipmi $id chassis bootdev cdrom || error_exit "Could not get IPMI power status" - elif [ "$order" == "disk" ]; then - dha_f_ipmi $id chassis bootdev disk options=persistent || error_exit "Could not get IPMI power status" - else - error_exit "Unknown boot type: $order" - fi -} - -# API: Is the node able to operate on ISO media? -# API: Argument 1: node id -# API: Returns 0 if true, 1 if false -dha_nodeCanSetIso() -{ - return $false -} - -# API: Is the node able to insert add eject ISO files without power toggle? -# API: Argument 1: node id -# API: Returns 0 if true, 1 if false -dha_nodeCanHandeIsoLive() -{ - return $false -} - -# API: Insert ISO into virtualDVD -# API: Argument 1: node id -# API: Argument 2: iso file -dha_nodeInsertIso() -{ - error_exit "Node can not handle InsertIso" -} - -# API: Eject ISO from virtual DVD -# API: Argument 1: node id -dha_nodeEjectIso() -{ - error_exit "Node can not handle InsertIso" -} - -# API: Wait until a suitable time to change the boot order to -# API: "disk iso" when ISO has been booted. Can't be too long, nor -# API: too short... -# API: We should make a smart trigger for this somehow... -dha_waitForIsoBoot() -{ - echo "waitForIsoBoot: Not used by ipmi" -} - -# API: Is the node able to reset its MBR? -# API: Returns 0 if true, 1 if false -dha_nodeCanZeroMBR() -{ - return $false -} - -# API: Reset the node's MBR -dha_nodeZeroMBR() -{ - error_exit "Node $1 does not support ZeroMBR" -} - - -# API: Entry point for dha functions -# API: Typically do not call "dha_node_zeroMBR" but "dha node_ZeroMBR" -# API: -# API: Before calling dha, the adapter file must gave been sourced with -# API: the DHA file name as argument -dha() -{ - if [ -z "$DHAFILE" ]; then - error_exit "dha_setup has not been run" - fi - - - if type dha_$1 &>/dev/null; then - cmd=$1 - shift - dha_$cmd $@ - return $? - else - error_exit "No such function dha_$1 defined" - fi -} - -if [ "$1" == "api" ]; then - egrep "^# API: |dha.*\(\)" $0 | sed 's/^# API: /# /' | grep -v dha_f_ | sed 's/)$/)\n/' -else - dhatopdir=$(dirname $(readlink -f $BASH_SOURCE)) - DHAPARSE="$dhatopdir/dhaParse.py" - DHAFILE=$1 - - if [ ! -f $DHAFILE ]; then - error_exit "No such DHA file: $DHAFILE" - else - echo "Adapter init" - echo "$@" - echo "DHAPARSE: $DHAPARSE" - echo "DHAFILE: $DHAFILE" - fi - -fi diff --git a/fuel/prototypes/auto-deploy/deploy/dha-adapters/libvirt.sh b/fuel/prototypes/auto-deploy/deploy/dha-adapters/libvirt.sh deleted file mode 100755 index 8d9edde3f..000000000 --- a/fuel/prototypes/auto-deploy/deploy/dha-adapters/libvirt.sh +++ /dev/null @@ -1,334 +0,0 @@ -#!/bin/bash -############################################################################## -# Copyright (c) 2015 Ericsson AB and others. -# stefan.k.berg@ericsson.com -# jonas.bjurel@ericsson.com -# All rights reserved. This program and the accompanying materials -# are made available under the terms of the Apache License, Version 2.0 -# which accompanies this distribution, and is available at -# http://www.apache.org/licenses/LICENSE-2.0 -############################################################################## - - - -######################################################################## -# Internal functions BEGIN - - -dha_f_err() -{ - local rc - local cmd - - rc=$1 - shift - - echo "$@" >&2 - echo "Exit with code $rc" >&2 - - exit $rc -} - -dha_f_run() -{ - $@ - rc=$? - if [ $rc -ne 0 ]; then - dha_f_err $rc "running $@" >&2 - exit $rc - fi -} - -# Internal functions END -######################################################################## - - -true=0 -false=1 - -# API: Get the DHA API version supported by this adapter -dha_getApiVersion () -{ - echo "1.0" -} - -# API: Get the name of this adapter -dha_getAdapterName () -{ - echo "libvirt" -} - -# API: ### Node identity functions ### -# API: Node numbering is sequential. - -# API: Get a list of all defined node ids, sorted in ascending order -dha_getAllNodeIds() -{ - dha_f_run $DHAPARSE $DHAFILE getNodes | sort -n -} - - -# API: Get ID for Fuel node ID -dha_getFuelNodeId() -{ - for node in `dha_getAllNodeIds` - do - if [ -n "`dha_f_run $DHAPARSE $DHAFILE getNodeProperty $node isFuel`" ] - then - echo $node - fi - done -} - -# API: Get node property -# API: Argument 1: node id -# API: Argument 2: Property -dha_getNodeProperty() -{ - dha_f_run $DHAPARSE $DHAFILE getNodeProperty $1 $2 -} - - -# API: Get MAC address for the PXE interface of this node. If not -# API: defined, an empty string will be returned. -# API: Argument 1: Node id -dha_getNodePxeMac() -{ - dha_getNodeProperty $1 pxeMac -} - - -### Node operation functions ### - -# API: Use custom installation method for Fuel master? -# API: Returns 0 if true, 1 if false -dha_useFuelCustomInstall() -{ - $DHAPARSE $DHAFILE get fuelCustomInstall | grep -qi true - rc=$? - return $rc -} - -# API: Fuel custom installation method -# API: Leaving the Fuel master powered on and booting from ISO at exit -# API: Argument 1: Full path to ISO file to install -dha_fuelCustomInstall() -{ - dha_useFuelCustomInstall || dha_f_err 1 "dha_fuelCustomInstall not supported" - date -} - -# API: Get power on strategy from DHA -# API: Returns one of two values: -# API: all: Power on all nodes simultaneously -# API: sequence: Power on node by node, wait for Fuel detection -dha_getPowerOnStrategy() -{ - local strategy - - strategy=`$DHAPARSE $DHAFILE get powerOnStrategy` - - if [ "$strategy" == "all" ]; then - echo $strategy - elif - [ "$strategy" == "sequence" ]; then - echo $strategy - else - dha_f_err 1 "Could not parse strategy from DHA, got $strategy" - fi -} - - -# API: Power on node -# API: Argument 1: node id -dha_nodePowerOn() -{ - local state - local virtName - - virtName=`$DHAPARSE $DHAFILE getNodeProperty $1 libvirtName` - state=`virsh domstate $virtName` - if [ "$state" == "shut off" ]; then - dha_f_run virsh start $virtName - fi -} - -# API: Power off node -# API: Argument 1: node id -dha_nodePowerOff() -{ - local state - local virtName - - virtName=`$DHAPARSE $DHAFILE getNodeProperty $1 libvirtName` - state=`virsh domstate $virtName` - if [ "$state" != "shut off" ]; then - dha_f_run virsh destroy $virtName - fi -} - -# API: Reset node -# API: Argument 1: node id -dha_nodeReset() -{ - local virtName - - virtName=`$DHAPARSE $DHAFILE getNodeProperty $1 libvirtName` - dha_f_run virsh reset $virtName -} - -# Boot order and ISO boot file - -# API: Is the node able to commit boot order without power toggle? -# API: Argument 1: node id -# API: Returns 0 if true, 1 if false -dha_nodeCanSetBootOrderLive() -{ - return $false -} - -# API: Set node boot order -# API: Argument 1: node id -# API: Argument 2: Space separated line of boot order - boot ids are "pxe", "disk" and "iso" -dha_nodeSetBootOrder() -{ - local id - local bootline - local virtName - local order - - id=$1 - virtName=`$DHAPARSE $DHAFILE getNodeProperty $1 libvirtName` - shift - - for order in $@ - do - if [ "$order" == "pxe" ]; then - bootline+="<boot dev='network'\/>\n" - elif [ "$order" == "disk" ]; then - bootline+="<boot dev='hd'/\>\n" - elif [ "$order" == "iso" ]; then - bootline+="<boot dev='cdrom'/\>\n" - else - error_exit "Unknown boot type: $order" - fi - done - echo $bootline - - virsh dumpxml $virtName | grep -v "<boot dev.*>" | \ - sed "/<\/os>/i\ - ${bootline}" > $tmpdir/vm.xml || error_exit "Could not set bootorder" - virsh define $tmpdir/vm.xml || error_exit "Could not set bootorder" - -} - -# API: Is the node able to operate on ISO media? -# API: Argument 1: node id -# API: Returns 0 if true, 1 if false -dha_nodeCanSetIso() -{ - return $true -} - -# API: Is the node able to insert add eject ISO files without power toggle? -# API: Argument 1: node id -# API: Returns 0 if true, 1 if false -dha_nodeCanHandeIsoLive() -{ - return $true -} - -# API: Insert ISO into virtualDVD -# API: Argument 1: node id -# API: Argument 2: iso file -dha_nodeInsertIso() -{ - local virtName - local isoFile - - virtName=`$DHAPARSE $DHAFILE getNodeProperty $1 libvirtName` - isoFile=$2 - virsh change-media $virtName --insert hdc $isoFile -} - -# API: Eject ISO from virtual DVD -# API: Argument 1: node id -dha_nodeEjectIso() -{ - local virtName - local isoFile - - virtName=`$DHAPARSE $DHAFILE getNodeProperty $1 libvirtName` - isoFile=$2 - virsh change-media $virtName --eject hdc -} - -# API: Wait until a suitable time to change the boot order to -# API: "disk iso" when ISO has been booted. Can't be too long, nor -# API: too short... -# API: We should make a smart trigger for this somehow... -dha_waitForIsoBoot() -{ - echo "waitForIsoBoot: No delay necessary for libvirt" -} - -# API: Is the node able to reset its MBR? -# API: Returns 0 if true, 1 if false -dha_nodeCanZeroMBR() -{ - return $true -} - -# API: Reset the node's MBR -dha_nodeZeroMBR() -{ - local fueldisk - local disksize - - fueldisk=`virsh dumpxml $(dha_getNodeProperty $1 libvirtName) | \ - grep "<source file" | grep raw | sed "s/.*'\(.*\)'.*/\1/"` - disksize=`ls -l $fueldisk | awk '{ print $5 }'` - rm -f $fueldisk - fallocate -l $disksize $fueldisk -} - - -# API: Entry point for dha functions -# API: Typically do not call "dha_node_zeroMBR" but "dha node_ZeroMBR" -# API: -# API: Before calling dha, the adapter file must gave been sourced with -# API: the DHA file name as argument -dha() -{ - if [ -z "$DHAFILE" ]; then - error_exit "dha_setup has not been run" - fi - - - if type dha_$1 &>/dev/null; then - cmd=$1 - shift - dha_$cmd $@ - return $? - else - error_exit "No such function dha_$1 defined" - fi -} - -if [ "$1" == "api" ]; then - egrep "^# API: |dha.*\(\)" $0 | sed 's/^# API: /# /' | grep -v dha_f_ | sed 's/)$/)\n/' -else - dhatopdir=$(dirname $(readlink -f $BASH_SOURCE)) - DHAPARSE="$dhatopdir/dhaParse.py" - DHAFILE=$1 - - if [ ! -f $DHAFILE ]; then - error_exit "No such DHA file: $DHAFILE" - else - echo "Adapter init" - echo "$@" - echo "DHAPARSE: $DHAPARSE" - echo "DHAFILE: $DHAFILE" - fi - -fi diff --git a/fuel/prototypes/auto-deploy/deploy/functions/common.sh b/fuel/prototypes/auto-deploy/deploy/functions/common.sh deleted file mode 100755 index 6947d796f..000000000 --- a/fuel/prototypes/auto-deploy/deploy/functions/common.sh +++ /dev/null @@ -1,67 +0,0 @@ -############################################################################## -# Copyright (c) 2015 Ericsson AB and others. -# stefan.k.berg@ericsson.com -# jonas.bjurel@ericsson.com -# All rights reserved. This program and the accompanying materials -# are made available under the terms of the Apache License, Version 2.0 -# which accompanies this distribution, and is available at -# http://www.apache.org/licenses/LICENSE-2.0 -############################################################################## - -# Common functions - -error_exit () { - echo "Error: $@" >&2 - exit 1 -} - -ssh() { - SSHPASS="r00tme" sshpass -e ssh -o UserKnownHostsFile=${tmpdir}/known_hosts \ - -o StrictHostKeyChecking=no -o ConnectTimeout=15 "$@" -} - -scp() { - SSHPASS="r00tme" sshpass -e scp -o UserKnownHostsFile=${tmpdir}/known_hosts \ - -o StrictHostKeyChecking=no -o ConnectTimeout=15 "$@" -} - - -fuel () { - ssh root@`dea getFuelIp` "fuel $@" -} - - -# TODO: Move numberOfNodes into the DEA API -numberOfNodes() { - fuel node | tail -n +3 | grep -v "^$" | wc -l -} - -# TODO: Move numberOfNodesUp into the DEA API -numberOfNodesUp() { - fuel node | tail -n +3 | grep -v "^$" | grep True | wc -l -} - -# Currently not used! -# Wait for node count to increase -waitForNode() { - local cnt - local initCnt - local expectCnt - - initCnt=`numberOfNodesUp` - expectCnt=$[initCnt+1] - while true - do - cnt=`numberOfNodesUp` - if [ $cnt -eq $expectCnt ]; then - break - elif [ $cnt -lt $initCnt ]; then - error_exit "Node count decreased while waiting, $initCnt -> $cnt" - elif [ $cnt -gt $expectCnt ]; then - error_exit "Node count exceeded expect count, $cnt > $expectCnt" - fi - sleep 10 - echo -n "[${cnt}]" - done - echo "[${cnt}]" -} diff --git a/fuel/prototypes/auto-deploy/deploy/functions/dea-api.sh b/fuel/prototypes/auto-deploy/deploy/functions/dea-api.sh deleted file mode 100755 index 61d670f92..000000000 --- a/fuel/prototypes/auto-deploy/deploy/functions/dea-api.sh +++ /dev/null @@ -1,171 +0,0 @@ -#!/bin/bash -############################################################################## -# Copyright (c) 2015 Ericsson AB and others. -# stefan.k.berg@ericsson.com -# jonas.bjurel@ericsson.com -# All rights reserved. This program and the accompanying materials -# are made available under the terms of the Apache License, Version 2.0 -# which accompanies this distribution, and is available at -# http://www.apache.org/licenses/LICENSE-2.0 -############################################################################## - - - -######################################################################## -# Internal functions BEGIN - - - -dea_f_err() -{ - local rc - local cmd - - rc=$1 - shift - - if [ -n "$rc" ]; then - echo "Error ($rc): $@" >&2 - else - echo "Error: $@" >&2 - fi -} - -dea_f_run() -{ - $@ - rc=$? - if [ $rc -ne 0 ]; then - dea_f_err $rc "Error running $@" - return $rc - fi -} - -# Internal functions END -######################################################################## - -true=0 -false=1 - -# API: Get the DEA API version supported by this adapter -dea_getApiVersion () -{ - echo "1.0" -} - - -# API: Node numbering is sequential. - - -# API: Get the role for this node -# API: Argument 1: node id -dea_getNodeRole() -{ - $DEAPARSE $DEAFILE getNodeRole $@ - -} - -# API: Get IP address of Fuel master -dea_getFuelIp() -{ - $DEAPARSE $DEAFILE getProperty fuel ADMIN_NETWORK ipaddress -} - -# API: Get netmask Fuel master -dea_getFuelNetmask() -{ - $DEAPARSE $DEAFILE getProperty fuel ADMIN_NETWORK netmask -} - -# API: Get gateway address of Fuel master -# FIXME: This is currently not in the DEA, so make the gatway the ..1 -# FiXME: of the IP -dea_getFuelGateway() -{ - $DEAPARSE $DEAFILE getProperty fuel ADMIN_NETWORK ipaddress | \ - sed 's/.[0-9]*$/.1/' -} - -# API: Get gateway address of Fuel master -dea_getFuelHostname() -{ - $DEAPARSE $DEAFILE getProperty fuel HOSTNAME -} - -# API: Get DNS address of Fuel master -dea_getFuelDns() -{ - $DEAPARSE $DEAFILE getProperty fuel DNS_UPSTREAM -} - -# API: Convert a normal MAC to a Fuel short mac for --node-id -dea_convertMacToShortMac() -{ - echo $1 | sed 's/.*..:..:..:..:\(..:..\).*/\1/' | tr [A-Z] [a-z] -} - - -# API: Get property from DEA file -# API: Argument 1: search path, as e.g. "fuel ADMIN_NETWORK ipaddress" -dea_getProperty() -{ - $DEAPARSE $DEAFILE getProperty $@ -} - -# API: Convert DHA node id to Fuel cluster node id -# API: Look for lowest Fuel node number, this will be DHA node 1 -# API: Argument: node id -dea_getClusterNodeId() -{ - local baseId - local inId - local fuelIp - - inId=$1 - fuelIp=`dea_getFuelIp` - - baseId=`ssh root@${fuelIp} fuel node | tail -n +3 | awk '{ print $1 }'| sed 's/ //g' | sort -n | head -1` - echo "$[inId + baseId - 1]" -} - -# API: Entry point for dea functions -# API: Typically do not call "dea_node_zeroMBR" but "dea node_ZeroMBR" -# API: -# API: Before calling dea, the adapter file must gave been sourced with -# API: the DEA file name as argument -dea() -{ - if [ -z "$DEAFILE" ]; then - error_exit "dea_setup has not been run" - fi - - - if type dea_$1 &>/dev/null; then - cmd=$1 - shift - dea_$cmd $@ - return $? - else - error_exit "No such function dea_$1 defined" - fi -} - -if [ "$1" == "api" ]; then - egrep "^# API: |dea.*\(\)" $0 | sed 's/^# API: /# /' | grep -v dea_f_ | sed 's/)$/)\n/' -else - deatopdir=$(dirname $(readlink -f $BASH_SOURCE)) - DEAPARSE="$deatopdir/deaParse.py" - DEAFILE=$1 - - if [ ! -f $DEAFILE ]; then - error_exit "No such DEA file: $DEAFILE" - else - echo "Adapter init" - echo "$@" - echo "DEAPARSE: $DEAPARSE" - echo "DEAFILE: $DEAFILE" - fi -fi - - - diff --git a/fuel/prototypes/auto-deploy/deploy/functions/deaParse.py b/fuel/prototypes/auto-deploy/deploy/functions/deaParse.py deleted file mode 100755 index 7ca650171..000000000 --- a/fuel/prototypes/auto-deploy/deploy/functions/deaParse.py +++ /dev/null @@ -1,85 +0,0 @@ -#!/usr/bin/python -############################################################################## -# Copyright (c) 2015 Ericsson AB and others. -# stefan.k.berg@ericsson.com -# jonas.bjurel@ericsson.com -# All rights reserved. This program and the accompanying materials -# are made available under the terms of the Apache License, Version 2.0 -# which accompanies this distribution, and is available at -# http://www.apache.org/licenses/LICENSE-2.0 -############################################################################## - -import yaml -import re -import sys -import os - -def test(arr): - print "Nodes" - nodes = doc["nodes"] - for node in nodes: - print "Node %d " % node["id"] - print " Mac: %s" % node["adminMac"] - print " Role: %s" % node["role"] - -def getNodeRole(arg): - for node in doc["nodes"]: - print node - try: - if node["role"] == arg[0]: - print doc["id"] - except KeyError: - exit(1) - -def getNodes(arg): - for node in doc["nodes"]: - print node["id"] - - -def getProperty(arg): - result = doc - for level in arg: - result = result[level] - print result - -def getNodeRole(arg): - for node in doc["nodes"]: - if int(arg[0]) == node["id"]: - print node["role"] - -def getNode(arg): - id=arg[0] - key=arg[1] - for node in doc["nodes"]: - if int(node["id"]) == int(id): - print node[key] - - # for node in doc["nodes"]: - # if int(node["id"]) == int(arg[0]): - # print node - -infile = sys.argv[1] - -if not os.path.exists(infile): - sys.stderr.write("ERROR: The file "+infile+" could not be opened\n") - sys.exit(1) - - -f1 = open(infile, 'r') -doc = yaml.load(f1) -f1.close() - -cmd = sys.argv[2] -args = sys.argv[3:] - -if cmd == "getProperty": - getProperty(args) -elif cmd == "getNodeRole": - getNodeRole(args) -elif cmd == "getNode": - getNode(args) -elif cmd == "get": - get(args) -else: - print "No such command: %s" % cmd - exit(1) diff --git a/fuel/prototypes/auto-deploy/deploy/functions/deploy_env.sh b/fuel/prototypes/auto-deploy/deploy/functions/deploy_env.sh deleted file mode 100755 index e650f4d6e..000000000 --- a/fuel/prototypes/auto-deploy/deploy/functions/deploy_env.sh +++ /dev/null @@ -1,140 +0,0 @@ -############################################################################## -# Copyright (c) 2015 Ericsson AB and others. -# stefan.k.berg@ericsson.com -# jonas.bjurel@ericsson.com -# All rights reserved. This program and the accompanying materials -# are made available under the terms of the Apache License, Version 2.0 -# which accompanies this distribution, and is available at -# http://www.apache.org/licenses/LICENSE-2.0 -############################################################################## - -# Deploy! -scp -q $deafile root@${fuelIp}:. || error_exit "Could not copy DEA file to Fuel" -echo "Uploading build tools to Fuel server" -ssh root@${fuelIp} rm -rf tools || error_exit "Error cleaning old tools structure" -scp -qrp $topdir/tools root@${fuelIp}:. || error_exit "Error copying tools" - -echo "Uploading templating tols to Fuel server" -ssh root@${fuelIp} rm -rf create_templates || error_exit "Error cleaning old create_templates structure" -scp -qrp $topdir/../create_templates root@${fuelIp}:. || error_exit "Error copying create_templates" - -# Refuse to run if environment already present -envcnt=`fuel env | tail -n +3 | grep -v '^$' | wc -l` -if [ $envcnt -ne 0 ]; then - error_exit "Environment count is $envcnt" -fi - -# Refuse to run if any nodes are up -nodeCnt=`numberOfNodesUp` -if [ $nodeCnt -ne 0 ]; then - error_exit "Nodes are up (node count: $nodeCnt)" -fi - -# FIXME: Add support for CentOS creation here -# Extract release ID for Ubuntu environment -ubuntucnt=`fuel release | grep Ubuntu | wc -l` -if [ $ubuntucnt -ne 1 ]; then - error_exit "Not exacly one Ubuntu release found" -fi - -# FIXME: Make release a property in the dea.yaml and use that instead! -ubuntuid=`fuel release | grep Ubuntu | awk '{ print $1 }'` - -# Create environment -envName=`dea getProperty environment_name` || error_exit "Could not get environment name" -envMode=`dea getProperty environment_mode` || error_exit "Could not get environment mode" - -fuel env create --name $envName \ - --rel $ubuntuid \ - --mode $envMode \ - --network-mode neutron \ - --net-segment-type vlan \ - || error_exit "Error creating environment" - -envId=`ssh root@${fuelIp} fuel env | tail -n +3 | awk '{ print $1 }'` \ - || error_exit "Could not get environment id" - -echo "Running transplant #1" -ssh root@${fuelIp} "cd tools; ./transplant1.sh ../`basename $deafile`" \ - || error_exit "Error running transplant sequence #1" - -# Start VMs -strategy=`dha getPowerOnStrategy` || error_exit "Could not get power on strategy" -if [ $strategy == "all" ]; then - echo "Starting all nodes at once" - poweredOn=0 - for id in `dha getAllNodeIds` - do - if [ $id -ne $fuelNodeId ]; then - echo "Setting boot order pxe disk for node $id" - dha nodeSetBootOrder $id "pxe disk" || "Could not set boot order for node" - echo "Powering on node $id" - dha nodePowerOn $id || error_exit "Could not power on node" - poweredOn=$[poweredOn + 1] - fi - done - # Wait for all nodes to be accounted for - echo "Waiting for $poweredOn nodes to come up" - while true - do - nodesUp=`numberOfNodesUp` - echo -n "[${nodesUp}]" - if [ $nodesUp -eq $poweredOn ]; then - break - fi - sleep 10 - done - echo "[${nodesUp}]" -else - # Refuse to run if any nodes are defined - totalNodeCnt=`numberOfNodes` - if [ $totalNodeCnt -ne 0 ]; then - error_exit "There are already ${totalNodeCnt} defined nodes, can not run power on in sequence!" - fi - echo "Starting nodes sequentially, waiting for Fuel detection until proceeding" - for id in `dha getAllNodeIds` - do - if [ $id -ne $fuelNodeId ]; then - echo "Setting boot order pxe disk for node $id" - dha nodeSetBootOrder $id "pxe disk" || "Could not set boot order for node" - echo "Powering on node $id" - dha nodePowerOn $id || error_exit "Could not power on node" - # Wait for node count to increase - waitForNode - fi - done -fi - -# Set roles for detected hosts -for id in `dha getAllNodeIds` -do - # If not a Fuel node - if [ $fuelNodeId -ne $id ]; then - longMac=`dha getNodePxeMac $id` || \ - error_exit "Could not get MAC address for node $id from DHA" - shortMac=`dea convertMacToShortMac $longMac` - role="`dea getNodeRole $id`" - echo "Setting role $role for Fuel node $shortMac (DEA node $id)" - fuel node set --node-id $shortMac --role $role --env $envId \ - || error_exit "Could not set role for $node" - fi -done - -# Run pre-deploy with default input -# Need to set terminal as script does "clear" and needs curses support -ssh root@${fuelIp} "TERM=vt100 /opt/opnfv/pre-deploy.sh < /dev/null" \ - || error_exit "Pre-deploy failed" - -# Inject node network config (will override pre-deploy Astute settings but we -# want to catch pre-deploy provisioning changes) -# TODO: There needs to be a function to adjust the NTP settings for clients -# TODO: to that of the actual set of controllers in this deployment. -echo "Running transplant #2" -ssh root@${fuelIp} "cd tools; ./transplant2.sh ../`basename $deafile`" \ - || error_exit "Error running transplant sequence #2" - - -# Deploy -echo "Deploying!" -ssh root@${fuelIp} "fuel deploy-changes --env $envId" >/dev/null 2>&1 || error_exit "Deploy failed" -echo "Deployment completed" diff --git a/fuel/prototypes/auto-deploy/deploy/functions/install_iso.sh b/fuel/prototypes/auto-deploy/deploy/functions/install_iso.sh deleted file mode 100755 index 2ec510b25..000000000 --- a/fuel/prototypes/auto-deploy/deploy/functions/install_iso.sh +++ /dev/null @@ -1,91 +0,0 @@ -############################################################################## -# Copyright (c) 2015 Ericsson AB and others. -# stefan.k.berg@ericsson.com -# jonas.bjurel@ericsson.com -# All rights reserved. This program and the accompanying materials -# are made available under the terms of the Apache License, Version 2.0 -# which accompanies this distribution, and is available at -# http://www.apache.org/licenses/LICENSE-2.0 -############################################################################## - -fuelIp=`dea getFuelIp` || error_exit "Could not get fuel IP" -fuelNodeId=`dha getFuelNodeId` || error_exit "Could not get fuel node id" - - -if dha nodeCanZeroMBR $fuelNodeId; then - echo "Node $fuelNodeId capable of zeroing MBR so doing that..." - dha nodeZeroMBR $fuelNodeId || error_exit "Failed to zero Fuel MBR" - dha nodeSetBootOrder $fuelNodeId "disk iso" -elif dha nodeCanSetBootOrderLive; then - echo "Node can change ISO boot order live" - dha nodeSetBootOrder $fuelNodeId "iso disk" -else - error_exit "No way to install Fuel node" -fi - -sleep 3 -dha nodeEjectIso $fuelNodeId -dha nodeInsertIso $fuelNodeId $isofile - -sleep 3 -dha nodePowerOn $fuelNodeId - -# Switch back boot order to disk, hoping that node is now up - -# FIXME: Can we do a smarter and more generic detection of when the -# FIXME: kickstart procedure has started? Then th dha_waitForIsoBoot -# FIXME: can be removed. Setting and IP already in the kickstart install -# FIXME: and ping-wait for that? -dha waitForIsoBoot - -dha nodeSetBootOrder $fuelNodeId "disk iso" - -# wait for node up -echo "Waiting for Fuel master to accept SSH" -while true -do - ssh root@${fuelIp} date 2>/dev/null - if [ $? -eq 0 ]; then - break - fi - sleep 10 -done - -# Wait until fuelmenu is up -echo "Waiting for fuelmenu to come up" -menuPid="" -while [ -z "$menuPid" ] -do - menuPid=`ssh root@${fuelIp} "ps -ef" 2>&1 | grep fuelmenu | grep -v grep | awk '{ print $2 }'` - sleep 10 -done - -# This is where we inject our own astute.yaml settings -scp -q $deafile root@${fuelIp}:. || error_exit "Could not copy DEA file to Fuel" -echo "Uploading build tools to Fuel server" -ssh root@${fuelIp} rm -rf tools || error_exit "Error cleaning old tools structure" -scp -qrp $topdir/tools root@${fuelIp}:. || error_exit "Error copying tools" -echo "Running transplant #0" -ssh root@${fuelIp} "cd tools; ./transplant0.sh ../`basename $deafile`" \ - || error_exit "Error running transplant sequence #0" - - - -# Let the Fuel deployment continue -echo "Found menu as PID $menuPid, now killing it" -ssh root@${fuelIp} "kill $menuPid" 2>/dev/null - -# Wait until installation complete -echo "Waiting for bootstrap of Fuel node to complete" -while true -do - ssh root@${fuelIp} "ps -ef" 2>/dev/null \ - | grep -q /usr/local/sbin/bootstrap_admin_node - if [ $? -ne 0 ]; then - break - fi - sleep 10 -done - -echo "Waiting for one minute for Fuel to stabilize" -sleep 1m diff --git a/fuel/prototypes/auto-deploy/deploy/functions/isolinux.cfg.patch b/fuel/prototypes/auto-deploy/deploy/functions/isolinux.cfg.patch deleted file mode 100644 index 298a05721..000000000 --- a/fuel/prototypes/auto-deploy/deploy/functions/isolinux.cfg.patch +++ /dev/null @@ -1,14 +0,0 @@ -*** isolinux/isolinux.cfg.orig 2015-04-15 08:29:52.026868322 -0400 ---- isolinux/isolinux.cfg 2015-04-15 08:30:34.350868343 -0400 -*************** -*** 19,22 **** - menu label Fuel Install (^Static IP) - menu default - kernel vmlinuz -! append initrd=initrd.img biosdevname=0 ks=cdrom:/ks.cfg ip=10.20.0.2 gw=10.20.0.1 dns1=10.20.0.1 netmask=255.255.255.0 hostname=fuel.domain.tld showmenu=no ---- 19,22 ---- - menu label Fuel Install (^Static IP) - menu default - kernel vmlinuz -! append initrd=initrd.img biosdevname=0 ks=cdrom:/ks.cfg ip=10.20.0.2 gw=10.20.0.1 dns1=10.20.0.1 netmask=255.255.255.0 hostname=fuel.domain.tld showmenu=yes - diff --git a/fuel/prototypes/auto-deploy/deploy/functions/ks.cfg.patch b/fuel/prototypes/auto-deploy/deploy/functions/ks.cfg.patch deleted file mode 100644 index 189695792..000000000 --- a/fuel/prototypes/auto-deploy/deploy/functions/ks.cfg.patch +++ /dev/null @@ -1,19 +0,0 @@ -*** ks.cfg.orig Wed Apr 15 21:47:09 2015 ---- ks.cfg Wed Apr 15 21:47:24 2015 -*************** -*** 35,41 **** - default_drive=`echo ${drives} ${removable_drives} | awk '{print $1}'` - - installdrive="undefined" -! forceformat="no" - for I in `cat /proc/cmdline`; do case "$I" in *=*) eval $I;; esac ; done - - set ${drives} ${removable_drives} ---- 35,41 ---- - default_drive=`echo ${drives} ${removable_drives} | awk '{print $1}'` - - installdrive="undefined" -! forceformat="yes" - for I in `cat /proc/cmdline`; do case "$I" in *=*) eval $I;; esac ; done - - set ${drives} ${removable_drives} diff --git a/fuel/prototypes/auto-deploy/deploy/functions/patch-iso.sh b/fuel/prototypes/auto-deploy/deploy/functions/patch-iso.sh deleted file mode 100755 index d27dcdf2d..000000000 --- a/fuel/prototypes/auto-deploy/deploy/functions/patch-iso.sh +++ /dev/null @@ -1,85 +0,0 @@ -#!/bin/bash -############################################################################## -# Copyright (c) 2015 Ericsson AB and others. -# stefan.k.berg@ericsson.com -# jonas.bjurel@ericsson.com -# All rights reserved. This program and the accompanying materials -# are made available under the terms of the Apache License, Version 2.0 -# which accompanies this distribution, and is available at -# http://www.apache.org/licenses/LICENSE-2.0 -############################################################################## - -exit_handler() { - rm -Rf $tmpnewdir - fusermount -u $tmporigdir 2>/dev/null - test -d $tmporigdir && rmdir $tmporigdir -} - -trap exit_handler exit - -error_exit() { - echo "$@" - exit 1 -} - -if [ $# -ne 8 ]; then - error_exit "Input argument error" -fi - -top=$(cd `dirname $0`; pwd) -origiso=$(cd `dirname $1`; echo `pwd`/`basename $1`) -newiso=$(cd `dirname $2`; echo `pwd`/`basename $2`) -tmpdir=$3 -fuelIp=$4 -fuelNetmask=$5 -fuelGateway=$6 -fuelHostname=$7 -fuelDns=$8 - -tmporigdir=${tmpdir}/origiso -tmpnewdir=${tmpdir}/newiso - -test -f $origiso || error_exit "Could not find origiso $origiso" -test -d $tmpdir || error_exit "Could not find tmpdir $tmpdir" - - -if [ "`whoami`" != "root" ]; then - error_exit "You need be root to run this script" -fi - -echo "Copying..." -rm -Rf $tmpnewdir || error_exit "Failed deleting old ISO copy dir" -mkdir -p $tmporigdir $tmpnewdir -fuseiso $origiso $tmporigdir || error_exit "Failed to FUSE mount ISO" -cd $tmporigdir -find . | cpio -pd $tmpnewdir || error_exit "Failed to copy FUSE ISO with cpio" -cd $tmpnewdir -fusermount -u $tmporigdir || error_exit "Failed to FUSE unmount ISO" -rmdir $tmporigdir || error_exit "Failed to delete original FUSE ISO directory" -chmod -R 755 $tmpnewdir || error_exit "Failed to set protection on new ISO dir" - -echo "Patching..." -cd $tmpnewdir -# Patch ISO to make it suitable for automatic deployment -cat $top/ks.cfg.patch | patch -p0 || error_exit "Failed patching ks.cfg" -rm -rf .rr_moved - -# Add dynamic Fuel content -echo "isolinux.cfg before: `grep netmask isolinux/isolinux.cfg`" -sed -i "s/ ip=[^ ]*/ ip=$fuelIp/" isolinux/isolinux.cfg -sed -i "s/ gw=[^ ]*/ gw=$fuelGateway/" isolinux/isolinux.cfg -sed -i "s/ dns1=[^ ]*/ dns1=$fuelDns/" isolinux/isolinux.cfg -sed -i "s/ netmask=[^ ]*/ netmask=$fuelNetmask/" isolinux/isolinux.cfg -sed -i "s/ hostname=[^ ]*/ hostname=$fuelHostname/" isolinux/isolinux.cfg -sed -i "s/ showmenu=[^ ]*/ showmenu=yes/" isolinux/isolinux.cfg -echo "isolinux.cfg after: `grep netmask isolinux/isolinux.cfg`" - -rm -vf $newiso -echo "Creating iso $newiso" -mkisofs -quiet -r \ - -J -R -b isolinux/isolinux.bin \ - -no-emul-boot \ - -boot-load-size 4 -boot-info-table \ - --hide-rr-moved \ - -x "lost+found" -o $newiso . || error_exit "Failed making iso" - diff --git a/fuel/prototypes/auto-deploy/deploy/tools/transplant0.sh b/fuel/prototypes/auto-deploy/deploy/tools/transplant0.sh deleted file mode 100755 index 7c5883b56..000000000 --- a/fuel/prototypes/auto-deploy/deploy/tools/transplant0.sh +++ /dev/null @@ -1,40 +0,0 @@ -#!/bin/bash -############################################################################## -# Copyright (c) 2015 Ericsson AB and others. -# stefan.k.berg@ericsson.com -# jonas.bjurel@ericsson.com -# All rights reserved. This program and the accompanying materials -# are made available under the terms of the Apache License, Version 2.0 -# which accompanies this distribution, and is available at -# http://www.apache.org/licenses/LICENSE-2.0 -############################################################################## - -cleanup () { - if [ -n "$tmpDir" ]; then - rm -Rf $tmpDir - fi -} - -trap cleanup exit - -error_exit () { - echo "Error: $@" >&2 - exit 1 -} - -tmpDir=`mktemp -d /tmp/deaXXXX` - -export PATH=`dirname $0`:$PATH - -if [ $# -lt 1 ]; then - error_exit "Argument error" -fi -deafile=$1 -shift - -if [ ! -f "$deafile" ]; then - error_exit "Can't find $deafile" -fi - -transplant_fuel_settings.py /etc/fuel/astute.yaml $deafile || \ - error_exit "Could not transplant astute settings" diff --git a/fuel/prototypes/auto-deploy/deploy/tools/transplant1.sh b/fuel/prototypes/auto-deploy/deploy/tools/transplant1.sh deleted file mode 100755 index 2401c6f88..000000000 --- a/fuel/prototypes/auto-deploy/deploy/tools/transplant1.sh +++ /dev/null @@ -1,67 +0,0 @@ -#!/bin/bash -############################################################################## -# Copyright (c) 2015 Ericsson AB and others. -# stefan.k.berg@ericsson.com -# jonas.bjurel@ericsson.com -# All rights reserved. This program and the accompanying materials -# are made available under the terms of the Apache License, Version 2.0 -# which accompanies this distribution, and is available at -# http://www.apache.org/licenses/LICENSE-2.0 -############################################################################## - -cleanup () { - if [ -n "$tmpDir" ]; then - rm -Rf $tmpDir - fi -} - -trap cleanup exit - -error_exit () { - echo "Error: $@" >&2 - exit 1 -} - -tmpDir=`mktemp -d /tmp/deaXXXX` - -export PATH=`dirname $0`:$PATH - -if [ $# -lt 1 ]; then - error_exit "Argument error" -fi -deafile=$1 -shift - -if [ ! -f "$deafile" ]; then - error_exit "Can't find $deafile" -fi - -if [ `fuel env | tail -n +3 | grep -v '^$' | wc -l` -ne 1 ]; then - error_exit "Not exactly one environment" -fi -envId=`fuel env | tail -n +3 | grep -v '^$' | awk '{ print $1 }'` - -fuel settings --env $envId --download --dir $tmpDir > /dev/null || \ - error_exit "Could not get settings" - -fuel network --env $envId --download --dir $tmpDir > /dev/null || \ - error_exit "Could not get network settings" - -cp $tmpDir/network_${envId}.yaml network_before.yaml - -# Transplant network settings -transplant_network_settings.py $tmpDir/network_${envId}.yaml $deafile || \ - error_exit "Could not transplant network settings" -fuel network --env $envId --upload --dir $tmpDir || \ - error_exit "Could not update network settings" -cp $tmpDir/network_${envId}.yaml network_after.yaml - -# Transplant settings -cp $tmpDir/settings_${envId}.yaml settings_before.yaml -transplant_settings.py $tmpDir/settings_${envId}.yaml $deafile || \ - error_exit "Could not transplant settings" -fuel settings --env $envId --upload --dir $tmpDir || \ - error_exit "Could not update settings" -cp $tmpDir/settings_${envId}.yaml settings_after.yaml - - diff --git a/fuel/prototypes/auto-deploy/deploy/tools/transplant2.sh b/fuel/prototypes/auto-deploy/deploy/tools/transplant2.sh deleted file mode 100755 index 46c7a6008..000000000 --- a/fuel/prototypes/auto-deploy/deploy/tools/transplant2.sh +++ /dev/null @@ -1,98 +0,0 @@ -#!/bin/bash -############################################################################## -# Copyright (c) 2015 Ericsson AB and others. -# stefan.k.berg@ericsson.com -# jonas.bjurel@ericsson.com -# All rights reserved. This program and the accompanying materials -# are made available under the terms of the Apache License, Version 2.0 -# which accompanies this distribution, and is available at -# http://www.apache.org/licenses/LICENSE-2.0 -############################################################################## - -cleanup () { - if [ -n "$tmpDir" ]; then - rm -Rf $tmpDir - fi -} - -trap cleanup exit - -error_exit () { - echo "Error: $@" >&2 - exit 1 -} - -# Return offset between DEA node id and cluster node id -getDeaNodeOffset() -{ - local baseId - - baseId=`fuel node | tail -n +3 | awk '{ print $1 }' | sed 's/ //g' | sort -n | head -1` - echo "$[baseId - 1]" -} - -tmpDir=`mktemp -d /tmp/deaXXXX` - -export PATH=`dirname $0`:$PATH - -if [ $# -ne 1 ]; then - error_exit "Argument error" -fi -deaFile=$1 - -if [ ! -f "$deaFile" ]; then - error_exit "Can't find $deaFile" -fi - - -if [ `fuel env | tail -n +3 | grep -v '^$' | wc -l` -ne 1 ]; then - error_exit "Not exactly one environment" -fi -envId=`fuel env | tail -n +3 | grep -v '^$' | awk '{ print $1 }'` - -# Phase 1: Graft deployment information -fuel deployment --env $envId --default --dir $tmpDir || \ - error_exit "Could not dump environment" - -for controller in `find $tmpDir -type f | grep -v compute` -do - transplant_network_scheme.py $controller $deaFile controller || \ - error_exit "Failed to graft `basename $controller`" - - transplant_opnfv_settings.py $controller $deaFile controller || \ - error_exit "Failed to graft `basename $controller`" -done - -for compute in `find $tmpDir -type f | grep compute` -do - transplant_network_scheme.py $compute $deaFile compute || \ - error_exit "Failed to graft `basename $compute`" - - transplant_opnfv_settings.py $compute $deaFile compute || \ - error_exit "Failed to graft `basename $controller`" -done - -fuel deployment --env $envId --upload --dir $tmpDir || \ - error_exit "Could not upload environment" - -# Phase 2: Graft interface information -deaOffset=`getDeaNodeOffset` -echo "DEA offset: $deaOffset" - -for clusterNodeId in `fuel node | grep True | awk '{ print $1}'` -do - deaNodeId=$[clusterNodeId - deaOffset] - echo "Node $clusterNodeId is $deaNodeId" - fuel node --node-id $clusterNodeId --network --download --dir $tmpDir || \ - error_exit "Could not download node $clusterNodeId" - - transplant_interfaces.py ${tmpDir}/node_${clusterNodeId}/interfaces.yaml \ - $deaFile $deaNodeId || \ - error_exit "Failed to graft interfaces" - - fuel node --node-id $clusterNodeId --network --upload --dir $tmpDir || \ - error_exit "Could not upload node $clusterNodeId" -done - - - diff --git a/fuel/prototypes/auto-deploy/deploy/tools/transplant_fuel_settings.py b/fuel/prototypes/auto-deploy/deploy/tools/transplant_fuel_settings.py deleted file mode 100755 index 49ea5e455..000000000 --- a/fuel/prototypes/auto-deploy/deploy/tools/transplant_fuel_settings.py +++ /dev/null @@ -1,50 +0,0 @@ -#!/usr/bin/python -############################################################################## -# Copyright (c) 2015 Ericsson AB and others. -# stefan.k.berg@ericsson.com -# jonas.bjurel@ericsson.com -# All rights reserved. This program and the accompanying materials -# are made available under the terms of the Apache License, Version 2.0 -# which accompanies this distribution, and is available at -# http://www.apache.org/licenses/LICENSE-2.0 -############################################################################## - -import yaml -import re -import sys -import os - -if len(sys.argv) != 3: - sys.stderr.write("Usage: "+sys.argv[0]+" <astutefile> <deafile>\n") - sys.exit(1) - -fuelfile = sys.argv[1] -if not os.path.exists(fuelfile): - sys.stderr.write("ERROR: The file "+fuelfile+" could not be opened\n") - sys.exit(1) - -deafile = sys.argv[2] -if not os.path.exists(deafile): - sys.stderr.write("ERROR: The file "+deafile+" could not be opened\n") - sys.exit(1) - -f = open(deafile, 'r') -dea = yaml.load(f) -f.close() - -f = open(fuelfile, 'r') -fuel = yaml.load(f) -f.close() - -dea = dea["fuel"] -for property in dea.keys(): - if property == "ADMIN_NETWORK": - for adminproperty in dea[property].keys(): - fuel[property][adminproperty] = dea[property][adminproperty] - else: - fuel[property] = dea[property] - -f = open(fuelfile, 'w') -f.write(yaml.dump(fuel, default_flow_style=False)) -f.close() - diff --git a/fuel/prototypes/auto-deploy/deploy/tools/transplant_interfaces.py b/fuel/prototypes/auto-deploy/deploy/tools/transplant_interfaces.py deleted file mode 100755 index 609f360ba..000000000 --- a/fuel/prototypes/auto-deploy/deploy/tools/transplant_interfaces.py +++ /dev/null @@ -1,77 +0,0 @@ -#!/usr/bin/python -############################################################################## -# Copyright (c) 2015 Ericsson AB and others. -# stefan.k.berg@ericsson.com -# jonas.bjurel@ericsson.com -# All rights reserved. This program and the accompanying materials -# are made available under the terms of the Apache License, Version 2.0 -# which accompanies this distribution, and is available at -# http://www.apache.org/licenses/LICENSE-2.0 -############################################################################## - -import yaml -import re -import sys -import os - -if len(sys.argv) != 4: - sys.stderr.write("Usage: "+sys.argv[0]+" <infile> <deafile> <nodeid>\n") - sys.exit(1) - -infile = sys.argv[1] -if not os.path.exists(infile): - sys.stderr.write("ERROR: The file "+infile+" could not be opened\n") - sys.exit(1) - -deafile = sys.argv[2] -if not os.path.exists(deafile): - sys.stderr.write("ERROR: The file "+deafile+" could not be opened\n") - sys.exit(1) -deafile = sys.argv[2] -nodeid = int(sys.argv[3]) - -namespace = "interfaces" - -f1 = open(infile, 'r') -doc1 = yaml.load(f1) -f1.close() - -f2 = open(deafile, 'r') -doc2 = yaml.load(f2) -f2.close() - - -# Create lookup table network name -> id for current setup -nwlookup = {} -for interface in doc1: - iface = {} - networks = [] - for network in interface["assigned_networks"]: - nwlookup[network["name"]] = network["id"] - -# Find network information in DEA for this node -nodeInfo = {} -for node in doc2["nodes"]: - if node["id"] == nodeid: - nodeInfo=node - print "Found nodeinfo for node %d" % nodeid - -out = {} -out["interfaces"] = {} - -for interface in doc1: - assigned = [] - nw = {} - interface["assigned_networks"] = [] - try: - for nwname in nodeInfo["interfaces"][interface["name"]]: - iface = {} - iface["id"] = nwlookup[nwname] - iface["name"] = nwname - interface["assigned_networks"].append(iface) - except: - print "No match for interface " + interface["name"] - -f3 = open(infile, 'w') -f3.write(yaml.dump(doc1, default_flow_style=False)) -f3.close() diff --git a/fuel/prototypes/auto-deploy/deploy/tools/transplant_network_scheme.py b/fuel/prototypes/auto-deploy/deploy/tools/transplant_network_scheme.py deleted file mode 100755 index 7d50cbefe..000000000 --- a/fuel/prototypes/auto-deploy/deploy/tools/transplant_network_scheme.py +++ /dev/null @@ -1,42 +0,0 @@ -#!/usr/bin/python -############################################################################## -# Copyright (c) 2015 Ericsson AB and others. -# stefan.k.berg@ericsson.com -# jonas.bjurel@ericsson.com -# All rights reserved. This program and the accompanying materials -# are made available under the terms of the Apache License, Version 2.0 -# which accompanies this distribution, and is available at -# http://www.apache.org/licenses/LICENSE-2.0 -############################################################################## - -import yaml -import re -import sys -import os - -if len(sys.argv) != 4: - sys.stderr.write("Usage: "+sys.argv[0]+" <file> <deafile> [compute|controller]\n") - sys.exit(1) - -file = sys.argv[1] -if not os.path.exists(file): - sys.stderr.write("ERROR: The file "+file+" could not be opened\n") - sys.exit(1) - -deafile = sys.argv[2] -namespace = sys.argv[3] - -f1 = open(file, 'r') -doc1 = yaml.load(f1) -f1.close() - -f2 = open(deafile, 'r') -doc2 = yaml.load(f2) -f1.close() - -doc1["network_scheme"]["transformations"] = doc2[namespace] - -f2 = open(file, 'w') -f2.write(yaml.dump(doc1, default_flow_style=False)) -f2.close() - diff --git a/fuel/prototypes/auto-deploy/deploy/tools/transplant_network_settings.py b/fuel/prototypes/auto-deploy/deploy/tools/transplant_network_settings.py deleted file mode 100755 index c0a46bec0..000000000 --- a/fuel/prototypes/auto-deploy/deploy/tools/transplant_network_settings.py +++ /dev/null @@ -1,52 +0,0 @@ -#!/usr/bin/python -############################################################################## -# Copyright (c) 2015 Ericsson AB and others. -# stefan.k.berg@ericsson.com -# jonas.bjurel@ericsson.com -# All rights reserved. This program and the accompanying materials -# are made available under the terms of the Apache License, Version 2.0 -# which accompanies this distribution, and is available at -# http://www.apache.org/licenses/LICENSE-2.0 -############################################################################## - -import yaml -import re -import sys -import os - -if len(sys.argv) != 3: - sys.stderr.write("Usage: "+sys.argv[0]+" <file> <deafile>\n") - sys.exit(1) - -file = sys.argv[1] -if not os.path.exists(file): - sys.stderr.write("ERROR: The file "+file+" could not be opened\n") - sys.exit(1) - -deafile = sys.argv[2] -if not os.path.exists(deafile): - sys.stderr.write("ERROR: The file "+deafile+" could not be opened\n") - sys.exit(1) - -f1 = open(file, 'r') -doc1 = yaml.load(f1) -f1.close() - -f2 = open(deafile, 'r') -doc2 = yaml.load(f2) -f2.close() - -# Grab IDs from Fuel version, graft onto DEA version and save -id = [] -groupid = [] -for nw in doc1["networks"]: - id.append(nw["id"]) - groupid.append(nw["group_id"]) - -for nw in doc2["network"]["networks"]: - nw["id"] = id.pop(0) - nw["group_id"] = groupid.pop(0) - -f3 = open(file, 'w') -f3.write(yaml.dump(doc2["network"], default_flow_style=False)) -f3.close() diff --git a/fuel/prototypes/auto-deploy/deploy/tools/transplant_opnfv_settings.py b/fuel/prototypes/auto-deploy/deploy/tools/transplant_opnfv_settings.py deleted file mode 100755 index 00d095093..000000000 --- a/fuel/prototypes/auto-deploy/deploy/tools/transplant_opnfv_settings.py +++ /dev/null @@ -1,42 +0,0 @@ -#!/usr/bin/python -############################################################################## -# Copyright (c) 2015 Ericsson AB and others. -# stefan.k.berg@ericsson.com -# jonas.bjurel@ericsson.com -# All rights reserved. This program and the accompanying materials -# are made available under the terms of the Apache License, Version 2.0 -# which accompanies this distribution, and is available at -# http://www.apache.org/licenses/LICENSE-2.0 -############################################################################## - -import yaml -import re -import sys -import os - -if len(sys.argv) != 4: - sys.stderr.write("Usage: "+sys.argv[0]+" <file> <deafile> [compute|controller]\n") - sys.exit(1) - -file = sys.argv[1] -if not os.path.exists(file): - sys.stderr.write("ERROR: The file "+file+" could not be opened\n") - sys.exit(1) - -deafile = sys.argv[2] -namespace = sys.argv[3] - -f1 = open(file, 'r') -doc1 = yaml.load(f1) -f1.close() - -f2 = open(deafile, 'r') -doc2 = yaml.load(f2) -f1.close() - -doc1["opnfv"] = doc2["opnfv"][namespace] - -f2 = open(file, 'w') -f2.write(yaml.dump(doc1, default_flow_style=False)) -f2.close() - diff --git a/fuel/prototypes/auto-deploy/deploy/tools/transplant_settings.py b/fuel/prototypes/auto-deploy/deploy/tools/transplant_settings.py deleted file mode 100755 index 7f5c0d8e2..000000000 --- a/fuel/prototypes/auto-deploy/deploy/tools/transplant_settings.py +++ /dev/null @@ -1,36 +0,0 @@ -#!/usr/bin/python -############################################################################## -# Copyright (c) 2015 Ericsson AB and others. -# stefan.k.berg@ericsson.com -# jonas.bjurel@ericsson.com -# All rights reserved. This program and the accompanying materials -# are made available under the terms of the Apache License, Version 2.0 -# which accompanies this distribution, and is available at -# http://www.apache.org/licenses/LICENSE-2.0 -############################################################################## - -import yaml -import re -import sys -import os - -if len(sys.argv) != 3: - sys.stderr.write("Usage: "+sys.argv[0]+" <file> <deafile>\n") - sys.exit(1) - -file = sys.argv[1] -if not os.path.exists(file): - sys.stderr.write("ERROR: The file "+file+" could not be opened\n") - sys.exit(1) - -deafile = sys.argv[2] - -f1 = open(deafile, 'r') -doc = yaml.load(f1) -f1.close() - -out = doc["settings"] -f2 = open(file, 'w') -f2.write(yaml.dump(out, default_flow_style=False)) -f2.close() - diff --git a/fuel/prototypes/auto-deploy/deploy/verify_dea.sh b/fuel/prototypes/auto-deploy/deploy/verify_dea.sh deleted file mode 100755 index 2054e9f70..000000000 --- a/fuel/prototypes/auto-deploy/deploy/verify_dea.sh +++ /dev/null @@ -1,79 +0,0 @@ -#!/bin/bash -e -############################################################################## -# Copyright (c) 2015 Ericsson AB and others. -# stefan.k.berg@ericsson.com -# jonas.bjurel@ericsson.com -# All rights reserved. This program and the accompanying materials -# are made available under the terms of the Apache License, Version 2.0 -# which accompanies this distribution, and is available at -# http://www.apache.org/licenses/LICENSE-2.0 -############################################################################## - - -error_exit() -{ - echo "Error: $@" - exit 1 -} - -if [ $# -ne 1 ]; then - echo "Syntax: `basename $0` deafile" - exit 1 -fi - -if [ ! -f $1 ]; then - echo "No such DEA file: $1" - exit 1 -fi - -tmpdir=$HOME/fueltmp2 -rm -Rf $tmpdir -mkdir $tmpdir - -topdir=$(dirname $(readlink -f $BASH_SOURCE)) -. $topdir/functions/common.sh -. $topdir/functions/dea-api.sh $1 - -echo "API version: `dea getApiVersion`" - -#echo "Cluster node id for node 1 is: `dea getClusterNodeId 1`" - -err=1 -echo "Verifying that expected functions are present..." -for function in \ - dea_getApiVersion \ - dea_getNodeRole \ - dea_getFuelIp \ - dea_getFuelNetmask \ - dea_getFuelGateway \ - dea_getFuelHostname \ - dea_getFuelDns \ - dea_convertMacToShortMac \ - dea_getProperty \ - dea_getClusterNodeId \ - dea -do - if type $function &>/dev/null; then - echo "$function: OK" - else - echo "$function: Missing!" - err=0 - fi -done - -if [ $err -eq 0 ]; then - echo "Error in API!" - exit 1 -else - echo "API functions OK." - echo "" -fi - -echo "Fuel IP address: `dea getFuelIp`" -echo "Fuel netmask: `dea getFuelNetmask`" -echo "Fuel gateway: `dea getFuelGateway`" -echo "Fuel hostname: `dea getFuelHostname`" -echo "Fuel DNS: `dea getFuelDns`" -echo "Short MAC of 11:22:33:44:55:66: `dea convertMacToShortMac 11:22:33:44:55:66`" - -echo "Done" diff --git a/fuel/prototypes/auto-deploy/deploy/verify_dha.sh b/fuel/prototypes/auto-deploy/deploy/verify_dha.sh deleted file mode 100755 index 6e2b75f44..000000000 --- a/fuel/prototypes/auto-deploy/deploy/verify_dha.sh +++ /dev/null @@ -1,125 +0,0 @@ -#!/bin/bash -e -############################################################################## -# Copyright (c) 2015 Ericsson AB and others. -# stefan.k.berg@ericsson.com -# jonas.bjurel@ericsson.com -# All rights reserved. This program and the accompanying materials -# are made available under the terms of the Apache License, Version 2.0 -# which accompanies this distribution, and is available at -# http://www.apache.org/licenses/LICENSE-2.0 -############################################################################## - -error_exit() -{ - echo "Error: $@" >&2 - exit 1 -} - -if [ $# -ne 2 ]; then - echo "Syntax: `basename $0` adaptername dhafile" - exit 1 -fi - -if [ ! -f dha-adapters/${1}.sh ]; then - echo "No such adapter file: $1" - exit 1 -elif [ ! -f $2 ]; then - echo "No such DHA file: $2" - exit 1 -fi - -. dha-adapters/${1}.sh $2 - - -err=1 -echo "Verifying that expected functions are present..." -for function in \ - dha_getApiVersion \ - dha_getAdapterName \ - dha_getAllNodeIds \ - dha_getFuelNodeId \ - dha_getNodeProperty \ - dha_getNodePxeMac \ - dha_useFuelCustomInstall \ - dha_fuelCustomInstall \ - dha_getPowerOnStrategy \ - dha_nodePowerOn \ - dha_nodePowerOff \ - dha_nodeReset \ - dha_nodeCanSetBootOrderLive \ - dha_nodeSetBootOrder \ - dha_nodeCanSetIso \ - dha_nodeCanHandeIsoLive \ - dha_nodeInsertIso \ - dha_nodeEjectIso \ - dha_waitForIsoBoot \ - dha_nodeCanZeroMBR \ - dha_nodeZeroMBR \ - dha -do - if type $function &>/dev/null; then - echo "$function: OK" - else - echo "$function: Missing!" - err=0 - fi -done - - -echo "Adapter API version: `dha getApiVersion`" -echo "Adapter name: `dha getAdapterName`" - -echo "All PXE MAC addresses:" -for id in `(dha getAllNodeIds) | sort` -do - if [ "`dha getAdapterName`" == "libvirt" ]; then - libvirtName=`dha getNodeProperty $id libvirtName` - else - libvirtName="" - fi - - if [ $id == "`dha getFuelNodeId`" ]; then - echo "$id: `dha getNodeProperty $id pxeMac` $libvirtName <--- Fuel master" - else - echo "$id: `dha getNodeProperty $id pxeMac` $libvirtName" - fi -done - - -echo -n "Using Fuel custom install: " -if dha useFuelCustomInstall; then - echo "yes" -else - echo "no" -fi - - -echo -n "Can set boot order live: " -if dha nodeCanSetBootOrderLive; then - echo "yes" -else - echo "no" -fi - -echo -n "Can operate on ISO media: " -if dha nodeCanSetIso; then - echo "yes" -else - echo "no" -fi - -echo -n "Can insert/eject ISO without power toggle: " -if dha nodeCanHandeIsoLive; then - echo "yes" -else - echo "no" -fi - -echo -n "Can erase the boot disk MBR: " -if dha nodeCanZeroMBR; then - echo "yes" -else - echo "no" -fi - -echo "Done" diff --git a/fuel/prototypes/auto-deploy/documentation/1-introduction.txt b/fuel/prototypes/auto-deploy/documentation/1-introduction.txt deleted file mode 100644 index c4efed5a8..000000000 --- a/fuel/prototypes/auto-deploy/documentation/1-introduction.txt +++ /dev/null @@ -1,36 +0,0 @@ -The structure is being reworked. This page is an introduction to DEA -and DHA. - -Introduction - -The aim of the deployment prototype is to try out a (hopefully) -logical setup to support Fuel deployment on a variety of different -hardware platforms using a common data format to describe the -deployment itself and another data format to describe the hardware in -question. - -DEA.yaml The DEA.yaml file describes a Fuel deployment, complete with - all settings. The easiest way to create this file is to use - the "create_templates.sh" script in an existing deployment to - copy its configuration to the DEA.yaml file. - -DHA.yaml The DHA.yaml file describes to hardware setup for an - installation. This file denotes among other things which DHA - adapter to use when deploying Fuel on this hardware setup. - -DHA adapter interface: The DHA adapter interface contains a number of - functions calls available to the automatic Fuel deployer script - (deploy.sh). Each adapter creates an implementation of this - interface in order for the deployer to orchestrate the - installation. There's currently an example DHA adapter "libvirt" - that is able to deploy Fuel in a nested KVM environment. Future - adapters could support HP C7000, Dell R620 or other types of - hardware. - - It is important to note that a certain DHA adapter could implement - the dha_fuelCustomInstall() function, which for instance could - install the Fuel master as a VM or using PXE. - -A typical installation would be kicked off by the following command: - -./deploy.sh <isofile to deploy> <dea.yaml> <dha.yaml> diff --git a/fuel/prototypes/auto-deploy/documentation/2-dea.txt b/fuel/prototypes/auto-deploy/documentation/2-dea.txt deleted file mode 100644 index 36f805c26..000000000 --- a/fuel/prototypes/auto-deploy/documentation/2-dea.txt +++ /dev/null @@ -1,1082 +0,0 @@ -The structure is being reworked. This page describes the DEA.yaml -file. - -The DEA.yaml file describes an actual Fuel deployment. This YAML file -can either be edited from an existing template or created from an -existing deployment by running the "create_templates.sh" script. - -The top level fields and their origin - -compute: Network translations for the compute nodes (from astute.yaml) -Hoping that this is sufficient and we don't need to be more granular! - -controller: Network translations for the compute nodes (from -astute.yaml) Hoping that this is sufficient and we don't need to be -more granular! - -created: Creation time for this DEA file. - -environment_mode: Environment mode from "fuel env" (ha_compact, -multinode, ...) - -fuel: The networking, DNS and NTP information from the Fuel node -astute.yaml. - -network: The "fuel network" part. - -nodes: A data structure describing the role and network configuration -for all nodes. - -opnfv: This structure contains two sub structures "controller" and -"compute" containing the "opnfv" namespace from their respective -astute.yaml. - -settings: The "fuel settings" part. This is the complete settings, -thinking it can come in handy for future modifications. I think that -the "pre_deploy.sh" should be replaced by us customising these -settings instead (way into the future though). - -title: Deployment Environment Adapter (DEA) - -version: DEA API to be used for parsing this file. Currently 1.1. - -Live example (looooong!) - -# DEA API version supported -version: 1.1 -created: Wed Apr 22 09:43:22 UTC 2015 -comment: Small libvirt deployment -nodes: -- id: 1 - interfaces: - eth0: - - fuelweb_admin - - management - eth1: - - storage - eth2: - - private - eth3: - - public - role: compute -- id: 2 - interfaces: - eth0: - - fuelweb_admin - - management - eth1: - - storage - eth2: - - private - eth3: - - public - role: controller -environment_mode: multinode -fuel: - ADMIN_NETWORK: - dhcp_pool_end: 10.20.0.254 - dhcp_pool_start: 10.20.0.3 - ipaddress: 10.20.0.2 - netmask: 255.255.255.0 - DNS_DOMAIN: domain.tld - DNS_SEARCH: domain.tld - DNS_UPSTREAM: 8.8.8.8 - FUEL_ACCESS: - password: admin - user: admin - HOSTNAME: fuel - NTP1: 0.pool.ntp.org - NTP2: 1.pool.ntp.org - NTP3: 2.pool.ntp.org -controller: -- action: add-br - name: br-eth0 -- action: add-port - bridge: br-eth0 - name: eth0 -- action: add-br - name: br-eth1 -- action: add-port - bridge: br-eth1 - name: eth1 -- action: add-br - name: br-eth2 -- action: add-port - bridge: br-eth2 - name: eth2 -- action: add-br - name: br-eth3 -- action: add-port - bridge: br-eth3 - name: eth3 -- action: add-br - name: br-ex -- action: add-br - name: br-mgmt -- action: add-br - name: br-storage -- action: add-br - name: br-fw-admin -- action: add-patch - bridges: - - br-eth1 - - br-storage - tags: - - 102 - - 0 - vlan_ids: - - 102 - - 0 -- action: add-patch - bridges: - - br-eth0 - - br-mgmt - tags: - - 101 - - 0 - vlan_ids: - - 101 - - 0 -- action: add-patch - bridges: - - br-eth0 - - br-fw-admin - trunks: - - 0 -- action: add-patch - bridges: - - br-eth3 - - br-ex - trunks: - - 0 -- action: add-br - name: br-prv -- action: add-patch - bridges: - - br-eth2 - - br-prv -compute: -- action: add-br - name: br-eth0 -- action: add-port - bridge: br-eth0 - name: eth0 -- action: add-br - name: br-eth1 -- action: add-port - bridge: br-eth1 - name: eth1 -- action: add-br - name: br-eth2 -- action: add-port - bridge: br-eth2 - name: eth2 -- action: add-br - name: br-eth3 -- action: add-port - bridge: br-eth3 - name: eth3 -- action: add-br - name: br-mgmt -- action: add-br - name: br-storage -- action: add-br - name: br-fw-admin -- action: add-patch - bridges: - - br-eth1 - - br-storage - tags: - - 102 - - 0 - vlan_ids: - - 102 - - 0 -- action: add-patch - bridges: - - br-eth0 - - br-mgmt - tags: - - 101 - - 0 - vlan_ids: - - 101 - - 0 -- action: add-patch - bridges: - - br-eth0 - - br-fw-admin - trunks: - - 0 -- action: add-br - name: br-prv -- action: add-patch - bridges: - - br-eth2 - - br-prv -opnfv: - compute: - dns: - compute: - - 8.8.8.8 - - 8.8.4.4 - controller: - - 8.8.8.8 - - 8.8.4.4 - hosts: - - address: 46.253.206.181 - fqdn: tor.e1.se - name: tor - ntp: - compute: 'server node-4.domain.tld - - ' - controller: 'server 0.ubuntu.pool.ntp.org - - server 1.ubuntu.pool.ntp.org - - server 2.ubuntu.pool.ntp.org - - server 3.ubuntu.pool.ntp.org - - ' - controller: - dns: - compute: - - 8.8.8.8 - - 8.8.4.4 - controller: - - 8.8.8.8 - - 8.8.4.4 - hosts: - - address: 46.253.206.181 - fqdn: tor.e1.se - name: tor - ntp: - compute: 'server node-4.domain.tld - - ' - controller: 'server 0.ubuntu.pool.ntp.org - - server 1.ubuntu.pool.ntp.org - - server 2.ubuntu.pool.ntp.org - - server 3.ubuntu.pool.ntp.org - - ' -network: - networking_parameters: - base_mac: fa:16:3e:00:00:00 - dns_nameservers: - - 8.8.4.4 - - 8.8.8.8 - floating_ranges: - - - 172.16.0.130 - - 172.16.0.254 - gre_id_range: - - 2 - - 65535 - internal_cidr: 192.168.111.0/24 - internal_gateway: 192.168.111.1 - net_l23_provider: ovs - segmentation_type: vlan - vlan_range: - - 1000 - - 1200 - networks: - - cidr: 172.16.0.0/24 - gateway: 172.16.0.1 - ip_ranges: - - - 172.16.0.2 - - 172.16.0.126 - meta: - assign_vip: true - cidr: 172.16.0.0/24 - configurable: true - floating_range_var: floating_ranges - ip_range: - - 172.16.0.2 - - 172.16.0.126 - map_priority: 1 - name: public - notation: ip_ranges - render_addr_mask: public - render_type: null - use_gateway: true - vlan_start: null - name: public - vlan_start: null - - cidr: 192.168.0.0/24 - gateway: null - ip_ranges: - - - 192.168.0.2 - - 192.168.0.254 - meta: - assign_vip: true - cidr: 192.168.0.0/24 - configurable: true - map_priority: 2 - name: management - notation: cidr - render_addr_mask: internal - render_type: cidr - use_gateway: false - vlan_start: 101 - name: management - vlan_start: 101 - - cidr: 192.168.1.0/24 - gateway: null - ip_ranges: - - - 192.168.1.2 - - 192.168.1.254 - meta: - assign_vip: false - cidr: 192.168.1.0/24 - configurable: true - map_priority: 2 - name: storage - notation: cidr - render_addr_mask: storage - render_type: cidr - use_gateway: false - vlan_start: 102 - name: storage - vlan_start: 102 - - cidr: null - gateway: null - ip_ranges: [] - meta: - assign_vip: false - configurable: false - map_priority: 2 - name: private - neutron_vlan_range: true - notation: null - render_addr_mask: null - render_type: null - seg_type: vlan - use_gateway: false - vlan_start: null - name: private - vlan_start: null - - cidr: 10.20.0.0/24 - gateway: null - ip_ranges: - - - 10.20.0.3 - - 10.20.0.254 - meta: - assign_vip: false - configurable: false - map_priority: 0 - notation: ip_ranges - render_addr_mask: null - render_type: null - unmovable: true - use_gateway: true - name: fuelweb_admin - vlan_start: null -interfaces: - eth0: - - fuelweb_admin - - management - eth1: - - storage - eth2: - - private - eth3: - - public -settings: - editable: - access: - email: - description: Email address for Administrator - label: email - type: text - value: admin@localhost - weight: 40 - metadata: - label: Access - weight: 10 - password: - description: Password for Administrator - label: password - type: password - value: admin - weight: 20 - tenant: - description: Tenant (project) name for Administrator - label: tenant - regex: - error: Invalid tenant name - source: ^(?!services$)(?!nova$)(?!glance$)(?!keystone$)(?!neutron$)(?!cinder$)(?!swift -$)(?!ceph$)(?![Gg]uest$).* - type: text - value: admin - weight: 30 - user: - description: Username for Administrator - label: username - regex: - error: Invalid username - source: ^(?!services$)(?!nova$)(?!glance$)(?!keystone$)(?!neutron$)(?!cinder$)(?!swift -$)(?!ceph$)(?![Gg]uest$).* - type: text - value: admin - weight: 10 - additional_components: - ceilometer: - description: If selected, Ceilometer component will be installed - label: Install Ceilometer - type: checkbox - value: false - weight: 40 - heat: - description: '' - label: '' - type: hidden - value: true - weight: 30 - metadata: - label: Additional Components - weight: 20 - murano: - description: If selected, Murano component will be installed - label: Install Murano - restrictions: - - cluster:net_provider != 'neutron' - type: checkbox - value: false - weight: 20 - sahara: - description: If selected, Sahara component will be installed - label: Install Sahara - type: checkbox - value: false - weight: 10 - common: - auth_key: - description: Public key(s) to include in authorized_keys on deployed nodes - label: Public Key - type: text - value: '' - weight: 70 - auto_assign_floating_ip: - description: If selected, OpenStack will automatically assign a floating IP - to a new instance - label: Auto assign floating IP - restrictions: - - cluster:net_provider == 'neutron' - type: checkbox - value: false - weight: 40 - compute_scheduler_driver: - label: Scheduler driver - type: radio - value: nova.scheduler.filter_scheduler.FilterScheduler - values: - - data: nova.scheduler.filter_scheduler.FilterScheduler - description: Currently the most advanced OpenStack scheduler. See the OpenStack - documentation for details. - label: Filter scheduler - - data: nova.scheduler.simple.SimpleScheduler - description: This is 'naive' scheduler which tries to find the least loaded - host - label: Simple scheduler - weight: 40 - debug: - description: Debug logging mode provides more information, but requires more - disk space. - label: OpenStack debug logging - type: checkbox - value: false - weight: 20 - disable_offload: - description: If set, generic segmentation offload (gso) and generic receive - offload (gro) on physical nics will be disabled. See ethtool man. - label: Disable generic offload on physical nics - restrictions: - - action: hide - condition: cluster:net_provider == 'neutron' and networking_parameters:segmentation_ty -pe - == 'gre' - type: checkbox - value: true - weight: 80 - libvirt_type: - label: Hypervisor type - type: radio - value: kvm - values: - - data: kvm - description: Choose this type of hypervisor if you run OpenStack on hardware - label: KVM - restrictions: - - settings:common.libvirt_type.value == 'vcenter' - - data: qemu - description: Choose this type of hypervisor if you run OpenStack on virtual - hosts. - label: QEMU - restrictions: - - settings:common.libvirt_type.value == 'vcenter - - data: vcenter - description: Choose this type of hypervisor if you run OpenStack in a vCenter - environment. - label: vCenter - restrictions: - - settings:common.libvirt_type.value != 'vcenter' or cluster:net_provider - == 'neutron' - weight: 30 - metadata: - label: Common - weight: 30 - nova_quota: - description: Quotas are used to limit CPU and memory usage for tenants. Enabling - quotas will increase load on the Nova database. - label: Nova quotas - type: checkbox - value: false - weight: 25 - resume_guests_state_on_host_boot: - description: Whether to resume previous guests state when the host reboots. - If enabled, this option causes guests assigned to the host to resume their - previous state. If the guest was running a restart will be attempted when - nova-compute starts. If the guest was not running previously, a restart - will not be attempted. - label: Resume guests state on host boot - type: checkbox - value: false - weight: 60 - use_cow_images: - description: For most cases you will want qcow format. If it's disabled, raw - image format will be used to run VMs. OpenStack with raw format currently - does not support snapshotting. - label: Use qcow format for images - type: checkbox - value: true - weight: 50 - corosync: - group: - description: '' - label: Group - type: text - value: 226.94.1.1 - weight: 10 - metadata: - label: Corosync - restrictions: - - action: hide - condition: 'true' - weight: 50 - port: - description: '' - label: Port - type: text - value: '12000' - weight: 20 - verified: - description: Set True only if multicast is configured correctly on router. - label: Need to pass network verification. - type: checkbox - value: false - weight: 10 - external_dns: - dns_list: - description: List of upstream DNS servers, separated by comma - label: DNS list - type: text - value: 8.8.8.8, 8.8.4.4 - weight: 10 - metadata: - label: Upstream DNS - weight: 90 - external_ntp: - metadata: - label: Upstream NTP - weight: 100 - ntp_list: - description: List of upstream NTP servers, separated by comma - label: NTP servers list - type: text - value: 0.pool.ntp.org, 1.pool.ntp.org - weight: 10 - kernel_params: - kernel: - description: Default kernel parameters - label: Initial parameters - type: text - value: console=ttyS0,9600 console=tty0 rootdelay=90 nomodeset - weight: 45 - metadata: - label: Kernel parameters - weight: 40 - neutron_mellanox: - metadata: - enabled: true - label: Mellanox Neutron components - toggleable: false - weight: 50 - plugin: - label: Mellanox drivers and SR-IOV plugin - type: radio - value: disabled - values: - - data: disabled - description: If selected, Mellanox drivers, Neutron and Cinder plugin will - not be installed. - label: Mellanox drivers and plugins disabled - restrictions: - - settings:storage.iser.value == true - - data: drivers_only - description: If selected, Mellanox Ethernet drivers will be installed to - support networking over Mellanox NIC. Mellanox Neutron plugin will not - be installed. - label: Install only Mellanox drivers - restrictions: - - settings:common.libvirt_type.value != 'kvm' - - data: ethernet - description: If selected, both Mellanox Ethernet drivers and Mellanox network - acceleration (Neutron) plugin will be installed. - label: Install Mellanox drivers and SR-IOV plugin - restrictions: - - settings:common.libvirt_type.value != 'kvm' or not (cluster:net_provider - == 'neutron' and networking_parameters:segmentation_type == 'vlan') - weight: 60 - vf_num: - description: Note that one virtual function will be reserved to the storage - network, in case of choosing iSER. - label: Number of virtual NICs - restrictions: - - settings:neutron_mellanox.plugin.value != 'ethernet' - type: text - value: '16' - weight: 70 - nsx_plugin: - connector_type: - description: Default network transport type to use - label: NSX connector type - type: select - value: stt - values: - - data: gre - label: GRE - - data: ipsec_gre - label: GRE over IPSec - - data: stt - label: STT - - data: ipsec_stt - label: STT over IPSec - - data: bridge - label: Bridge - weight: 80 - l3_gw_service_uuid: - description: UUID for the default L3 gateway service to use with this cluster - label: L3 service UUID - regex: - error: Invalid L3 gateway service UUID - source: '[a-f\d]{8}-[a-f\d]{4}-[a-f\d]{4}-[a-f\d]{4}-[a-f\d]{12}' - type: text - value: '' - weight: 50 - metadata: - enabled: false - label: VMware NSX - restrictions: - - action: hide - condition: cluster:net_provider != 'neutron' or networking_parameters:net_l23_provider - != 'nsx' - weight: 20 - nsx_controllers: - description: One or more IPv4[:port] addresses of NSX controller node, separated - by comma (e.g. 10.30.30.2,192.168.110.254:443) - label: NSX controller endpoint - regex: - error: Invalid controller endpoints, specify valid IPv4[:port] pair - source: ^(([\d]|[1-9][\d]|1[\d]{2}|2[0-4][\d]|25[0-5])\.){3}([\d]|[1-9][\d]|1[\d]{2}|2 -[0-4][\d]|25[0-5])(:(6553[0-5]|655[0-2][\d]|65[0-4][\d]{2}|6[0-4][\d]{3}|5[\d]{4}|[\d][\d]{0,3}) -)?(,(([\d]|[1-9][\d]|1[\d]{2}|2[0-4][\d]|25[0-5])\.){3}([\d]|[1-9][\d]|1[\d]{2}|2[0-4][\d]|25[0- -5])(:(6553[0-5]|655[0-2][\d]|65[0-4][\d]{2}|6[0-4][\d]{3}|5[\d]{4}|[\d][\d]{0,3}))?)*$ - type: text - value: '' - weight: 60 - nsx_password: - description: Password for Administrator - label: NSX password - regex: - error: Empty password - source: \S - type: password - value: '' - weight: 30 - nsx_username: - description: NSX administrator's username - label: NSX username - regex: - error: Empty username - source: \S - type: text - value: admin - weight: 20 - packages_url: - description: URL to NSX specific packages - label: URL to NSX bits - regex: - error: Invalid URL, specify valid HTTP/HTTPS URL with IPv4 address (e.g. - http://10.20.0.2/nsx) - source: ^https?://(([\d]|[1-9][\d]|1[\d]{2}|2[0-4][\d]|25[0-5])\.){3}([\d]|[1-9][\d]|1 -[\d]{2}|2[0-4][\d]|25[0-5])(:(6553[0-5]|655[0-2][\d]|65[0-4][\d]{2}|6[0-4][\d]{3}|5[\d]{4}|[\d][ -\d]{0,3}))?(/.*)?$ - type: text - value: '' - weight: 70 - replication_mode: - description: '' - label: NSX cluster has Service nodes - type: checkbox - value: true - weight: 90 - transport_zone_uuid: - description: UUID of the pre-existing default NSX Transport zone - label: Transport zone UUID - regex: - error: Invalid transport zone UUID - source: '[a-f\d]{8}-[a-f\d]{4}-[a-f\d]{4}-[a-f\d]{4}-[a-f\d]{12}' - type: text - value: '' - weight: 40 - provision: - metadata: - label: Provision - restrictions: - - action: hide - condition: not ('experimental' in version:feature_groups) - weight: 80 - method: - description: Which provision method to use for this cluster. - label: Provision method - type: radio - value: cobbler - values: - - data: image - description: Copying pre-built images on a disk. - label: Image - - data: cobbler - description: Install from scratch using anaconda or debian-installer. - label: Classic (use anaconda or debian-installer) - public_network_assignment: - assign_to_all_nodes: - description: When disabled, public network will be assigned to controllers - and zabbix-server only - label: Assign public network to all nodes - type: checkbox - value: false - weight: 10 - metadata: - label: Public network assignment - restrictions: - - action: hide - condition: cluster:net_provider != 'neutron' - weight: 50 - storage: - ephemeral_ceph: - description: Configures Nova to store ephemeral volumes in RBD. This works - best if Ceph is enabled for volumes and images, too. Enables live migration - of all types of Ceph backed VMs (without this option, live migration will - only work with VMs launched from Cinder volumes). - label: Ceph RBD for ephemeral volumes (Nova) - restrictions: - - settings:common.libvirt_type.value == 'vcenter' - type: checkbox - value: false - weight: 75 - images_ceph: - description: Configures Glance to use the Ceph RBD backend to store images. - If enabled, this option will prevent Swift from installing. - label: Ceph RBD for images (Glance) - type: checkbox - value: false - weight: 30 - images_vcenter: - description: Configures Glance to use the vCenter/ESXi backend to store images. - If enabled, this option will prevent Swift from installing. - label: VMWare vCenter/ESXi datastore for images (Glance) - restrictions: - - settings:common.libvirt_type.value != 'vcenter' - type: checkbox - value: false - weight: 35 - iser: - description: 'High performance block storage: Cinder volumes over iSER protocol - (iSCSI over RDMA). This feature requires SR-IOV capabilities in the NIC, - and will use a dedicated virtual function for the storage network.' - label: iSER protocol for volumes (Cinder) - restrictions: - - settings:storage.volumes_lvm.value != true or settings:common.libvirt_type.value - != 'kvm' - type: checkbox - value: false - weight: 11 - metadata: - label: Storage - weight: 60 - objects_ceph: - description: Configures RadosGW front end for Ceph RBD. This exposes S3 and - Swift API Interfaces. If enabled, this option will prevent Swift from installing. - label: Ceph RadosGW for objects (Swift API) - restrictions: - - settings:storage.images_ceph.value == false - type: checkbox - value: false - weight: 80 - osd_pool_size: - description: Configures the default number of object replicas in Ceph. This - number must be equal to or lower than the number of deployed 'Storage - - Ceph OSD' nodes. - label: Ceph object replication factor - regex: - error: Invalid number - source: ^[1-9]\d*$ - restrictions: - - settings:common.libvirt_type.value == 'vcenter' - type: text - value: '2' - weight: 85 - vc_datacenter: - description: Inventory path to a datacenter. If you want to use ESXi host - as datastore, it should be "ha-datacenter". - label: Datacenter name - regex: - error: Empty datacenter - source: \S - restrictions: - - action: hide - condition: settings:storage.images_vcenter.value == false or settings:common.libvirt_t -ype.value - != 'vcenter' - type: text - value: '' - weight: 65 - vc_datastore: - description: Datastore associated with the datacenter. - label: Datastore name - regex: - error: Empty datastore - source: \S - restrictions: - - action: hide - condition: settings:storage.images_vcenter.value == false or settings:common.libvirt_t -ype.value - != 'vcenter' - type: text - value: '' - weight: 60 - vc_host: - description: IP Address of vCenter/ESXi - label: vCenter/ESXi IP - regex: - error: Specify valid IPv4 address - source: ^(([\d]|[1-9][\d]|1[\d]{2}|2[0-4][\d]|25[0-5])\.){3}([\d]|[1-9][\d]|1[\d]{2}|2 -[0-4][\d]|25[0-5])$ - restrictions: - - action: hide - condition: settings:storage.images_vcenter.value == false or settings:common.libvirt_t -ype.value - != 'vcenter' - type: text - value: '' - weight: 45 - vc_image_dir: - description: The name of the directory where the glance images will be stored - in the VMware datastore. - label: Datastore Images directory - regex: - error: Empty images directory - source: \S - restrictions: - - action: hide - condition: settings:storage.images_vcenter.value == false or settings:common.libvirt_t -ype.value - != 'vcenter' - type: text - value: /openstack_glance - weight: 70 - vc_password: - description: vCenter/ESXi admin password - label: Password - regex: - error: Empty password - source: \S - restrictions: - - action: hide - condition: settings:storage.images_vcenter.value == false or settings:common.libvirt_t -ype.value - != 'vcenter' - type: password - value: '' - weight: 55 - vc_user: - description: vCenter/ESXi admin username - label: Username - regex: - error: Empty username - source: \S - restrictions: - - action: hide - condition: settings:storage.images_vcenter.value == false or settings:common.libvirt_t -ype.value - != 'vcenter' - type: text - value: '' - weight: 50 - volumes_ceph: - description: Configures Cinder to store volumes in Ceph RBD images. - label: Ceph RBD for volumes (Cinder) - restrictions: - - settings:storage.volumes_lvm.value == true or settings:common.libvirt_type.value - == 'vcenter' - type: checkbox - value: false - weight: 20 - volumes_lvm: - description: Requires at least one Storage - Cinder LVM node. - label: Cinder LVM over iSCSI for volumes - restrictions: - - settings:storage.volumes_ceph.value == true - type: checkbox - value: false - weight: 10 - volumes_vmdk: - description: Configures Cinder to store volumes via VMware vCenter. - label: VMware vCenter for volumes (Cinder) - restrictions: - - settings:common.libvirt_type.value != 'vcenter' or settings:storage.volumes_lvm.value - == true - type: checkbox - value: false - weight: 15 - syslog: - metadata: - label: Syslog - weight: 50 - syslog_port: - description: Remote syslog port - label: Port - regex: - error: Invalid Syslog port - source: ^([1-9][0-9]{0,3}|[1-5][0-9]{4}|6[0-4][0-9]{3}|65[0-4][0-9]{2}|655[0-2][0-9]|6 -553[0-5])$ - type: text - value: '514' - weight: 20 - syslog_server: - description: Remote syslog hostname - label: Hostname - type: text - value: '' - weight: 10 - syslog_transport: - label: Syslog transport protocol - type: radio - value: tcp - values: - - data: udp - description: '' - label: UDP - - data: tcp - description: '' - label: TCP - weight: 30 - vcenter: - cluster: - description: vCenter cluster name. If you have multiple clusters, use comma - to separate names - label: Cluster - regex: - error: Invalid cluster list - source: ^([^,\ ]+([\ ]*[^,\ ])*)(,[^,\ ]+([\ ]*[^,\ ])*)*$ - type: text - value: '' - weight: 40 - datastore_regex: - description: The Datastore regexp setting specifies the data stores to use - with Compute. For example, "nas.*". If you want to use all available datastores, - leave this field blank - label: Datastore regexp - regex: - error: Invalid datastore regexp - source: ^(\S.*\S|\S|)$ - type: text - value: '' - weight: 50 - host_ip: - description: IP Address of vCenter - label: vCenter IP - regex: - error: Specify valid IPv4 address - source: ^(([\d]|[1-9][\d]|1[\d]{2}|2[0-4][\d]|25[0-5])\.){3}([\d]|[1-9][\d]|1[\d]{2}|2 -[0-4][\d]|25[0-5])$ - type: text - value: '' - weight: 10 - metadata: - label: vCenter - restrictions: - - action: hide - condition: settings:common.libvirt_type.value != 'vcenter' - weight: 20 - use_vcenter: - description: '' - label: '' - type: hidden - value: true - weight: 5 - vc_password: - description: vCenter admin password - label: Password - regex: - error: Empty password - source: \S - type: password - value: admin - weight: 30 - vc_user: - description: vCenter admin username - label: Username - regex: - error: Empty username - source: \S - type: text - value: admin - weight: 20 - vlan_interface: - description: Physical ESXi host ethernet adapter for VLAN networking (e.g. - vmnic1). If empty "vmnic0" is used by default - label: ESXi VLAN interface - restrictions: - - action: hide - condition: cluster:net_provider != 'nova_network' or networking_parameters:net_manager - != 'VlanManager' - type: text - value: '' - weight: 60 - zabbix: - metadata: - label: Zabbix Access - restrictions: - - action: hide - condition: not ('experimental' in version:feature_groups) - weight: 70 - password: - description: Password for Zabbix Administrator - label: password - type: password - value: zabbix - weight: 20 - username: - description: Username for Zabbix Administrator - label: username - type: text - value: admin - weight: 10 - - diff --git a/fuel/prototypes/auto-deploy/documentation/3-dha.txt b/fuel/prototypes/auto-deploy/documentation/3-dha.txt deleted file mode 100644 index d38b6d00b..000000000 --- a/fuel/prototypes/auto-deploy/documentation/3-dha.txt +++ /dev/null @@ -1,65 +0,0 @@ -The structure is being reworked. This page describes the DHA.yaml file. - -Below is an example DHA for a libvirt deployment. An actual hardware deployment -could for instance add additional data fields to the node list, such as: - -nodes: -- id: 1 - pxeMac: 52:54:00:9c:c2:c9 - ipmiIp: 192.168.220.1 - ipmiUser: admin - impiPassword: ericsson - isFuel: true - -The important thing is to keep the mandatory fields and add additional -ones to map to the DHA adapter implementation for the hardware in -question. - -The following example for libvirt is based on what's created by -create_template.sh. - -Example DHA.yaml file for a libvirt adapter - -# DHA API version supported -version: 1.1 -created: Wed Apr 22 11:34:14 UTC 2015 -comment: Small libvirt deployment - -# Adapter to use for this definition -adapter: libvirt - -# Node list. -# Mandatory fields are id, role and the "isFuel: true" property -# for the Fuel node if not fuelCustomInstall is set, when it is -# optional. -# The MAC address of the PXE boot interface is not mandatory -# to be set, but the field must be present. -# All other fields are adapter specific. - -nodes: -- id: 1 - pxeMac: 52:54:00:38:c7:8e -- id: 2 - pxeMac: 52:54:00:9c:c2:c9 -- id: 3 - pxeMac: 11:11:11:11:11:11 - isFuel: true - -# Deployment power on strategy -# all: Turn on all nodes at once. If MAC addresses are set these -# will be used for connecting roles to physical nodes, if the -# installation order will be arbitrary. -# sequence: Turn on the nodes in sequence starting with the lowest order -# node and wait for the node to be detected by Fuel. Not until -# the node has been detected and assigned a role will the next -# node be turned on. -powerOnStrategy: all - -# If fuelCustomInstall is set to true, Fuel is assumed to be installed by -# calling the DHA adapter function "dha_fuelCustomInstall()" with two -# arguments: node ID and the ISO file name to deploy. The custom install -# function is then to handle all necessary logic to boot the Fuel master -# from the ISO and then return. -# Allowed values: true, false - -fuelCustomInstall: false diff --git a/fuel/prototypes/auto-deploy/documentation/4-dha-adapter-api.txt b/fuel/prototypes/auto-deploy/documentation/4-dha-adapter-api.txt deleted file mode 100644 index 917d17cf5..000000000 --- a/fuel/prototypes/auto-deploy/documentation/4-dha-adapter-api.txt +++ /dev/null @@ -1,128 +0,0 @@ -The structure is being reworked. This page describes the DHA adapter interface. - - -This is a the beginning of a documentation of the DHA adapter -interface, which is auto generated from the bash implementation of the -libvirt DHA adapter. So, to some extent work in progress. - -An example run from the ./verify_adapter tool: - -sfb@blackbox:~/git/toolbox/opnfv/production/deploy$ ./verify_adapter.sh libvirt.sh dha.yaml -Adapter init -dha.yaml -DHAPARSE: /home/sfb/git/toolbox/opnfv/production/deploy/dha-adapters/dhaParse.py -DHAFILE: dha.yaml -Adapter API version: 1.0 -Adapter name: libvirt -All PXE MAC addresses: -1: 52:54:00:38:c7:8e -2: 52:54:00:9c:c2:c9 -Using Fuel custom install: no -Can set boot order live: no -Can operate on ISO media: yes -Can insert/eject ISO without power toggle: yes -Can erase the boot disk MBR: yes -Done - - -*** DHA API definition version 1.1 *** - -# Get the DHA API version supported by this adapter -dha_getApiVersion () - -# Get the name of this adapter -dha_getAdapterName () - -# ### Node identity functions ### -# Node numbering is sequential. -# Get a list of all defined node ids, sorted in ascending order -dha_getAllNodeIds() - -# Get ID for Fuel node ID -dha_getFuelNodeId() - -# Get node property -# Argument 1: node id -# Argument 2: Property -dha_getNodeProperty() - -# Get MAC address for the PXE interface of this node. If not -# defined, an empty string will be returned. -# Argument 1: Node id -dha_getNodePxeMac() - -# Use custom installation method for Fuel master? -# Returns 0 if true, 1 if false -dha_useFuelCustomInstall() - -# Fuel custom installation method -# Leaving the Fuel master powered on and booting from ISO at exit -# Argument 1: Full path to ISO file to install -dha_fuelCustomInstall() - -# Get power on strategy from DHA -# Returns one of two values: -# all: Power on all nodes simultaneously -# sequence: Power on node by node, wait for Fuel detection -dha_getPowerOnStrategy() - -# Power on node -# Argument 1: node id -dha_nodePowerOn() - -# Power off node -# Argument 1: node id -dha_nodePowerOff() - -# Reset node -# Argument 1: node id -dha_nodeReset() - -# Is the node able to commit boot order without power toggle? -# Argument 1: node id -# Returns 0 if true, 1 if false -dha_nodeCanSetBootOrderLive() - -# Set node boot order -# Argument 1: node id -# Argument 2: Space separated line of boot order - boot ids are "pxe", "disk" and "iso" -dha_nodeSetBootOrder() - -# Is the node able to operate on ISO media? -# Argument 1: node id -# Returns 0 if true, 1 if false -dha_nodeCanSetIso() - -# Is the node able to insert add eject ISO files without power toggle? -# Argument 1: node id -# Returns 0 if true, 1 if false -dha_nodeCanHandeIsoLive() - -# Insert ISO into virtualDVD -# Argument 1: node id -# Argument 2: iso file -dha_nodeInsertIso() - -# Eject ISO from virtual DVD -# Argument 1: node id -dha_nodeEjectIso() - -# Wait until a suitable time to change the boot order to -# "disk iso" when ISO has been booted. Can't be too long, nor -# too short... -# We should make a smart trigger for this somehow... -dha_waitForIsoBoot() - -# Is the node able to reset its MBR? -# Returns 0 if true, 1 if false -dha_nodeCanZeroMBR() - -# Reset the node's MBR -dha_nodeZeroMBR() - -# Entry point for dha functions -# Typically do not call "dha_node_zeroMBR" but "dha node_ZeroMBR" -# Before calling dha, the adapter file must gave been sourced with -# the DHA file name as argument -dha() - diff --git a/fuel/prototypes/auto-deploy/documentation/5-dea-api.txt b/fuel/prototypes/auto-deploy/documentation/5-dea-api.txt deleted file mode 100644 index d5c6f5c4e..000000000 --- a/fuel/prototypes/auto-deploy/documentation/5-dea-api.txt +++ /dev/null @@ -1,47 +0,0 @@ -The structure is being reworked. This page describes the DEA interface. - -The DEA API is internal to the deployer, but documented here for information. - -*** DEA API definition version 1.1 *** - -# Get the DEA API version supported by this adapter -dea_getApiVersion () - -# Node numbering is sequential. -# Get the role for this node -# Argument 1: node id -dea_getNodeRole() - -# Get IP address of Fuel master -dea_getFuelIp() - -# Get netmask Fuel master -dea_getFuelNetmask() - -# Get gateway address of Fuel master -dea_getFuelGateway() - -# Get gateway address of Fuel master -dea_getFuelHostname() - -# Get DNS address of Fuel master -dea_getFuelDns() - -# Convert a normal MAC to a Fuel short mac for --node-id -dea_convertMacToShortMac() - -# Get property from DEA file -# Argument 1: search path, as e.g. "fuel ADMIN_NETWORK ipaddress" -dea_getProperty() - -# Convert DHA node id to Fuel cluster node id -# Look for lowest Fuel node number, this will be DHA node 1 -# Argument: node id -dea_getClusterNodeId() - -# Entry point for dea functions -# Typically do not call "dea_node_zeroMBR" but "dea node_ZeroMBR" -# Before calling dea, the adapter file must gave been sourced with -# the DEA file name as argument -dea() - diff --git a/fuel/prototypes/auto-deploy/examples/ipmi/README.txt b/fuel/prototypes/auto-deploy/examples/ipmi/README.txt deleted file mode 100644 index 2cbffa901..000000000 --- a/fuel/prototypes/auto-deploy/examples/ipmi/README.txt +++ /dev/null @@ -1,10 +0,0 @@ -This is a hybrid IPMI DHA, where the Fuel master is run as a KVM -VM, but all other nodes are real iron under IPMI control. - -In "conf" is an example dea.yaml, dha.yaml and a VM definition for the -Fuel master. You need to tune these so they match your specific -environment. In addition you need to create a bridge from the VM to -the admin (PXE) network of the physical nodes. An example snippet for -/etc/network/interfaces which also configures NAT can be found in the -README.txt in conf. - diff --git a/fuel/prototypes/auto-deploy/examples/ipmi/conf/README.txt b/fuel/prototypes/auto-deploy/examples/ipmi/conf/README.txt deleted file mode 100644 index a8608dc85..000000000 --- a/fuel/prototypes/auto-deploy/examples/ipmi/conf/README.txt +++ /dev/null @@ -1,12 +0,0 @@ -Add this snippet into /etc/network/interfaces after making sure to -replace p1p1.20 with your actual outbound interface in order to -provide network access to the Fuel master for DNS and NTP. - -iface vfuelnet inet static - bridge_ports em1 - address 10.30.0.1 - netmask 255.255.255.0 - pre-down iptables -t nat -D POSTROUTING --out-interface p1p1.20 -j MASQUERADE -m comment --comment "vfuelnet" - pre-down iptables -D FORWARD --in-interface vfuelnet --out-interface p1p1.20 -m comment --comment "vfuelnet" - post-up iptables -t nat -A POSTROUTING --out-interface p1p1.20 -j MASQUERADE -m comment --comment "vfuelnet" - post-up iptables -A FORWARD --in-interface vfuelnet --out-interface p1p1.20 -m comment --comment "vfuelnet" diff --git a/fuel/prototypes/auto-deploy/examples/ipmi/conf/dea.yaml b/fuel/prototypes/auto-deploy/examples/ipmi/conf/dea.yaml deleted file mode 100644 index 166b68aec..000000000 --- a/fuel/prototypes/auto-deploy/examples/ipmi/conf/dea.yaml +++ /dev/null @@ -1,983 +0,0 @@ -title: Deployment Environment Adapter (DEA) -# DEA API version supported -version: 1.1 -created: Tue May 5 15:33:07 UTC 2015 -comment: Test environment Ericsson Montreal -nodes: -- id: 1 - interfaces: - eth0: - - fuelweb_admin - eth2: - - public - - management - - storage - - private - role: controller -- id: 2 - interfaces: - eth0: - - fuelweb_admin - eth2: - - public - - management - - storage - - private - role: compute -environment_mode: multinode -environment_name: Stefan3_auto -fuel: - ADMIN_NETWORK: - dhcp_pool_end: 10.30.0.254 - dhcp_pool_start: 10.30.0.3 - ipaddress: 10.30.0.2 - netmask: 255.255.255.0 - DNS_DOMAIN: opnfvericsson.ca - DNS_SEARCH: opnfvericsson.ca - DNS_UPSTREAM: 10.118.32.193 - FUEL_ACCESS: - password: admin - user: admin - HOSTNAME: mrberg-fuel - NTP1: 0.ca.pool.ntp.org - NTP2: 1.ca.pool.ntp.org - NTP3: 2.ca.pool.ntp.org -controller: -- action: add-br - name: br-eth0 -- action: add-port - bridge: br-eth0 - name: eth0 -- action: add-br - name: br-eth1 -- action: add-port - bridge: br-eth1 - name: eth1 -- action: add-br - name: br-eth2 -- action: add-port - bridge: br-eth2 - name: eth2 -- action: add-br - name: br-eth3 -- action: add-port - bridge: br-eth3 - name: eth3 -- action: add-br - name: br-eth4 -- action: add-port - bridge: br-eth4 - name: eth4 -- action: add-br - name: br-eth5 -- action: add-port - bridge: br-eth5 - name: eth5 -- action: add-br - name: br-ex -- action: add-br - name: br-mgmt -- action: add-br - name: br-storage -- action: add-br - name: br-fw-admin -- action: add-patch - bridges: - - br-eth2 - - br-storage - tags: - - 220 - - 0 - vlan_ids: - - 220 - - 0 -- action: add-patch - bridges: - - br-eth2 - - br-mgmt - tags: - - 320 - - 0 - vlan_ids: - - 320 - - 0 -- action: add-patch - bridges: - - br-eth0 - - br-fw-admin - trunks: - - 0 -- action: add-patch - bridges: - - br-eth2 - - br-ex - tags: - - 120 - - 0 - vlan_ids: - - 120 - - 0 -- action: add-br - name: br-prv -- action: add-patch - bridges: - - br-eth2 - - br-prv -compute: -- action: add-br - name: br-eth0 -- action: add-port - bridge: br-eth0 - name: eth0 -- action: add-br - name: br-eth1 -- action: add-port - bridge: br-eth1 - name: eth1 -- action: add-br - name: br-eth2 -- action: add-port - bridge: br-eth2 - name: eth2 -- action: add-br - name: br-eth3 -- action: add-port - bridge: br-eth3 - name: eth3 -- action: add-br - name: br-eth4 -- action: add-port - bridge: br-eth4 - name: eth4 -- action: add-br - name: br-eth5 -- action: add-port - bridge: br-eth5 - name: eth5 -- action: add-br - name: br-mgmt -- action: add-br - name: br-storage -- action: add-br - name: br-fw-admin -- action: add-patch - bridges: - - br-eth2 - - br-storage - tags: - - 220 - - 0 - vlan_ids: - - 220 - - 0 -- action: add-patch - bridges: - - br-eth2 - - br-mgmt - tags: - - 320 - - 0 - vlan_ids: - - 320 - - 0 -- action: add-patch - bridges: - - br-eth0 - - br-fw-admin - trunks: - - 0 -- action: add-br - name: br-prv -- action: add-patch - bridges: - - br-eth2 - - br-prv -opnfv: - compute: {} - controller: {} -network: - networking_parameters: - base_mac: fa:16:3e:00:00:00 - dns_nameservers: - - 10.118.32.193 - - 8.8.8.8 - floating_ranges: - - - 172.16.0.130 - - 172.16.0.254 - gre_id_range: - - 2 - - 65535 - internal_cidr: 192.168.111.0/24 - internal_gateway: 192.168.111.1 - net_l23_provider: ovs - segmentation_type: vlan - vlan_range: - - 2022 - - 2023 - networks: - - cidr: 172.16.0.0/24 - gateway: 172.16.0.1 - ip_ranges: - - - 172.16.0.2 - - 172.16.0.126 - meta: - assign_vip: true - cidr: 172.16.0.0/24 - configurable: true - floating_range_var: floating_ranges - ip_range: - - 172.16.0.2 - - 172.16.0.126 - map_priority: 1 - name: public - notation: ip_ranges - render_addr_mask: public - render_type: null - use_gateway: true - vlan_start: null - name: public - vlan_start: 120 - - cidr: 192.168.0.0/24 - gateway: null - ip_ranges: - - - 192.168.0.2 - - 192.168.0.254 - meta: - assign_vip: true - cidr: 192.168.0.0/24 - configurable: true - map_priority: 2 - name: management - notation: cidr - render_addr_mask: internal - render_type: cidr - use_gateway: false - vlan_start: 101 - name: management - vlan_start: 320 - - cidr: 192.168.1.0/24 - gateway: null - ip_ranges: - - - 192.168.1.2 - - 192.168.1.254 - meta: - assign_vip: false - cidr: 192.168.1.0/24 - configurable: true - map_priority: 2 - name: storage - notation: cidr - render_addr_mask: storage - render_type: cidr - use_gateway: false - vlan_start: 102 - name: storage - vlan_start: 220 - - cidr: null - gateway: null - ip_ranges: [] - meta: - assign_vip: false - configurable: false - map_priority: 2 - name: private - neutron_vlan_range: true - notation: null - render_addr_mask: null - render_type: null - seg_type: vlan - use_gateway: false - vlan_start: null - name: private - vlan_start: null - - cidr: 10.30.0.0/24 - gateway: null - ip_ranges: - - - 10.30.0.3 - - 10.30.0.254 - meta: - assign_vip: false - configurable: false - map_priority: 0 - notation: ip_ranges - render_addr_mask: null - render_type: null - unmovable: true - use_gateway: true - name: fuelweb_admin - vlan_start: null -settings: - editable: - access: - email: - description: Email address for Administrator - label: email - type: text - value: admin@localhost - weight: 40 - metadata: - label: Access - weight: 10 - password: - description: Password for Administrator - label: password - type: password - value: admin - weight: 20 - tenant: - description: Tenant (project) name for Administrator - label: tenant - regex: - error: Invalid tenant name - source: ^(?!services$)(?!nova$)(?!glance$)(?!keystone$)(?!neutron$)(?!cinder$)(?!swift$)(?!ceph$)(?![Gg]uest$).* - type: text - value: admin - weight: 30 - user: - description: Username for Administrator - label: username - regex: - error: Invalid username - source: ^(?!services$)(?!nova$)(?!glance$)(?!keystone$)(?!neutron$)(?!cinder$)(?!swift$)(?!ceph$)(?![Gg]uest$).* - type: text - value: admin - weight: 10 - additional_components: - ceilometer: - description: If selected, Ceilometer component will be installed - label: Install Ceilometer - type: checkbox - value: false - weight: 40 - heat: - description: '' - label: '' - type: hidden - value: true - weight: 30 - metadata: - label: Additional Components - weight: 20 - murano: - description: If selected, Murano component will be installed - label: Install Murano - restrictions: - - cluster:net_provider != 'neutron' - type: checkbox - value: false - weight: 20 - sahara: - description: If selected, Sahara component will be installed - label: Install Sahara - type: checkbox - value: false - weight: 10 - common: - auth_key: - description: Public key(s) to include in authorized_keys on deployed nodes - label: Public Key - type: text - value: '' - weight: 70 - auto_assign_floating_ip: - description: If selected, OpenStack will automatically assign a floating IP - to a new instance - label: Auto assign floating IP - restrictions: - - cluster:net_provider == 'neutron' - type: checkbox - value: false - weight: 40 - compute_scheduler_driver: - label: Scheduler driver - type: radio - value: nova.scheduler.filter_scheduler.FilterScheduler - values: - - data: nova.scheduler.filter_scheduler.FilterScheduler - description: Currently the most advanced OpenStack scheduler. See the OpenStack - documentation for details. - label: Filter scheduler - - data: nova.scheduler.simple.SimpleScheduler - description: This is 'naive' scheduler which tries to find the least loaded - host - label: Simple scheduler - weight: 40 - debug: - description: Debug logging mode provides more information, but requires more - disk space. - label: OpenStack debug logging - type: checkbox - value: false - weight: 20 - disable_offload: - description: If set, generic segmentation offload (gso) and generic receive - offload (gro) on physical nics will be disabled. See ethtool man. - label: Disable generic offload on physical nics - restrictions: - - action: hide - condition: cluster:net_provider == 'neutron' and networking_parameters:segmentation_type - == 'gre' - type: checkbox - value: true - weight: 80 - libvirt_type: - label: Hypervisor type - type: radio - value: kvm - values: - - data: kvm - description: Choose this type of hypervisor if you run OpenStack on hardware - label: KVM - restrictions: - - settings:common.libvirt_type.value == 'vcenter' - - data: qemu - description: Choose this type of hypervisor if you run OpenStack on virtual - hosts. - label: QEMU - restrictions: - - settings:common.libvirt_type.value == 'vcenter' - - data: vcenter - description: Choose this type of hypervisor if you run OpenStack in a vCenter - environment. - label: vCenter - restrictions: - - settings:common.libvirt_type.value != 'vcenter' or cluster:net_provider - == 'neutron' - weight: 30 - metadata: - label: Common - weight: 30 - nova_quota: - description: Quotas are used to limit CPU and memory usage for tenants. Enabling - quotas will increase load on the Nova database. - label: Nova quotas - type: checkbox - value: false - weight: 25 - resume_guests_state_on_host_boot: - description: Whether to resume previous guests state when the host reboots. - If enabled, this option causes guests assigned to the host to resume their - previous state. If the guest was running a restart will be attempted when - nova-compute starts. If the guest was not running previously, a restart - will not be attempted. - label: Resume guests state on host boot - type: checkbox - value: true - weight: 60 - use_cow_images: - description: For most cases you will want qcow format. If it's disabled, raw - image format will be used to run VMs. OpenStack with raw format currently - does not support snapshotting. - label: Use qcow format for images - type: checkbox - value: true - weight: 50 - corosync: - group: - description: '' - label: Group - type: text - value: 226.94.1.1 - weight: 10 - metadata: - label: Corosync - restrictions: - - action: hide - condition: 'true' - weight: 50 - port: - description: '' - label: Port - type: text - value: '12000' - weight: 20 - verified: - description: Set True only if multicast is configured correctly on router. - label: Need to pass network verification. - type: checkbox - value: false - weight: 10 - external_dns: - dns_list: - description: List of upstream DNS servers, separated by comma - label: DNS list - type: text - value: 10.118.32.193, 8.8.8.8 - weight: 10 - metadata: - label: Upstream DNS - weight: 90 - external_ntp: - metadata: - label: Upstream NTP - weight: 100 - ntp_list: - description: List of upstream NTP servers, separated by comma - label: NTP servers list - type: text - value: 0.pool.ntp.org, 1.pool.ntp.org - weight: 10 - kernel_params: - kernel: - description: Default kernel parameters - label: Initial parameters - type: text - value: console=ttyS0,9600 console=tty0 rootdelay=90 nomodeset - weight: 45 - metadata: - label: Kernel parameters - weight: 40 - neutron_mellanox: - metadata: - enabled: true - label: Mellanox Neutron components - toggleable: false - weight: 50 - plugin: - label: Mellanox drivers and SR-IOV plugin - type: radio - value: disabled - values: - - data: disabled - description: If selected, Mellanox drivers, Neutron and Cinder plugin will - not be installed. - label: Mellanox drivers and plugins disabled - restrictions: - - settings:storage.iser.value == true - - data: drivers_only - description: If selected, Mellanox Ethernet drivers will be installed to - support networking over Mellanox NIC. Mellanox Neutron plugin will not - be installed. - label: Install only Mellanox drivers - restrictions: - - settings:common.libvirt_type.value != 'kvm' - - data: ethernet - description: If selected, both Mellanox Ethernet drivers and Mellanox network - acceleration (Neutron) plugin will be installed. - label: Install Mellanox drivers and SR-IOV plugin - restrictions: - - settings:common.libvirt_type.value != 'kvm' or not (cluster:net_provider - == 'neutron' and networking_parameters:segmentation_type == 'vlan') - weight: 60 - vf_num: - description: Note that one virtual function will be reserved to the storage - network, in case of choosing iSER. - label: Number of virtual NICs - restrictions: - - settings:neutron_mellanox.plugin.value != 'ethernet' - type: text - value: '16' - weight: 70 - nsx_plugin: - connector_type: - description: Default network transport type to use - label: NSX connector type - type: select - value: stt - values: - - data: gre - label: GRE - - data: ipsec_gre - label: GRE over IPSec - - data: stt - label: STT - - data: ipsec_stt - label: STT over IPSec - - data: bridge - label: Bridge - weight: 80 - l3_gw_service_uuid: - description: UUID for the default L3 gateway service to use with this cluster - label: L3 service UUID - regex: - error: Invalid L3 gateway service UUID - source: '[a-f\d]{8}-[a-f\d]{4}-[a-f\d]{4}-[a-f\d]{4}-[a-f\d]{12}' - type: text - value: '' - weight: 50 - metadata: - enabled: false - label: VMware NSX - restrictions: - - action: hide - condition: cluster:net_provider != 'neutron' or networking_parameters:net_l23_provider - != 'nsx' - weight: 20 - nsx_controllers: - description: One or more IPv4[:port] addresses of NSX controller node, separated - by comma (e.g. 10.30.30.2,192.168.110.254:443) - label: NSX controller endpoint - regex: - error: Invalid controller endpoints, specify valid IPv4[:port] pair - source: ^(([\d]|[1-9][\d]|1[\d]{2}|2[0-4][\d]|25[0-5])\.){3}([\d]|[1-9][\d]|1[\d]{2}|2[0-4][\d]|25[0-5])(:(6553[0-5]|655[0-2][\d]|65[0-4][\d]{2}|6[0-4][\d]{3}|5[\d]{4}|[\d][\d]{0,3}))?(,(([\d]|[1-9][\d]|1[\d]{2}|2[0-4][\d]|25[0-5])\.){3}([\d]|[1-9][\d]|1[\d]{2}|2[0-4][\d]|25[0-5])(:(6553[0-5]|655[0-2][\d]|65[0-4][\d]{2}|6[0-4][\d]{3}|5[\d]{4}|[\d][\d]{0,3}))?)*$ - type: text - value: '' - weight: 60 - nsx_password: - description: Password for Administrator - label: NSX password - regex: - error: Empty password - source: \S - type: password - value: '' - weight: 30 - nsx_username: - description: NSX administrator's username - label: NSX username - regex: - error: Empty username - source: \S - type: text - value: admin - weight: 20 - packages_url: - description: URL to NSX specific packages - label: URL to NSX bits - regex: - error: Invalid URL, specify valid HTTP/HTTPS URL with IPv4 address (e.g. - http://10.20.0.2/nsx) - source: ^https?://(([\d]|[1-9][\d]|1[\d]{2}|2[0-4][\d]|25[0-5])\.){3}([\d]|[1-9][\d]|1[\d]{2}|2[0-4][\d]|25[0-5])(:(6553[0-5]|655[0-2][\d]|65[0-4][\d]{2}|6[0-4][\d]{3}|5[\d]{4}|[\d][\d]{0,3}))?(/.*)?$ - type: text - value: '' - weight: 70 - replication_mode: - description: '' - label: NSX cluster has Service nodes - type: checkbox - value: true - weight: 90 - transport_zone_uuid: - description: UUID of the pre-existing default NSX Transport zone - label: Transport zone UUID - regex: - error: Invalid transport zone UUID - source: '[a-f\d]{8}-[a-f\d]{4}-[a-f\d]{4}-[a-f\d]{4}-[a-f\d]{12}' - type: text - value: '' - weight: 40 - provision: - metadata: - label: Provision - restrictions: - - action: hide - condition: not ('experimental' in version:feature_groups) - weight: 80 - method: - description: Which provision method to use for this cluster. - label: Provision method - type: radio - value: cobbler - values: - - data: image - description: Copying pre-built images on a disk. - label: Image - - data: cobbler - description: Install from scratch using anaconda or debian-installer. - label: Classic (use anaconda or debian-installer) - public_network_assignment: - assign_to_all_nodes: - description: When disabled, public network will be assigned to controllers - and zabbix-server only - label: Assign public network to all nodes - type: checkbox - value: false - weight: 10 - metadata: - label: Public network assignment - restrictions: - - action: hide - condition: cluster:net_provider != 'neutron' - weight: 50 - storage: - ephemeral_ceph: - description: Configures Nova to store ephemeral volumes in RBD. This works - best if Ceph is enabled for volumes and images, too. Enables live migration - of all types of Ceph backed VMs (without this option, live migration will - only work with VMs launched from Cinder volumes). - label: Ceph RBD for ephemeral volumes (Nova) - restrictions: - - settings:common.libvirt_type.value == 'vcenter' - type: checkbox - value: false - weight: 75 - images_ceph: - description: Configures Glance to use the Ceph RBD backend to store images. - If enabled, this option will prevent Swift from installing. - label: Ceph RBD for images (Glance) - type: checkbox - value: false - weight: 30 - images_vcenter: - description: Configures Glance to use the vCenter/ESXi backend to store images. - If enabled, this option will prevent Swift from installing. - label: VMWare vCenter/ESXi datastore for images (Glance) - restrictions: - - settings:common.libvirt_type.value != 'vcenter' - type: checkbox - value: false - weight: 35 - iser: - description: 'High performance block storage: Cinder volumes over iSER protocol - (iSCSI over RDMA). This feature requires SR-IOV capabilities in the NIC, - and will use a dedicated virtual function for the storage network.' - label: iSER protocol for volumes (Cinder) - restrictions: - - settings:storage.volumes_lvm.value != true or settings:common.libvirt_type.value - != 'kvm' - type: checkbox - value: false - weight: 11 - metadata: - label: Storage - weight: 60 - objects_ceph: - description: Configures RadosGW front end for Ceph RBD. This exposes S3 and - Swift API Interfaces. If enabled, this option will prevent Swift from installing. - label: Ceph RadosGW for objects (Swift API) - restrictions: - - settings:storage.images_ceph.value == false - type: checkbox - value: false - weight: 80 - osd_pool_size: - description: Configures the default number of object replicas in Ceph. This - number must be equal to or lower than the number of deployed 'Storage - - Ceph OSD' nodes. - label: Ceph object replication factor - regex: - error: Invalid number - source: ^[1-9]\d*$ - restrictions: - - settings:common.libvirt_type.value == 'vcenter' - type: text - value: '2' - weight: 85 - vc_datacenter: - description: Inventory path to a datacenter. If you want to use ESXi host - as datastore, it should be "ha-datacenter". - label: Datacenter name - regex: - error: Empty datacenter - source: \S - restrictions: - - action: hide - condition: settings:storage.images_vcenter.value == false or settings:common.libvirt_type.value - != 'vcenter' - type: text - value: '' - weight: 65 - vc_datastore: - description: Datastore associated with the datacenter. - label: Datastore name - regex: - error: Empty datastore - source: \S - restrictions: - - action: hide - condition: settings:storage.images_vcenter.value == false or settings:common.libvirt_type.value - != 'vcenter' - type: text - value: '' - weight: 60 - vc_host: - description: IP Address of vCenter/ESXi - label: vCenter/ESXi IP - regex: - error: Specify valid IPv4 address - source: ^(([\d]|[1-9][\d]|1[\d]{2}|2[0-4][\d]|25[0-5])\.){3}([\d]|[1-9][\d]|1[\d]{2}|2[0-4][\d]|25[0-5])$ - restrictions: - - action: hide - condition: settings:storage.images_vcenter.value == false or settings:common.libvirt_type.value - != 'vcenter' - type: text - value: '' - weight: 45 - vc_image_dir: - description: The name of the directory where the glance images will be stored - in the VMware datastore. - label: Datastore Images directory - regex: - error: Empty images directory - source: \S - restrictions: - - action: hide - condition: settings:storage.images_vcenter.value == false or settings:common.libvirt_type.value - != 'vcenter' - type: text - value: /openstack_glance - weight: 70 - vc_password: - description: vCenter/ESXi admin password - label: Password - regex: - error: Empty password - source: \S - restrictions: - - action: hide - condition: settings:storage.images_vcenter.value == false or settings:common.libvirt_type.value - != 'vcenter' - type: password - value: '' - weight: 55 - vc_user: - description: vCenter/ESXi admin username - label: Username - regex: - error: Empty username - source: \S - restrictions: - - action: hide - condition: settings:storage.images_vcenter.value == false or settings:common.libvirt_type.value - != 'vcenter' - type: text - value: '' - weight: 50 - volumes_ceph: - description: Configures Cinder to store volumes in Ceph RBD images. - label: Ceph RBD for volumes (Cinder) - restrictions: - - settings:storage.volumes_lvm.value == true or settings:common.libvirt_type.value - == 'vcenter' - type: checkbox - value: false - weight: 20 - volumes_lvm: - description: Requires at least one Storage - Cinder LVM node. - label: Cinder LVM over iSCSI for volumes - restrictions: - - settings:storage.volumes_ceph.value == true - type: checkbox - value: false - weight: 10 - volumes_vmdk: - description: Configures Cinder to store volumes via VMware vCenter. - label: VMware vCenter for volumes (Cinder) - restrictions: - - settings:common.libvirt_type.value != 'vcenter' or settings:storage.volumes_lvm.value - == true - type: checkbox - value: false - weight: 15 - syslog: - metadata: - label: Syslog - weight: 50 - syslog_port: - description: Remote syslog port - label: Port - regex: - error: Invalid Syslog port - source: ^([1-9][0-9]{0,3}|[1-5][0-9]{4}|6[0-4][0-9]{3}|65[0-4][0-9]{2}|655[0-2][0-9]|6553[0-5])$ - type: text - value: '514' - weight: 20 - syslog_server: - description: Remote syslog hostname - label: Hostname - type: text - value: '' - weight: 10 - syslog_transport: - label: Syslog transport protocol - type: radio - value: tcp - values: - - data: udp - description: '' - label: UDP - - data: tcp - description: '' - label: TCP - weight: 30 - vcenter: - cluster: - description: vCenter cluster name. If you have multiple clusters, use comma - to separate names - label: Cluster - regex: - error: Invalid cluster list - source: ^([^,\ ]+([\ ]*[^,\ ])*)(,[^,\ ]+([\ ]*[^,\ ])*)*$ - type: text - value: '' - weight: 40 - datastore_regex: - description: The Datastore regexp setting specifies the data stores to use - with Compute. For example, "nas.*". If you want to use all available datastores, - leave this field blank - label: Datastore regexp - regex: - error: Invalid datastore regexp - source: ^(\S.*\S|\S|)$ - type: text - value: '' - weight: 50 - host_ip: - description: IP Address of vCenter - label: vCenter IP - regex: - error: Specify valid IPv4 address - source: ^(([\d]|[1-9][\d]|1[\d]{2}|2[0-4][\d]|25[0-5])\.){3}([\d]|[1-9][\d]|1[\d]{2}|2[0-4][\d]|25[0-5])$ - type: text - value: '' - weight: 10 - metadata: - label: vCenter - restrictions: - - action: hide - condition: settings:common.libvirt_type.value != 'vcenter' - weight: 20 - use_vcenter: - description: '' - label: '' - type: hidden - value: true - weight: 5 - vc_password: - description: vCenter admin password - label: Password - regex: - error: Empty password - source: \S - type: password - value: admin - weight: 30 - vc_user: - description: vCenter admin username - label: Username - regex: - error: Empty username - source: \S - type: text - value: admin - weight: 20 - vlan_interface: - description: Physical ESXi host ethernet adapter for VLAN networking (e.g. - vmnic1). If empty "vmnic0" is used by default - label: ESXi VLAN interface - restrictions: - - action: hide - condition: cluster:net_provider != 'nova_network' or networking_parameters:net_manager - != 'VlanManager' - type: text - value: '' - weight: 60 - zabbix: - metadata: - label: Zabbix Access - restrictions: - - action: hide - condition: not ('experimental' in version:feature_groups) - weight: 70 - password: - description: Password for Zabbix Administrator - label: password - type: password - value: zabbix - weight: 20 - username: - description: Username for Zabbix Administrator - label: username - type: text - value: admin - weight: 10 diff --git a/fuel/prototypes/auto-deploy/examples/ipmi/conf/dha.yaml b/fuel/prototypes/auto-deploy/examples/ipmi/conf/dha.yaml deleted file mode 100644 index 97629b758..000000000 --- a/fuel/prototypes/auto-deploy/examples/ipmi/conf/dha.yaml +++ /dev/null @@ -1,52 +0,0 @@ -title: Deployment Hardware Adapter (DHA) -# DHA API version supported -version: 1.1 -created: Mon May 4 09:03:46 UTC 2015 -comment: Test environment Ericsson Montreal - -# Adapter to use for this definition -adapter: ipmi - -# Node list. -# Mandatory properties are id and role. -# The MAC address of the PXE boot interface for Fuel is not -# mandatory to be defined. -# All other properties are adapter specific. - -nodes: -- id: 1 - pxeMac: 14:58:D0:55:E2:E0 - ipmiIp: 10.118.32.202 - ipmiUser: username - ipmiPass: password -- id: 2 - pxeMac: 9C:B6:54:8A:25:C0 - ipmiIp: 10.118.32.213 - ipmiUser: username - ipmiPass: password -# Adding the Fuel node as node id 3 which may not be correct - please -# adjust as needed. -- id: 3 - pxeMac: 52:54:00:bd:e4:21 - libvirtName: vFuel - isFuel: yes - -# Deployment power on strategy -# all: Turn on all nodes at once. There will be no correlation -# between the DHA and DEA node numbering. MAC addresses -# will be used to select the node roles though. -# sequence: Turn on the nodes in sequence starting with the lowest order -# node and wait for the node to be detected by Fuel. Not until -# the node has been detected and assigned a role will the next -# node be turned on. -powerOnStrategy: sequence - -# If fuelCustomInstall is set to true, Fuel is assumed to be installed by -# calling the DHA adapter function "dha_fuelCustomInstall()" with two -# arguments: node ID and the ISO file name to deploy. The custom install -# function is then to handle all necessary logic to boot the Fuel master -# from the ISO and then return. -# Allowed values: true, false - -fuelCustomInstall: true - diff --git a/fuel/prototypes/auto-deploy/examples/ipmi/conf/vm/vFuel b/fuel/prototypes/auto-deploy/examples/ipmi/conf/vm/vFuel deleted file mode 100644 index 21865392b..000000000 --- a/fuel/prototypes/auto-deploy/examples/ipmi/conf/vm/vFuel +++ /dev/null @@ -1,115 +0,0 @@ -<domain type='kvm'> - <name>vFuel</name> - <uuid>daf21ecf-0dfe-4937-a155-8edde4f3ea76</uuid> - <memory unit='KiB'>8290304</memory> - <currentMemory unit='KiB'>8290304</currentMemory> - <vcpu placement='static'>2</vcpu> - <resource> - <partition>/machine</partition> - </resource> - <os> - <type arch='x86_64' machine='pc-i440fx-utopic'>hvm</type> - <boot dev='hd'/> - <boot dev='cdrom'/> - <bootmenu enable='no'/> - </os> - <features> - <acpi/> - <apic/> - <pae/> - </features> - <cpu mode='custom' match='exact'> - <model fallback='allow'>SandyBridge</model> - </cpu> - <clock offset='utc'> - <timer name='rtc' tickpolicy='catchup'/> - <timer name='pit' tickpolicy='delay'/> - <timer name='hpet' present='no'/> - </clock> - <on_poweroff>destroy</on_poweroff> - <on_reboot>restart</on_reboot> - <on_crash>restart</on_crash> - <pm> - <suspend-to-mem enabled='no'/> - <suspend-to-disk enabled='no'/> - </pm> - <devices> - <emulator>/usr/bin/kvm-spice</emulator> - <disk type='file' device='disk'> - <driver name='qemu' type='raw'/> - <source file='/mnt/images/vFuel.raw'/> - <target dev='vda' bus='virtio'/> - <address type='pci' domain='0x0000' bus='0x00' slot='0x07' function='0x0'/> - </disk> - <disk type='block' device='cdrom'> - <driver name='qemu' type='raw'/> - <source dev='/home/user/fueltmp/deploy-opnfv.iso'/> - <target dev='hda' bus='ide'/> - <readonly/> - <address type='drive' controller='0' bus='0' target='0' unit='0'/> - </disk> - <controller type='usb' index='0' model='ich9-ehci1'> - <address type='pci' domain='0x0000' bus='0x00' slot='0x05' function='0x7'/> - </controller> - <controller type='usb' index='0' model='ich9-uhci1'> - <master startport='0'/> - <address type='pci' domain='0x0000' bus='0x00' slot='0x05' function='0x0' multifunction='on'/> - </controller> - <controller type='usb' index='0' model='ich9-uhci2'> - <master startport='2'/> - <address type='pci' domain='0x0000' bus='0x00' slot='0x05' function='0x1'/> - </controller> - <controller type='usb' index='0' model='ich9-uhci3'> - <master startport='4'/> - <address type='pci' domain='0x0000' bus='0x00' slot='0x05' function='0x2'/> - </controller> - <controller type='pci' index='0' model='pci-root'/> - <controller type='virtio-serial' index='0'> - <address type='pci' domain='0x0000' bus='0x00' slot='0x06' function='0x0'/> - </controller> - <controller type='ide' index='0'> - <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x1'/> - </controller> - <interface type='bridge'> - <mac address='52:54:00:bd:e4:21'/> - <source bridge='vfuelnet'/> - <model type='virtio'/> - <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x0'/> - </interface> - <serial type='pty'> - <target port='0'/> - </serial> - <console type='pty'> - <target type='serial' port='0'/> - </console> - <channel type='spicevmc'> - <target type='virtio' name='com.redhat.spice.0'/> - <address type='virtio-serial' controller='0' bus='0' port='1'/> - </channel> - <input type='mouse' bus='ps2'/> - <input type='keyboard' bus='ps2'/> - <graphics type='spice' autoport='yes' listen='127.0.0.1'> - <listen type='address' address='127.0.0.1'/> - </graphics> - <sound model='ich6'> - <address type='pci' domain='0x0000' bus='0x00' slot='0x04' function='0x0'/> - </sound> - <video> - <model type='qxl' ram='65536' vram='65536' heads='1'/> - <address type='pci' domain='0x0000' bus='0x00' slot='0x02' function='0x0'/> - </video> - <redirdev bus='usb' type='spicevmc'> - </redirdev> - <redirdev bus='usb' type='spicevmc'> - </redirdev> - <redirdev bus='usb' type='spicevmc'> - </redirdev> - <redirdev bus='usb' type='spicevmc'> - </redirdev> - <memballoon model='virtio'> - <address type='pci' domain='0x0000' bus='0x00' slot='0x08' function='0x0'/> - </memballoon> - </devices> - <seclabel type='dynamic' model='apparmor' relabel='yes'/> -</domain> - diff --git a/fuel/prototypes/auto-deploy/examples/ipmi/install-ubuntu-packages.sh b/fuel/prototypes/auto-deploy/examples/ipmi/install-ubuntu-packages.sh deleted file mode 100755 index 58ce19ac6..000000000 --- a/fuel/prototypes/auto-deploy/examples/ipmi/install-ubuntu-packages.sh +++ /dev/null @@ -1,16 +0,0 @@ -#!/bin/bash -############################################################################## -# Copyright (c) 2015 Ericsson AB and others. -# stefan.k.berg@ericsson.com -# jonas.bjurel@ericsson.com -# All rights reserved. This program and the accompanying materials -# are made available under the terms of the Apache License, Version 2.0 -# which accompanies this distribution, and is available at -# http://www.apache.org/licenses/LICENSE-2.0 -############################################################################## - -# Tools for installation on the libvirt server/base host -# -apt-get install -y libvirt-bin qemu-kvm tightvncserver virt-manager \ - sshpass fuseiso genisoimage blackbox xterm -restart libvirt-bin diff --git a/fuel/prototypes/auto-deploy/examples/libvirt/README.txt b/fuel/prototypes/auto-deploy/examples/libvirt/README.txt deleted file mode 100644 index 9cbfa5486..000000000 --- a/fuel/prototypes/auto-deploy/examples/libvirt/README.txt +++ /dev/null @@ -1,25 +0,0 @@ -This is an example setup for the libvirt DHA adapter which will setup -four libvirt networks: - -fuel1: NATed network for management and admin -fuel2: Isolated network for storage -fuel3: Isolated network for private -fuel4: NATed network for public - -Four VMs will be created: - -fuel-master -controller1 -compute4 -compute5 - -Prerequisite: A Ubuntu 14.x host or later with sudo access. - -Start by installing the necessary Ubuntu packages by running -"sudo install_ubuntu_packages.sh". - -Then (re)generate the libvirt network and VM setup by running -"setup_vms.sh". - -You can then run deploy.sh with the corresponding dea.yaml and -dha.yaml which can be found in the conf subdirectory. diff --git a/fuel/prototypes/auto-deploy/examples/libvirt/conf/dea.yaml b/fuel/prototypes/auto-deploy/examples/libvirt/conf/dea.yaml deleted file mode 100644 index 5d2f55f30..000000000 --- a/fuel/prototypes/auto-deploy/examples/libvirt/conf/dea.yaml +++ /dev/null @@ -1,975 +0,0 @@ -title: Deployment Environment Adapter (DEA) -# DEA API version supported -version: 1.1 -created: Sat Apr 25 16:26:22 UTC 2015 -comment: Small libvirt setup -nodes: -- id: 1 - interfaces: - eth0: - - fuelweb_admin - - management - eth1: - - storage - eth2: - - private - eth3: - - public - role: controller -- id: 2 - interfaces: - eth0: - - fuelweb_admin - - management - eth1: - - storage - eth2: - - private - eth3: - - public - role: compute -- id: 3 - interfaces: - eth0: - - fuelweb_admin - - management - eth1: - - storage - eth2: - - private - eth3: - - public - role: compute -environment_mode: multinode -environment_name: opnfv59-b -fuel: - ADMIN_NETWORK: - dhcp_pool_end: 10.20.0.254 - dhcp_pool_start: 10.20.0.3 - ipaddress: 10.20.0.2 - netmask: 255.255.255.0 - DNS_DOMAIN: domain.tld - DNS_SEARCH: domain.tld - DNS_UPSTREAM: 8.8.8.8 - FUEL_ACCESS: - password: admin - user: admin - HOSTNAME: opnfv59 - NTP1: 0.pool.ntp.org - NTP2: 1.pool.ntp.org - NTP3: 2.pool.ntp.org -controller: -- action: add-br - name: br-eth0 -- action: add-port - bridge: br-eth0 - name: eth0 -- action: add-br - name: br-eth1 -- action: add-port - bridge: br-eth1 - name: eth1 -- action: add-br - name: br-eth2 -- action: add-port - bridge: br-eth2 - name: eth2 -- action: add-br - name: br-eth3 -- action: add-port - bridge: br-eth3 - name: eth3 -- action: add-br - name: br-ex -- action: add-br - name: br-mgmt -- action: add-br - name: br-storage -- action: add-br - name: br-fw-admin -- action: add-patch - bridges: - - br-eth1 - - br-storage - tags: - - 102 - - 0 - vlan_ids: - - 102 - - 0 -- action: add-patch - bridges: - - br-eth0 - - br-mgmt - tags: - - 101 - - 0 - vlan_ids: - - 101 - - 0 -- action: add-patch - bridges: - - br-eth0 - - br-fw-admin - trunks: - - 0 -- action: add-patch - bridges: - - br-eth3 - - br-ex - trunks: - - 0 -- action: add-br - name: br-prv -- action: add-patch - bridges: - - br-eth2 - - br-prv -compute: -- action: add-br - name: br-eth0 -- action: add-port - bridge: br-eth0 - name: eth0 -- action: add-br - name: br-eth1 -- action: add-port - bridge: br-eth1 - name: eth1 -- action: add-br - name: br-eth2 -- action: add-port - bridge: br-eth2 - name: eth2 -- action: add-br - name: br-eth3 -- action: add-port - bridge: br-eth3 - name: eth3 -- action: add-br - name: br-mgmt -- action: add-br - name: br-storage -- action: add-br - name: br-fw-admin -- action: add-patch - bridges: - - br-eth1 - - br-storage - tags: - - 102 - - 0 - vlan_ids: - - 102 - - 0 -- action: add-patch - bridges: - - br-eth0 - - br-mgmt - tags: - - 101 - - 0 - vlan_ids: - - 101 - - 0 -- action: add-patch - bridges: - - br-eth0 - - br-fw-admin - trunks: - - 0 -- action: add-br - name: br-prv -- action: add-patch - bridges: - - br-eth2 - - br-prv -opnfv: - compute: {} - controller: {} -network: - networking_parameters: - base_mac: fa:16:3e:00:00:00 - dns_nameservers: - - 8.8.4.4 - - 8.8.8.8 - floating_ranges: - - - 172.16.0.130 - - 172.16.0.254 - gre_id_range: - - 2 - - 65535 - internal_cidr: 192.168.111.0/24 - internal_gateway: 192.168.111.1 - net_l23_provider: ovs - segmentation_type: vlan - vlan_range: - - 1000 - - 1030 - networks: - - cidr: 172.16.0.0/24 - gateway: 172.16.0.1 - ip_ranges: - - - 172.16.0.2 - - 172.16.0.126 - meta: - assign_vip: true - cidr: 172.16.0.0/24 - configurable: true - floating_range_var: floating_ranges - ip_range: - - 172.16.0.2 - - 172.16.0.126 - map_priority: 1 - name: public - notation: ip_ranges - render_addr_mask: public - render_type: null - use_gateway: true - vlan_start: null - name: public - vlan_start: null - - cidr: 192.168.0.0/24 - gateway: null - ip_ranges: - - - 192.168.0.1 - - 192.168.0.254 - meta: - assign_vip: true - cidr: 192.168.0.0/24 - configurable: true - map_priority: 2 - name: management - notation: cidr - render_addr_mask: internal - render_type: cidr - use_gateway: false - vlan_start: 101 - name: management - vlan_start: 101 - - cidr: 192.168.1.0/24 - gateway: null - ip_ranges: - - - 192.168.1.1 - - 192.168.1.254 - meta: - assign_vip: false - cidr: 192.168.1.0/24 - configurable: true - map_priority: 2 - name: storage - notation: cidr - render_addr_mask: storage - render_type: cidr - use_gateway: false - vlan_start: 102 - name: storage - vlan_start: 102 - - cidr: null - gateway: null - ip_ranges: [] - meta: - assign_vip: false - configurable: false - map_priority: 2 - name: private - neutron_vlan_range: true - notation: null - render_addr_mask: null - render_type: null - seg_type: vlan - use_gateway: false - vlan_start: null - name: private - vlan_start: null - - cidr: 10.20.0.0/24 - gateway: null - ip_ranges: - - - 10.20.0.3 - - 10.20.0.254 - meta: - assign_vip: false - configurable: false - map_priority: 0 - notation: ip_ranges - render_addr_mask: null - render_type: null - unmovable: true - use_gateway: true - name: fuelweb_admin - vlan_start: null -settings: - editable: - access: - email: - description: Email address for Administrator - label: email - type: text - value: admin@localhost - weight: 40 - metadata: - label: Access - weight: 10 - password: - description: Password for Administrator - label: password - type: password - value: admin - weight: 20 - tenant: - description: Tenant (project) name for Administrator - label: tenant - regex: - error: Invalid tenant name - source: ^(?!services$)(?!nova$)(?!glance$)(?!keystone$)(?!neutron$)(?!cinder$)(?!swift$)(?!ceph$)(?![Gg]uest$).* - type: text - value: admin - weight: 30 - user: - description: Username for Administrator - label: username - regex: - error: Invalid username - source: ^(?!services$)(?!nova$)(?!glance$)(?!keystone$)(?!neutron$)(?!cinder$)(?!swift$)(?!ceph$)(?![Gg]uest$).* - type: text - value: admin - weight: 10 - additional_components: - ceilometer: - description: If selected, Ceilometer component will be installed - label: Install Ceilometer - type: checkbox - value: false - weight: 40 - heat: - description: '' - label: '' - type: hidden - value: true - weight: 30 - metadata: - label: Additional Components - weight: 20 - murano: - description: If selected, Murano component will be installed - label: Install Murano - restrictions: - - cluster:net_provider != 'neutron' - type: checkbox - value: false - weight: 20 - sahara: - description: If selected, Sahara component will be installed - label: Install Sahara - type: checkbox - value: false - weight: 10 - common: - auth_key: - description: Public key(s) to include in authorized_keys on deployed nodes - label: Public Key - type: text - value: '' - weight: 70 - auto_assign_floating_ip: - description: If selected, OpenStack will automatically assign a floating IP - to a new instance - label: Auto assign floating IP - restrictions: - - cluster:net_provider == 'neutron' - type: checkbox - value: false - weight: 40 - compute_scheduler_driver: - label: Scheduler driver - type: radio - value: nova.scheduler.filter_scheduler.FilterScheduler - values: - - data: nova.scheduler.filter_scheduler.FilterScheduler - description: Currently the most advanced OpenStack scheduler. See the OpenStack - documentation for details. - label: Filter scheduler - - data: nova.scheduler.simple.SimpleScheduler - description: This is 'naive' scheduler which tries to find the least loaded - host - label: Simple scheduler - weight: 40 - debug: - description: Debug logging mode provides more information, but requires more - disk space. - label: OpenStack debug logging - type: checkbox - value: false - weight: 20 - disable_offload: - description: If set, generic segmentation offload (gso) and generic receive - offload (gro) on physical nics will be disabled. See ethtool man. - label: Disable generic offload on physical nics - restrictions: - - action: hide - condition: cluster:net_provider == 'neutron' and networking_parameters:segmentation_type - == 'gre' - type: checkbox - value: true - weight: 80 - libvirt_type: - label: Hypervisor type - type: radio - value: kvm - values: - - data: kvm - description: Choose this type of hypervisor if you run OpenStack on hardware - label: KVM - restrictions: - - settings:common.libvirt_type.value == 'vcenter' - - data: qemu - description: Choose this type of hypervisor if you run OpenStack on virtual - hosts. - label: QEMU - restrictions: - - settings:common.libvirt_type.value == 'vcenter' - - data: vcenter - description: Choose this type of hypervisor if you run OpenStack in a vCenter - environment. - label: vCenter - restrictions: - - settings:common.libvirt_type.value != 'vcenter' or cluster:net_provider - == 'neutron' - weight: 30 - metadata: - label: Common - weight: 30 - nova_quota: - description: Quotas are used to limit CPU and memory usage for tenants. Enabling - quotas will increase load on the Nova database. - label: Nova quotas - type: checkbox - value: false - weight: 25 - resume_guests_state_on_host_boot: - description: Whether to resume previous guests state when the host reboots. - If enabled, this option causes guests assigned to the host to resume their - previous state. If the guest was running a restart will be attempted when - nova-compute starts. If the guest was not running previously, a restart - will not be attempted. - label: Resume guests state on host boot - type: checkbox - value: true - weight: 60 - use_cow_images: - description: For most cases you will want qcow format. If it's disabled, raw - image format will be used to run VMs. OpenStack with raw format currently - does not support snapshotting. - label: Use qcow format for images - type: checkbox - value: true - weight: 50 - corosync: - group: - description: '' - label: Group - type: text - value: 226.94.1.1 - weight: 10 - metadata: - label: Corosync - restrictions: - - action: hide - condition: 'true' - weight: 50 - port: - description: '' - label: Port - type: text - value: '12000' - weight: 20 - verified: - description: Set True only if multicast is configured correctly on router. - label: Need to pass network verification. - type: checkbox - value: false - weight: 10 - external_dns: - dns_list: - description: List of upstream DNS servers, separated by comma - label: DNS list - type: text - value: 8.8.8.8, 8.8.4.4 - weight: 10 - metadata: - label: Upstream DNS - weight: 90 - external_ntp: - metadata: - label: Upstream NTP - weight: 100 - ntp_list: - description: List of upstream NTP servers, separated by comma - label: NTP servers list - type: text - value: 0.pool.ntp.org, 1.pool.ntp.org - weight: 10 - kernel_params: - kernel: - description: Default kernel parameters - label: Initial parameters - type: text - value: console=ttyS0,9600 console=tty0 rootdelay=90 nomodeset - weight: 45 - metadata: - label: Kernel parameters - weight: 40 - neutron_mellanox: - metadata: - enabled: true - label: Mellanox Neutron components - toggleable: false - weight: 50 - plugin: - label: Mellanox drivers and SR-IOV plugin - type: radio - value: disabled - values: - - data: disabled - description: If selected, Mellanox drivers, Neutron and Cinder plugin will - not be installed. - label: Mellanox drivers and plugins disabled - restrictions: - - settings:storage.iser.value == true - - data: drivers_only - description: If selected, Mellanox Ethernet drivers will be installed to - support networking over Mellanox NIC. Mellanox Neutron plugin will not - be installed. - label: Install only Mellanox drivers - restrictions: - - settings:common.libvirt_type.value != 'kvm' - - data: ethernet - description: If selected, both Mellanox Ethernet drivers and Mellanox network - acceleration (Neutron) plugin will be installed. - label: Install Mellanox drivers and SR-IOV plugin - restrictions: - - settings:common.libvirt_type.value != 'kvm' or not (cluster:net_provider - == 'neutron' and networking_parameters:segmentation_type == 'vlan') - weight: 60 - vf_num: - description: Note that one virtual function will be reserved to the storage - network, in case of choosing iSER. - label: Number of virtual NICs - restrictions: - - settings:neutron_mellanox.plugin.value != 'ethernet' - type: text - value: '16' - weight: 70 - nsx_plugin: - connector_type: - description: Default network transport type to use - label: NSX connector type - type: select - value: stt - values: - - data: gre - label: GRE - - data: ipsec_gre - label: GRE over IPSec - - data: stt - label: STT - - data: ipsec_stt - label: STT over IPSec - - data: bridge - label: Bridge - weight: 80 - l3_gw_service_uuid: - description: UUID for the default L3 gateway service to use with this cluster - label: L3 service UUID - regex: - error: Invalid L3 gateway service UUID - source: '[a-f\d]{8}-[a-f\d]{4}-[a-f\d]{4}-[a-f\d]{4}-[a-f\d]{12}' - type: text - value: '' - weight: 50 - metadata: - enabled: false - label: VMware NSX - restrictions: - - action: hide - condition: cluster:net_provider != 'neutron' or networking_parameters:net_l23_provider - != 'nsx' - weight: 20 - nsx_controllers: - description: One or more IPv4[:port] addresses of NSX controller node, separated - by comma (e.g. 10.30.30.2,192.168.110.254:443) - label: NSX controller endpoint - regex: - error: Invalid controller endpoints, specify valid IPv4[:port] pair - source: ^(([\d]|[1-9][\d]|1[\d]{2}|2[0-4][\d]|25[0-5])\.){3}([\d]|[1-9][\d]|1[\d]{2}|2[0-4][\d]|25[0-5])(:(6553[0-5]|655[0-2][\d]|65[0-4][\d]{2}|6[0-4][\d]{3}|5[\d]{4}|[\d][\d]{0,3}))?(,(([\d]|[1-9][\d]|1[\d]{2}|2[0-4][\d]|25[0-5])\.){3}([\d]|[1-9][\d]|1[\d]{2}|2[0-4][\d]|25[0-5])(:(6553[0-5]|655[0-2][\d]|65[0-4][\d]{2}|6[0-4][\d]{3}|5[\d]{4}|[\d][\d]{0,3}))?)*$ - type: text - value: '' - weight: 60 - nsx_password: - description: Password for Administrator - label: NSX password - regex: - error: Empty password - source: \S - type: password - value: '' - weight: 30 - nsx_username: - description: NSX administrator's username - label: NSX username - regex: - error: Empty username - source: \S - type: text - value: admin - weight: 20 - packages_url: - description: URL to NSX specific packages - label: URL to NSX bits - regex: - error: Invalid URL, specify valid HTTP/HTTPS URL with IPv4 address (e.g. - http://10.20.0.2/nsx) - source: ^https?://(([\d]|[1-9][\d]|1[\d]{2}|2[0-4][\d]|25[0-5])\.){3}([\d]|[1-9][\d]|1[\d]{2}|2[0-4][\d]|25[0-5])(:(6553[0-5]|655[0-2][\d]|65[0-4][\d]{2}|6[0-4][\d]{3}|5[\d]{4}|[\d][\d]{0,3}))?(/.*)?$ - type: text - value: '' - weight: 70 - replication_mode: - description: '' - label: NSX cluster has Service nodes - type: checkbox - value: true - weight: 90 - transport_zone_uuid: - description: UUID of the pre-existing default NSX Transport zone - label: Transport zone UUID - regex: - error: Invalid transport zone UUID - source: '[a-f\d]{8}-[a-f\d]{4}-[a-f\d]{4}-[a-f\d]{4}-[a-f\d]{12}' - type: text - value: '' - weight: 40 - provision: - metadata: - label: Provision - restrictions: - - action: hide - condition: not ('experimental' in version:feature_groups) - weight: 80 - method: - description: Which provision method to use for this cluster. - label: Provision method - type: radio - value: cobbler - values: - - data: image - description: Copying pre-built images on a disk. - label: Image - - data: cobbler - description: Install from scratch using anaconda or debian-installer. - label: Classic (use anaconda or debian-installer) - public_network_assignment: - assign_to_all_nodes: - description: When disabled, public network will be assigned to controllers - and zabbix-server only - label: Assign public network to all nodes - type: checkbox - value: false - weight: 10 - metadata: - label: Public network assignment - restrictions: - - action: hide - condition: cluster:net_provider != 'neutron' - weight: 50 - storage: - ephemeral_ceph: - description: Configures Nova to store ephemeral volumes in RBD. This works - best if Ceph is enabled for volumes and images, too. Enables live migration - of all types of Ceph backed VMs (without this option, live migration will - only work with VMs launched from Cinder volumes). - label: Ceph RBD for ephemeral volumes (Nova) - restrictions: - - settings:common.libvirt_type.value == 'vcenter' - type: checkbox - value: false - weight: 75 - images_ceph: - description: Configures Glance to use the Ceph RBD backend to store images. - If enabled, this option will prevent Swift from installing. - label: Ceph RBD for images (Glance) - type: checkbox - value: false - weight: 30 - images_vcenter: - description: Configures Glance to use the vCenter/ESXi backend to store images. - If enabled, this option will prevent Swift from installing. - label: VMWare vCenter/ESXi datastore for images (Glance) - restrictions: - - settings:common.libvirt_type.value != 'vcenter' - type: checkbox - value: false - weight: 35 - iser: - description: 'High performance block storage: Cinder volumes over iSER protocol - (iSCSI over RDMA). This feature requires SR-IOV capabilities in the NIC, - and will use a dedicated virtual function for the storage network.' - label: iSER protocol for volumes (Cinder) - restrictions: - - settings:storage.volumes_lvm.value != true or settings:common.libvirt_type.value - != 'kvm' - type: checkbox - value: false - weight: 11 - metadata: - label: Storage - weight: 60 - objects_ceph: - description: Configures RadosGW front end for Ceph RBD. This exposes S3 and - Swift API Interfaces. If enabled, this option will prevent Swift from installing. - label: Ceph RadosGW for objects (Swift API) - restrictions: - - settings:storage.images_ceph.value == false - type: checkbox - value: false - weight: 80 - osd_pool_size: - description: Configures the default number of object replicas in Ceph. This - number must be equal to or lower than the number of deployed 'Storage - - Ceph OSD' nodes. - label: Ceph object replication factor - regex: - error: Invalid number - source: ^[1-9]\d*$ - restrictions: - - settings:common.libvirt_type.value == 'vcenter' - type: text - value: '2' - weight: 85 - vc_datacenter: - description: Inventory path to a datacenter. If you want to use ESXi host - as datastore, it should be "ha-datacenter". - label: Datacenter name - regex: - error: Empty datacenter - source: \S - restrictions: - - action: hide - condition: settings:storage.images_vcenter.value == false or settings:common.libvirt_type.value - != 'vcenter' - type: text - value: '' - weight: 65 - vc_datastore: - description: Datastore associated with the datacenter. - label: Datastore name - regex: - error: Empty datastore - source: \S - restrictions: - - action: hide - condition: settings:storage.images_vcenter.value == false or settings:common.libvirt_type.value - != 'vcenter' - type: text - value: '' - weight: 60 - vc_host: - description: IP Address of vCenter/ESXi - label: vCenter/ESXi IP - regex: - error: Specify valid IPv4 address - source: ^(([\d]|[1-9][\d]|1[\d]{2}|2[0-4][\d]|25[0-5])\.){3}([\d]|[1-9][\d]|1[\d]{2}|2[0-4][\d]|25[0-5])$ - restrictions: - - action: hide - condition: settings:storage.images_vcenter.value == false or settings:common.libvirt_type.value - != 'vcenter' - type: text - value: '' - weight: 45 - vc_image_dir: - description: The name of the directory where the glance images will be stored - in the VMware datastore. - label: Datastore Images directory - regex: - error: Empty images directory - source: \S - restrictions: - - action: hide - condition: settings:storage.images_vcenter.value == false or settings:common.libvirt_type.value - != 'vcenter' - type: text - value: /openstack_glance - weight: 70 - vc_password: - description: vCenter/ESXi admin password - label: Password - regex: - error: Empty password - source: \S - restrictions: - - action: hide - condition: settings:storage.images_vcenter.value == false or settings:common.libvirt_type.value - != 'vcenter' - type: password - value: '' - weight: 55 - vc_user: - description: vCenter/ESXi admin username - label: Username - regex: - error: Empty username - source: \S - restrictions: - - action: hide - condition: settings:storage.images_vcenter.value == false or settings:common.libvirt_type.value - != 'vcenter' - type: text - value: '' - weight: 50 - volumes_ceph: - description: Configures Cinder to store volumes in Ceph RBD images. - label: Ceph RBD for volumes (Cinder) - restrictions: - - settings:storage.volumes_lvm.value == true or settings:common.libvirt_type.value - == 'vcenter' - type: checkbox - value: false - weight: 20 - volumes_lvm: - description: Requires at least one Storage - Cinder LVM node. - label: Cinder LVM over iSCSI for volumes - restrictions: - - settings:storage.volumes_ceph.value == true - type: checkbox - value: true - weight: 10 - volumes_vmdk: - description: Configures Cinder to store volumes via VMware vCenter. - label: VMware vCenter for volumes (Cinder) - restrictions: - - settings:common.libvirt_type.value != 'vcenter' or settings:storage.volumes_lvm.value - == true - type: checkbox - value: false - weight: 15 - syslog: - metadata: - label: Syslog - weight: 50 - syslog_port: - description: Remote syslog port - label: Port - regex: - error: Invalid Syslog port - source: ^([1-9][0-9]{0,3}|[1-5][0-9]{4}|6[0-4][0-9]{3}|65[0-4][0-9]{2}|655[0-2][0-9]|6553[0-5])$ - type: text - value: '514' - weight: 20 - syslog_server: - description: Remote syslog hostname - label: Hostname - type: text - value: '' - weight: 10 - syslog_transport: - label: Syslog transport protocol - type: radio - value: tcp - values: - - data: udp - description: '' - label: UDP - - data: tcp - description: '' - label: TCP - weight: 30 - vcenter: - cluster: - description: vCenter cluster name. If you have multiple clusters, use comma - to separate names - label: Cluster - regex: - error: Invalid cluster list - source: ^([^,\ ]+([\ ]*[^,\ ])*)(,[^,\ ]+([\ ]*[^,\ ])*)*$ - type: text - value: '' - weight: 40 - datastore_regex: - description: The Datastore regexp setting specifies the data stores to use - with Compute. For example, "nas.*". If you want to use all available datastores, - leave this field blank - label: Datastore regexp - regex: - error: Invalid datastore regexp - source: ^(\S.*\S|\S|)$ - type: text - value: '' - weight: 50 - host_ip: - description: IP Address of vCenter - label: vCenter IP - regex: - error: Specify valid IPv4 address - source: ^(([\d]|[1-9][\d]|1[\d]{2}|2[0-4][\d]|25[0-5])\.){3}([\d]|[1-9][\d]|1[\d]{2}|2[0-4][\d]|25[0-5])$ - type: text - value: '' - weight: 10 - metadata: - label: vCenter - restrictions: - - action: hide - condition: settings:common.libvirt_type.value != 'vcenter' - weight: 20 - use_vcenter: - description: '' - label: '' - type: hidden - value: true - weight: 5 - vc_password: - description: vCenter admin password - label: Password - regex: - error: Empty password - source: \S - type: password - value: admin - weight: 30 - vc_user: - description: vCenter admin username - label: Username - regex: - error: Empty username - source: \S - type: text - value: admin - weight: 20 - vlan_interface: - description: Physical ESXi host ethernet adapter for VLAN networking (e.g. - vmnic1). If empty "vmnic0" is used by default - label: ESXi VLAN interface - restrictions: - - action: hide - condition: cluster:net_provider != 'nova_network' or networking_parameters:net_manager - != 'VlanManager' - type: text - value: '' - weight: 60 - zabbix: - metadata: - label: Zabbix Access - restrictions: - - action: hide - condition: not ('experimental' in version:feature_groups) - weight: 70 - password: - description: Password for Zabbix Administrator - label: password - type: password - value: zabbix - weight: 20 - username: - description: Username for Zabbix Administrator - label: username - type: text - value: admin - weight: 10 diff --git a/fuel/prototypes/auto-deploy/examples/libvirt/conf/dha.yaml b/fuel/prototypes/auto-deploy/examples/libvirt/conf/dha.yaml deleted file mode 100644 index 66395e86b..000000000 --- a/fuel/prototypes/auto-deploy/examples/libvirt/conf/dha.yaml +++ /dev/null @@ -1,49 +0,0 @@ -title: Deployment Hardware Adapter (DHA) -# DHA API version supported -version: 1.1 -created: Sat Apr 25 16:26:22 UTC 2015 -comment: Small libvirt setup - -# Adapter to use for this definition -adapter: libvirt - -# Node list. -# Mandatory fields are id and role. -# The MAC address of the PXE boot interface is not mandatory -# to be set, but the field must be present. -# All other fields are adapter specific. - -nodes: -- id: 1 - pxeMac: 52:54:00:aa:dd:84 - libvirtName: controller1 -- id: 2 - pxeMac: 52:54:00:41:64:f3 - libvirtName: compute4 -- id: 3 - pxeMac: 52:54:00:69:a0:79 - libvirtName: compute5 -- id: 4 - pxeMac: 52:54:00:f8:b0:75 - libvirtName: fuel-master - isFuel: yes - -# Deployment power on strategy -# all: Turn on all nodes at once. There will be no correlation -# between the DHA and DEA node numbering. MAC addresses -# will be used to select the node roles though. -# sequence: Turn on the nodes in sequence starting with the lowest order -# node and wait for the node to be detected by Fuel. Not until -# the node has been detected and assigned a role will the next -# node be turned on. -powerOnStrategy: all - -# If fuelCustomInstall is set to true, Fuel is assumed to be installed by -# calling the DHA adapter function "dha_fuelCustomInstall()" with two -# arguments: node ID and the ISO file name to deploy. The custom install -# function is then to handle all necessary logic to boot the Fuel master -# from the ISO and then return. -# Allowed values: true, false - -fuelCustomInstall: false - diff --git a/fuel/prototypes/auto-deploy/examples/libvirt/conf/networks/fuel1 b/fuel/prototypes/auto-deploy/examples/libvirt/conf/networks/fuel1 deleted file mode 100644 index 7b2b15423..000000000 --- a/fuel/prototypes/auto-deploy/examples/libvirt/conf/networks/fuel1 +++ /dev/null @@ -1,12 +0,0 @@ -<network> - <name>fuel1</name> - <forward mode='nat'> - <nat> - <port start='1024' end='65535'/> - </nat> - </forward> - <bridge name='fuel1' stp='on' delay='0'/> - <ip address='10.20.0.1' netmask='255.255.255.0'> - </ip> -</network> - diff --git a/fuel/prototypes/auto-deploy/examples/libvirt/conf/networks/fuel2 b/fuel/prototypes/auto-deploy/examples/libvirt/conf/networks/fuel2 deleted file mode 100644 index 615c92094..000000000 --- a/fuel/prototypes/auto-deploy/examples/libvirt/conf/networks/fuel2 +++ /dev/null @@ -1,5 +0,0 @@ -<network> - <name>fuel2</name> - <bridge name='fuel2' stp='on' delay='0'/> -</network> - diff --git a/fuel/prototypes/auto-deploy/examples/libvirt/conf/networks/fuel3 b/fuel/prototypes/auto-deploy/examples/libvirt/conf/networks/fuel3 deleted file mode 100644 index 2383e6c1f..000000000 --- a/fuel/prototypes/auto-deploy/examples/libvirt/conf/networks/fuel3 +++ /dev/null @@ -1,5 +0,0 @@ -<network> - <name>fuel3</name> - <bridge name='fuel3' stp='on' delay='0'/> -</network> - diff --git a/fuel/prototypes/auto-deploy/examples/libvirt/conf/networks/fuel4 b/fuel/prototypes/auto-deploy/examples/libvirt/conf/networks/fuel4 deleted file mode 100644 index 5b69f912d..000000000 --- a/fuel/prototypes/auto-deploy/examples/libvirt/conf/networks/fuel4 +++ /dev/null @@ -1,12 +0,0 @@ -<network> - <name>fuel4</name> - <forward mode='nat'> - <nat> - <port start='1024' end='65535'/> - </nat> - </forward> - <bridge name='fuel4' stp='on' delay='0'/> - <ip address='172.16.0.1' netmask='255.255.255.0'> - </ip> -</network> - diff --git a/fuel/prototypes/auto-deploy/examples/libvirt/conf/vms/compute4 b/fuel/prototypes/auto-deploy/examples/libvirt/conf/vms/compute4 deleted file mode 100644 index ad5d4d1c8..000000000 --- a/fuel/prototypes/auto-deploy/examples/libvirt/conf/vms/compute4 +++ /dev/null @@ -1,107 +0,0 @@ -<domain type='kvm'> - <name>compute4</name> - <uuid>6206efbf-18e1-492e-951a-60eda6676ef5</uuid> - <memory unit='KiB'>8388608</memory> - <currentMemory unit='KiB'>8388608</currentMemory> - <vcpu placement='static'>2</vcpu> - <os> - <type arch='x86_64' machine='pc-1.0'>hvm</type> - <boot dev='network'/> - <boot dev='hd'/> - <bootmenu enable='yes'/> - <bios rebootTimeout='30000'/> - </os> - <features> - <acpi/> - <apic/> - <pae/> - </features> - <cpu mode='custom' match='exact'> - <model fallback='allow'>SandyBridge</model> - <vendor>Intel</vendor> - <feature policy='require' name='vme'/> - <feature policy='require' name='dtes64'/> - <feature policy='require' name='vmx'/> - <feature policy='require' name='erms'/> - <feature policy='require' name='xtpr'/> - <feature policy='require' name='smep'/> - <feature policy='require' name='pcid'/> - <feature policy='require' name='est'/> - <feature policy='require' name='monitor'/> - <feature policy='require' name='smx'/> - <feature policy='require' name='tm'/> - <feature policy='require' name='acpi'/> - <feature policy='require' name='osxsave'/> - <feature policy='require' name='ht'/> - <feature policy='require' name='pdcm'/> - <feature policy='require' name='fsgsbase'/> - <feature policy='require' name='f16c'/> - <feature policy='require' name='ds'/> - <feature policy='require' name='tm2'/> - <feature policy='require' name='ss'/> - <feature policy='require' name='pbe'/> - <feature policy='require' name='ds_cpl'/> - <feature policy='require' name='rdrand'/> - </cpu> - <clock offset='utc'/> - <on_poweroff>destroy</on_poweroff> - <on_reboot>restart</on_reboot> - <on_crash>restart</on_crash> - <devices> - <emulator>/usr/bin/kvm</emulator> - <disk type='file' device='disk'> - <driver name='qemu' type='raw'/> - <source file='disk.raw'/> - <target dev='vda' bus='virtio'/> - <address type='pci' domain='0x0000' bus='0x00' slot='0x07' function='0x0'/> - </disk> - <controller type='usb' index='0'> - <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x2'/> - </controller> - <controller type='pci' index='0' model='pci-root'/> - <interface type='network'> - <mac address='52:54:00:41:64:f3'/> - <source network='fuel1'/> - <model type='virtio'/> - <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x0'/> - </interface> - <interface type='network'> - <mac address='52:54:00:67:00:5e'/> - <source network='fuel2'/> - <model type='virtio'/> - <address type='pci' domain='0x0000' bus='0x00' slot='0x04' function='0x0'/> - </interface> - <interface type='network'> - <mac address='52:54:00:3e:dd:0d'/> - <source network='fuel3'/> - <model type='virtio'/> - <address type='pci' domain='0x0000' bus='0x00' slot='0x05' function='0x0'/> - </interface> - <interface type='network'> - <mac address='52:54:00:a6:3c:32'/> - <source network='fuel4'/> - <model type='virtio'/> - <address type='pci' domain='0x0000' bus='0x00' slot='0x09' function='0x0'/> - </interface> - <serial type='pty'> - <target port='0'/> - </serial> - <console type='pty'> - <target type='serial' port='0'/> - </console> - <input type='mouse' bus='ps2'/> - <input type='keyboard' bus='ps2'/> - <graphics type='vnc' port='-1' autoport='yes' keymap='sv'/> - <sound model='ich6'> - <address type='pci' domain='0x0000' bus='0x00' slot='0x06' function='0x0'/> - </sound> - <video> - <model type='cirrus' vram='9216' heads='1'/> - <address type='pci' domain='0x0000' bus='0x00' slot='0x02' function='0x0'/> - </video> - <memballoon model='virtio'> - <address type='pci' domain='0x0000' bus='0x00' slot='0x08' function='0x0'/> - </memballoon> - </devices> -</domain> - diff --git a/fuel/prototypes/auto-deploy/examples/libvirt/conf/vms/compute5 b/fuel/prototypes/auto-deploy/examples/libvirt/conf/vms/compute5 deleted file mode 100644 index 39059066c..000000000 --- a/fuel/prototypes/auto-deploy/examples/libvirt/conf/vms/compute5 +++ /dev/null @@ -1,106 +0,0 @@ -<domain type='kvm'> - <name>compute5</name> - <uuid>2c1e50fa-110f-4ab7-98ff-7c5e08c8f38f</uuid> - <memory unit='KiB'>8388608</memory> - <currentMemory unit='KiB'>8388608</currentMemory> - <vcpu placement='static'>2</vcpu> - <os> - <type arch='x86_64' machine='pc-1.0'>hvm</type> - <boot dev='network'/> - <boot dev='hd'/> - <bios rebootTimeout='30000'/> - </os> - <features> - <acpi/> - <apic/> - <pae/> - </features> - <cpu mode='custom' match='exact'> - <model fallback='allow'>SandyBridge</model> - <vendor>Intel</vendor> - <feature policy='require' name='vme'/> - <feature policy='require' name='dtes64'/> - <feature policy='require' name='vmx'/> - <feature policy='require' name='erms'/> - <feature policy='require' name='xtpr'/> - <feature policy='require' name='smep'/> - <feature policy='require' name='pcid'/> - <feature policy='require' name='est'/> - <feature policy='require' name='monitor'/> - <feature policy='require' name='smx'/> - <feature policy='require' name='tm'/> - <feature policy='require' name='acpi'/> - <feature policy='require' name='osxsave'/> - <feature policy='require' name='ht'/> - <feature policy='require' name='pdcm'/> - <feature policy='require' name='fsgsbase'/> - <feature policy='require' name='f16c'/> - <feature policy='require' name='ds'/> - <feature policy='require' name='tm2'/> - <feature policy='require' name='ss'/> - <feature policy='require' name='pbe'/> - <feature policy='require' name='ds_cpl'/> - <feature policy='require' name='rdrand'/> - </cpu> - <clock offset='utc'/> - <on_poweroff>destroy</on_poweroff> - <on_reboot>restart</on_reboot> - <on_crash>restart</on_crash> - <devices> - <emulator>/usr/bin/kvm</emulator> - <disk type='file' device='disk'> - <driver name='qemu' type='raw'/> - <source file='disk.raw'/> - <target dev='vda' bus='virtio'/> - <address type='pci' domain='0x0000' bus='0x00' slot='0x07' function='0x0'/> - </disk> - <controller type='usb' index='0'> - <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x2'/> - </controller> - <controller type='pci' index='0' model='pci-root'/> - <interface type='network'> - <mac address='52:54:00:69:a0:79'/> - <source network='fuel1'/> - <model type='virtio'/> - <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x0'/> - </interface> - <interface type='network'> - <mac address='52:54:00:58:4c:df'/> - <source network='fuel2'/> - <model type='virtio'/> - <address type='pci' domain='0x0000' bus='0x00' slot='0x04' function='0x0'/> - </interface> - <interface type='network'> - <mac address='52:54:00:27:54:1d'/> - <source network='fuel3'/> - <model type='virtio'/> - <address type='pci' domain='0x0000' bus='0x00' slot='0x05' function='0x0'/> - </interface> - <interface type='network'> - <mac address='52:54:00:84:b8:c4'/> - <source network='fuel4'/> - <model type='virtio'/> - <address type='pci' domain='0x0000' bus='0x00' slot='0x09' function='0x0'/> - </interface> - <serial type='pty'> - <target port='0'/> - </serial> - <console type='pty'> - <target type='serial' port='0'/> - </console> - <input type='mouse' bus='ps2'/> - <input type='keyboard' bus='ps2'/> - <graphics type='vnc' port='-1' autoport='yes' keymap='sv'/> - <sound model='ich6'> - <address type='pci' domain='0x0000' bus='0x00' slot='0x06' function='0x0'/> - </sound> - <video> - <model type='cirrus' vram='9216' heads='1'/> - <address type='pci' domain='0x0000' bus='0x00' slot='0x02' function='0x0'/> - </video> - <memballoon model='virtio'> - <address type='pci' domain='0x0000' bus='0x00' slot='0x08' function='0x0'/> - </memballoon> - </devices> -</domain> - diff --git a/fuel/prototypes/auto-deploy/examples/libvirt/conf/vms/controller1 b/fuel/prototypes/auto-deploy/examples/libvirt/conf/vms/controller1 deleted file mode 100644 index ca1bd3b05..000000000 --- a/fuel/prototypes/auto-deploy/examples/libvirt/conf/vms/controller1 +++ /dev/null @@ -1,106 +0,0 @@ -<domain type='kvm'> - <name>controller1</name> - <uuid>ce9897c1-d9e7-452c-b998-9fad0cf5b9db</uuid> - <memory unit='KiB'>2097152</memory> - <currentMemory unit='KiB'>2097152</currentMemory> - <vcpu placement='static'>2</vcpu> - <os> - <type arch='x86_64' machine='pc-1.0'>hvm</type> - <boot dev='network'/> - <boot dev='hd'/> - <bios rebootTimeout='30000'/> - </os> - <features> - <acpi/> - <apic/> - <pae/> - </features> - <cpu mode='custom' match='exact'> - <model fallback='allow'>SandyBridge</model> - <vendor>Intel</vendor> - <feature policy='require' name='vme'/> - <feature policy='require' name='dtes64'/> - <feature policy='require' name='vmx'/> - <feature policy='require' name='erms'/> - <feature policy='require' name='xtpr'/> - <feature policy='require' name='smep'/> - <feature policy='require' name='pcid'/> - <feature policy='require' name='est'/> - <feature policy='require' name='monitor'/> - <feature policy='require' name='smx'/> - <feature policy='require' name='tm'/> - <feature policy='require' name='acpi'/> - <feature policy='require' name='osxsave'/> - <feature policy='require' name='ht'/> - <feature policy='require' name='pdcm'/> - <feature policy='require' name='fsgsbase'/> - <feature policy='require' name='f16c'/> - <feature policy='require' name='ds'/> - <feature policy='require' name='tm2'/> - <feature policy='require' name='ss'/> - <feature policy='require' name='pbe'/> - <feature policy='require' name='ds_cpl'/> - <feature policy='require' name='rdrand'/> - </cpu> - <clock offset='utc'/> - <on_poweroff>destroy</on_poweroff> - <on_reboot>restart</on_reboot> - <on_crash>restart</on_crash> - <devices> - <emulator>/usr/bin/kvm</emulator> - <disk type='file' device='disk'> - <driver name='qemu' type='raw'/> - <source file='disk.raw'/> - <target dev='vda' bus='virtio'/> - <address type='pci' domain='0x0000' bus='0x00' slot='0x07' function='0x0'/> - </disk> - <controller type='usb' index='0'> - <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x2'/> - </controller> - <controller type='pci' index='0' model='pci-root'/> - <interface type='network'> - <mac address='52:54:00:aa:dd:84'/> - <source network='fuel1'/> - <model type='virtio'/> - <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x0'/> - </interface> - <interface type='network'> - <mac address='52:54:00:e4:6e:d9'/> - <source network='fuel2'/> - <model type='virtio'/> - <address type='pci' domain='0x0000' bus='0x00' slot='0x04' function='0x0'/> - </interface> - <interface type='network'> - <mac address='52:54:00:60:88:73'/> - <source network='fuel3'/> - <model type='virtio'/> - <address type='pci' domain='0x0000' bus='0x00' slot='0x05' function='0x0'/> - </interface> - <interface type='network'> - <mac address='52:54:00:f0:b2:0f'/> - <source network='fuel4'/> - <model type='virtio'/> - <address type='pci' domain='0x0000' bus='0x00' slot='0x09' function='0x0'/> - </interface> - <serial type='pty'> - <target port='0'/> - </serial> - <console type='pty'> - <target type='serial' port='0'/> - </console> - <input type='mouse' bus='ps2'/> - <input type='keyboard' bus='ps2'/> - <graphics type='vnc' port='-1' autoport='yes' keymap='sv'/> - <sound model='ich6'> - <address type='pci' domain='0x0000' bus='0x00' slot='0x06' function='0x0'/> - </sound> - <video> - <model type='cirrus' vram='9216' heads='1'/> - <address type='pci' domain='0x0000' bus='0x00' slot='0x02' function='0x0'/> - </video> - <memballoon model='virtio'> - <address type='pci' domain='0x0000' bus='0x00' slot='0x08' function='0x0'/> - </memballoon> - </devices> -</domain> - diff --git a/fuel/prototypes/auto-deploy/examples/libvirt/conf/vms/fuel-master b/fuel/prototypes/auto-deploy/examples/libvirt/conf/vms/fuel-master deleted file mode 100644 index d2a78411c..000000000 --- a/fuel/prototypes/auto-deploy/examples/libvirt/conf/vms/fuel-master +++ /dev/null @@ -1,102 +0,0 @@ -<domain type='kvm'> - <name>fuel-master</name> - <uuid>caabab80-b42f-4f9d-9c0d-18f274c4cb58</uuid> - <memory unit='KiB'>2097152</memory> - <currentMemory unit='KiB'>2097152</currentMemory> - <vcpu placement='static'>2</vcpu> - <resource> - <partition>/machine</partition> - </resource> - <os> - <type arch='x86_64' machine='pc-1.0'>hvm</type> - <boot dev='hd'/> - <boot dev='cdrom'/> - <bootmenu enable='no'/> - </os> - <features> - <acpi/> - <apic/> - <pae/> - </features> - <cpu mode='custom' match='exact'> - <model fallback='allow'>SandyBridge</model> - <vendor>Intel</vendor> - <feature policy='require' name='vme'/> - <feature policy='require' name='dtes64'/> - <feature policy='require' name='vmx'/> - <feature policy='require' name='erms'/> - <feature policy='require' name='xtpr'/> - <feature policy='require' name='smep'/> - <feature policy='require' name='pcid'/> - <feature policy='require' name='est'/> - <feature policy='require' name='monitor'/> - <feature policy='require' name='smx'/> - <feature policy='require' name='tm'/> - <feature policy='require' name='acpi'/> - <feature policy='require' name='osxsave'/> - <feature policy='require' name='ht'/> - <feature policy='require' name='pdcm'/> - <feature policy='require' name='fsgsbase'/> - <feature policy='require' name='f16c'/> - <feature policy='require' name='ds'/> - <feature policy='require' name='tm2'/> - <feature policy='require' name='ss'/> - <feature policy='require' name='pbe'/> - <feature policy='require' name='ds_cpl'/> - <feature policy='require' name='rdrand'/> - </cpu> - <clock offset='utc'/> - <on_poweroff>destroy</on_poweroff> - <on_reboot>restart</on_reboot> - <on_crash>restart</on_crash> - <devices> - <emulator>/usr/bin/kvm</emulator> - <disk type='block' device='cdrom'> - <driver name='qemu' type='raw'/> - <target dev='hdc' bus='ide'/> - <readonly/> - <address type='drive' controller='0' bus='1' target='0' unit='0'/> - </disk> - <disk type='file' device='disk'> - <driver name='qemu' type='raw'/> - <source file='disk.raw'/> - <target dev='vda' bus='virtio'/> - <address type='pci' domain='0x0000' bus='0x00' slot='0x07' function='0x0'/> - </disk> - <controller type='ide' index='0'> - <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x1'/> - </controller> - <controller type='usb' index='0'> - <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x2'/> - </controller> - <controller type='pci' index='0' model='pci-root'/> - <interface type='network'> - <mac address='52:54:00:f8:b0:75'/> - <source network='fuel1'/> - <model type='virtio'/> - <address type='pci' domain='0x0000' bus='0x00' slot='0x04' function='0x0'/> - </interface> - <serial type='pty'> - <target port='0'/> - </serial> - <console type='pty'> - <target type='serial' port='0'/> - </console> - <input type='mouse' bus='ps2'/> - <input type='keyboard' bus='ps2'/> - <graphics type='vnc' port='-1' autoport='yes' listen='127.0.0.1' keymap='sv'> - <listen type='address' address='127.0.0.1'/> - </graphics> - <sound model='ich6'> - <address type='pci' domain='0x0000' bus='0x00' slot='0x06' function='0x0'/> - </sound> - <video> - <model type='cirrus' vram='9216' heads='1'/> - <address type='pci' domain='0x0000' bus='0x00' slot='0x02' function='0x0'/> - </video> - <memballoon model='virtio'> - <address type='pci' domain='0x0000' bus='0x00' slot='0x08' function='0x0'/> - </memballoon> - </devices> -</domain> - diff --git a/fuel/prototypes/auto-deploy/examples/libvirt/install-ubuntu-packages.sh b/fuel/prototypes/auto-deploy/examples/libvirt/install-ubuntu-packages.sh deleted file mode 100755 index 58ce19ac6..000000000 --- a/fuel/prototypes/auto-deploy/examples/libvirt/install-ubuntu-packages.sh +++ /dev/null @@ -1,16 +0,0 @@ -#!/bin/bash -############################################################################## -# Copyright (c) 2015 Ericsson AB and others. -# stefan.k.berg@ericsson.com -# jonas.bjurel@ericsson.com -# All rights reserved. This program and the accompanying materials -# are made available under the terms of the Apache License, Version 2.0 -# which accompanies this distribution, and is available at -# http://www.apache.org/licenses/LICENSE-2.0 -############################################################################## - -# Tools for installation on the libvirt server/base host -# -apt-get install -y libvirt-bin qemu-kvm tightvncserver virt-manager \ - sshpass fuseiso genisoimage blackbox xterm -restart libvirt-bin diff --git a/fuel/prototypes/auto-deploy/examples/libvirt/setup_example_vms.sh b/fuel/prototypes/auto-deploy/examples/libvirt/setup_example_vms.sh deleted file mode 100755 index e0388ac66..000000000 --- a/fuel/prototypes/auto-deploy/examples/libvirt/setup_example_vms.sh +++ /dev/null @@ -1,105 +0,0 @@ -#!/bin/bash -############################################################################## -# Copyright (c) 2015 Ericsson AB and others. -# stefan.k.berg@ericsson.com -# jonas.bjurel@ericsson.com -# All rights reserved. This program and the accompanying materials -# are made available under the terms of the Apache License, Version 2.0 -# which accompanies this distribution, and is available at -# http://www.apache.org/licenses/LICENSE-2.0 -############################################################################## - -exit_handler() { - rm $tmpfile -} - - -error_exit () { - echo "$@" - exit 1 -} - -trap exit_handler EXIT - -# You can change these disk sizes to adapt to your needs -fueldisk="30G" -controllerdisk="20G" -computedisk="20G" - - -topdir=$(dirname $(readlink -f $BASH_SOURCE)) -netdir=$topdir/conf/networks -vmdir=$topdir/conf/vms -tmpfile=`mktemp /tmp/XXXXX` - -if [ ! -d $netdir ]; then - error_exit "No net directory $netdir" - exit 1 -elif [ ! -d $vmdir ]; then - error_exit "No VM directory $vmdir" - exit 1 -fi - -if [ $# -ne 1 ]; then - echo "Argument error." - echo "`basename $0` <path to storage dir>" - exit 1 -fi - -if [ "`whoami`" != "root" ]; then - error_exit "You need be root to run this script" -fi - -echo "Cleaning up" -tools/cleanup_example_vms.sh - -storagedir=$1 - -if [ ! -d $storagedir ]; then - error_exit "Could not find storagedir directory $storagedir" -fi - -# Create storage space and patch it in -for vm in $vmdir/* -do - vmname=`basename $vm` - virsh dumpxml $vmname >/dev/null 2>&1 - if [ $? -eq 0 ]; then - echo "Found vm $vmname, deleting" - virsh destroy $vmname - virsh undefine $vmname - sleep 10 - - fi - - - storage=${storagedir}/`basename ${vm}`.raw - if [ -f ${storage} ]; then - echo "Storage already present, removing: $storage" - rm $storage - fi - - echo `basename $vm` | grep -q fuel-master && size=$fueldisk - echo `basename $vm` | grep -q controller && size=$controllerdisk - echo `basename $vm` | grep -q compute && size=$computedisk - - echo "Creating ${size} GB of storage in ${storage}" - fallocate -l ${size} ${storage} || \ - error_exit "Could not create storage" - sed "s:<source file='disk.raw':<source file='${storage}':" $vm >$tmpfile - virsh define $tmpfile -done - -for net in $netdir/* -do - netname=`basename $net` - virsh net-dumpxml $netname >/dev/null 2>&1 - if [ $? -eq 0 ]; then - echo "Found net $netname, deleting" - virsh net-destroy $netname - virsh net-undefine $netname - fi - virsh net-define $net - virsh net-autostart $netname - virsh net-start $netname -done diff --git a/fuel/prototypes/auto-deploy/examples/libvirt/tools/cleanup_example_vms.sh b/fuel/prototypes/auto-deploy/examples/libvirt/tools/cleanup_example_vms.sh deleted file mode 100755 index 960b21ea6..000000000 --- a/fuel/prototypes/auto-deploy/examples/libvirt/tools/cleanup_example_vms.sh +++ /dev/null @@ -1,58 +0,0 @@ -#!/bin/bash -############################################################################## -# Copyright (c) 2015 Ericsson AB and others. -# stefan.k.berg@ericsson.com -# jonas.bjurel@ericsson.com -# All rights reserved. This program and the accompanying materials -# are made available under the terms of the Apache License, Version 2.0 -# which accompanies this distribution, and is available at -# http://www.apache.org/licenses/LICENSE-2.0 -############################################################################## - - -error_exit () { - echo "$@" - exit 1 -} - -topdir=$(cd $(dirname $(readlink -f $BASH_SOURCE)); cd ..; pwd) -netdir=$topdir/conf/networks -vmdir=$topdir/conf/vms - -if [ ! -d $netdir ]; then - error_exit "No net directory $netdir" - exit 1 -elif [ ! -d $vmdir ]; then - error_exit "No VM directory $vmdir" - exit 1 -fi - - -if [ "`whoami`" != "root" ]; then - error_exit "You need be root to run this script" -fi - -for vm in $vmdir/* -do - vmname=`basename $vm` - virsh dumpxml $vmname >/dev/null 2>&1 - if [ $? -eq 0 ]; then - diskfile=`virsh dumpxml $vmname | grep "<source file=" | grep raw | \ - sed "s/.*<source file='\(.*\)'.*/\1/"` - echo "Removing $vmname with disk $diskfile" - virsh destroy $vmname 2>/dev/null - virsh undefine $vmname - rm -f $diskfile - fi -done - -for net in $netdir/* -do - netname=`basename $net` - virsh net-dumpxml $netname >/dev/null 2>&1 - if [ $? -eq 0 ]; then - echo "Found net $netname, deleting" - virsh net-destroy $netname - virsh net-undefine $netname - fi -done diff --git a/fuel/prototypes/auto-deploy/examples/libvirt/tools/dump_setup.sh b/fuel/prototypes/auto-deploy/examples/libvirt/tools/dump_setup.sh deleted file mode 100755 index cdd029fc5..000000000 --- a/fuel/prototypes/auto-deploy/examples/libvirt/tools/dump_setup.sh +++ /dev/null @@ -1,68 +0,0 @@ -#!/bin/bash -############################################################################## -# Copyright (c) 2015 Ericsson AB and others. -# stefan.k.berg@ericsson.com -# jonas.bjurel@ericsson.com -# All rights reserved. This program and the accompanying materials -# are made available under the terms of the Apache License, Version 2.0 -# which accompanies this distribution, and is available at -# http://www.apache.org/licenses/LICENSE-2.0 -############################################################################## - -topdir=$(cd $(dirname $(readlink -f $BASH_SOURCE)); cd ..; pwd) -netdir=$topdir/conf/networks -vmdir=$topdir/conf/vms -vms="fuel-master controller1 compute4 compute5" -networks="fuel1 fuel2 fuel3 fuel4" - - -if [ "`whoami`" != "root" ]; then - error_exit "You need be root to run this script" -fi - -mkdir -p $netdir -mkdir -p $vmdir - -if [ `ls -1 $netdir/ | wc -l` -ne 0 ]; then - echo "There are files in $netdir already!" - exit 1 -elif [ `ls -1 $vmdir/ | wc -l` -ne 0 ]; then - echo "There are files in $vmdir already!" - exit 1 -fi - - -# Check that no VM is up -for vm in $vms -do - if [ "`virsh domstate $vm`" == "running" ]; then - echo "Can't dump while VM are up: $vm" - exit 1 - fi -done - -# Dump all networks in the fuell* namespace -for net in $networks -do - virsh net-dumpxml $net > $netdir/$net -done - -# Dump all fuel-master, compute* and controller* VMs -for vm in $vms -do - virsh dumpxml $vm > $vmdir/$vm -done - -# Remove all attached ISOs, generalize disk file -for vm in $vmdir/* -do - sed -i '/.iso/d' $vm - sed -i "s/<source file='.*raw'/<source file='disk.raw'/" $vm -done - -# Generalize all nets -for net in $netdir/* -do - sed -i '/<uuid/d' $net - sed -i '/<mac/d' $net -done diff --git a/fuel/prototypes/auto-deploy/list_fixmes.sh b/fuel/prototypes/auto-deploy/list_fixmes.sh deleted file mode 100755 index 651c478f9..000000000 --- a/fuel/prototypes/auto-deploy/list_fixmes.sh +++ /dev/null @@ -1,19 +0,0 @@ -#!/bin/bash -############################################################################## -# Copyright (c) 2015 Ericsson AB and others. -# stefan.k.berg@ericsson.com -# jonas.bjurel@ericsson.com -# All rights reserved. This program and the accompanying materials -# are made available under the terms of the Apache License, Version 2.0 -# which accompanies this distribution, and is available at -# http://www.apache.org/licenses/LICENSE-2.0 -############################################################################## - -for file in `find . -type f -exec egrep -il "FIXME|TODO" {} \; \ - | grep -v list_fixmes.sh \ - | grep -v TODO.txt` -do - echo "***** Things to fix in $file *****" - egrep -i "FIXME|TODO" $file - echo "" -done |