From: Jonas Bjurel Date: Wed, 25 Nov 2015 10:32:57 +0000 (+0100) Subject: Restructcture of the directory layout X-Git-Tag: brahmaputra.1.rc1~114 X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=refs%2Fchanges%2F13%2F3613%2F2;p=fuel.git Restructcture of the directory layout Restructure of the directory layout due to move of Fuel into it's own repo JIRA: FUEL-85 Change-Id: I3647e1992a508f29dce06a5d6c790725c527f6f5 Signed-off-by: Jonas Bjurel --- diff --git a/fuel/README b/README similarity index 100% rename from fuel/README rename to README diff --git a/fuel/TODO b/TODO similarity index 100% rename from fuel/TODO rename to TODO diff --git a/fuel/build/Makefile b/build/Makefile similarity index 100% rename from fuel/build/Makefile rename to build/Makefile diff --git a/fuel/build/README b/build/README similarity index 100% rename from fuel/build/README rename to build/README diff --git a/fuel/build/add_opnfv_packages b/build/add_opnfv_packages similarity index 100% rename from fuel/build/add_opnfv_packages rename to build/add_opnfv_packages diff --git a/fuel/build/apply_patches b/build/apply_patches similarity index 100% rename from fuel/build/apply_patches rename to build/apply_patches diff --git a/fuel/build/cache.mk b/build/cache.mk similarity index 100% rename from fuel/build/cache.mk rename to build/cache.mk diff --git a/fuel/build/cache.sh b/build/cache.sh similarity index 100% rename from fuel/build/cache.sh rename to build/cache.sh diff --git a/fuel/build/check_dependencies.sh b/build/check_dependencies.sh similarity index 100% rename from fuel/build/check_dependencies.sh rename to build/check_dependencies.sh diff --git a/fuel/build/config.mk b/build/config.mk similarity index 100% rename from fuel/build/config.mk rename to build/config.mk diff --git a/fuel/build/docker/Dockerfile b/build/docker/Dockerfile similarity index 100% rename from fuel/build/docker/Dockerfile rename to build/docker/Dockerfile diff --git a/fuel/build/docker/Makefile b/build/docker/Makefile similarity index 100% rename from fuel/build/docker/Makefile rename to build/docker/Makefile diff --git a/fuel/build/docker/README b/build/docker/README similarity index 100% rename from fuel/build/docker/README rename to build/docker/README diff --git a/fuel/build/docker/runcontext b/build/docker/runcontext similarity index 100% rename from fuel/build/docker/runcontext rename to build/docker/runcontext diff --git a/fuel/build/docker/ubuntu-builder/enable_dockerx2 b/build/docker/ubuntu-builder/enable_dockerx2 similarity index 100% rename from fuel/build/docker/ubuntu-builder/enable_dockerx2 rename to build/docker/ubuntu-builder/enable_dockerx2 diff --git a/fuel/build/docker/ubuntu-builder/setcontext b/build/docker/ubuntu-builder/setcontext similarity index 100% rename from fuel/build/docker/ubuntu-builder/setcontext rename to build/docker/ubuntu-builder/setcontext diff --git a/fuel/build/f_example_control_bond/Makefile b/build/f_example_control_bond/Makefile similarity index 100% rename from fuel/build/f_example_control_bond/Makefile rename to build/f_example_control_bond/Makefile diff --git a/fuel/build/f_example_control_bond/README b/build/f_example_control_bond/README similarity index 100% rename from fuel/build/f_example_control_bond/README rename to 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 similarity index 100% rename from fuel/build/f_example_control_bond/puppet/modules/opnfv/files/control-bond rename to 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 similarity index 100% rename from fuel/build/f_example_control_bond/puppet/modules/opnfv/manifests/control-bond.pp rename to 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 similarity index 100% rename from fuel/build/f_example_packadd/Makefile rename to build/f_example_packadd/Makefile diff --git a/fuel/build/f_example_packadd/README b/build/f_example_packadd/README similarity index 100% rename from fuel/build/f_example_packadd/README rename to 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 similarity index 100% rename from fuel/build/f_example_packadd/foobar_1.0-1/DEBIAN/conffiles rename to 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 similarity index 100% rename from fuel/build/f_example_packadd/foobar_1.0-1/DEBIAN/control rename to 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 similarity index 100% rename from fuel/build/f_example_packadd/foobar_1.0-1/DEBIAN/postinst rename to 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 similarity index 100% rename from fuel/build/f_example_packadd/foobar_1.0-1/etc/foobar/foobar.conf rename to 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 similarity index 100% rename from fuel/build/f_example_packadd/foobar_1.0-1/usr/bin/foobar rename to 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 similarity index 100% rename from fuel/build/f_example_packadd/foobar_1.0-1/usr/share/doc/foobar/changelog.Debian rename to 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 similarity index 100% rename from fuel/build/f_example_packadd/foobar_1.0-1/usr/share/doc/foobar/copyright rename to 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 similarity index 100% rename from fuel/build/f_example_packadd/puppet/modules/opnfv/manifests/foobar.pp rename to build/f_example_packadd/puppet/modules/opnfv/manifests/foobar.pp diff --git a/fuel/build/f_isoroot/Makefile b/build/f_isoroot/Makefile similarity index 100% rename from fuel/build/f_isoroot/Makefile rename to build/f_isoroot/Makefile diff --git a/fuel/build/f_isoroot/README b/build/f_isoroot/README similarity index 100% rename from fuel/build/f_isoroot/README rename to build/f_isoroot/README diff --git a/fuel/build/f_isoroot/cache.mk b/build/f_isoroot/cache.mk similarity index 100% rename from fuel/build/f_isoroot/cache.mk rename to build/f_isoroot/cache.mk diff --git a/fuel/build/f_isoroot/f_bootstrap/Makefile b/build/f_isoroot/f_bootstrap/Makefile similarity index 100% rename from fuel/build/f_isoroot/f_bootstrap/Makefile rename to build/f_isoroot/f_bootstrap/Makefile diff --git a/fuel/build/f_isoroot/f_bootstrap/README b/build/f_isoroot/f_bootstrap/README similarity index 100% rename from fuel/build/f_isoroot/f_bootstrap/README rename to 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 similarity index 100% rename from fuel/build/f_isoroot/f_bootstrap/bootstrap_admin_node.sh rename to 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 similarity index 100% rename from fuel/build/f_isoroot/f_bootstrap/bootstrap_admin_node.sh.orig rename to 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 similarity index 100% rename from fuel/build/f_isoroot/f_bootstrap/post-scripts/00_post_example.sh rename to 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 similarity index 100% rename from fuel/build/f_isoroot/f_bootstrap/post-scripts/03_install_repo.sh rename to 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 similarity index 100% rename from fuel/build/f_isoroot/f_bootstrap/pre-scripts/00_pre_example.sh rename to 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 similarity index 100% rename from fuel/build/f_isoroot/f_kscfg/Makefile rename to build/f_isoroot/f_kscfg/Makefile diff --git a/fuel/build/f_isoroot/f_kscfg/README b/build/f_isoroot/f_kscfg/README similarity index 100% rename from fuel/build/f_isoroot/f_kscfg/README rename to 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 similarity index 100% rename from fuel/build/f_isoroot/f_kscfg/ks.cfg rename to 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 similarity index 100% rename from fuel/build/f_isoroot/f_kscfg/ks.cfg.orig rename to 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 similarity index 100% rename from fuel/build/f_isoroot/f_odlpluginbuild/Makefile rename to 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 similarity index 100% rename from fuel/build/f_isoroot/f_odlpluginbuild/config/opendaylight_config.yaml rename to 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 similarity index 100% rename from fuel/build/f_isoroot/f_repobuild/Makefile rename to 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 similarity index 100% rename from fuel/build/f_isoroot/f_repobuild/select_ubuntu_repo.sh rename to build/f_isoroot/f_repobuild/select_ubuntu_repo.sh diff --git a/fuel/build/fuel-main_5.patch b/build/fuel-main_5.patch similarity index 100% rename from fuel/build/fuel-main_5.patch rename to build/fuel-main_5.patch diff --git a/fuel/build/fuel-main_6.patch b/build/fuel-main_6.patch similarity index 100% rename from fuel/build/fuel-main_6.patch rename to build/fuel-main_6.patch diff --git a/fuel/build/install/apt-ftparchive-deb.conf b/build/install/apt-ftparchive-deb.conf similarity index 100% rename from fuel/build/install/apt-ftparchive-deb.conf rename to build/install/apt-ftparchive-deb.conf diff --git a/fuel/build/install/apt-ftparchive-release.conf b/build/install/apt-ftparchive-release.conf similarity index 100% rename from fuel/build/install/apt-ftparchive-release.conf rename to build/install/apt-ftparchive-release.conf diff --git a/fuel/build/install/apt-ftparchive-udeb.conf b/build/install/apt-ftparchive-udeb.conf similarity index 100% rename from fuel/build/install/apt-ftparchive-udeb.conf rename to build/install/apt-ftparchive-udeb.conf diff --git a/fuel/build/install/install.sh b/build/install/install.sh similarity index 100% rename from fuel/build/install/install.sh rename to build/install/install.sh diff --git a/fuel/build/install/uninstall.sh b/build/install/uninstall.sh similarity index 100% rename from fuel/build/install/uninstall.sh rename to build/install/uninstall.sh diff --git a/fuel/build/patch-packages/Makefile b/build/patch-packages/Makefile similarity index 100% rename from fuel/build/patch-packages/Makefile rename to build/patch-packages/Makefile diff --git a/fuel/build/patch-packages/tools/correct_deps b/build/patch-packages/tools/correct_deps similarity index 100% rename from fuel/build/patch-packages/tools/correct_deps rename to build/patch-packages/tools/correct_deps diff --git a/fuel/build/patch-packages/tools/deb_pack b/build/patch-packages/tools/deb_pack similarity index 100% rename from fuel/build/patch-packages/tools/deb_pack rename to build/patch-packages/tools/deb_pack diff --git a/fuel/build/patch-packages/tools/deb_unpack b/build/patch-packages/tools/deb_unpack similarity index 100% rename from fuel/build/patch-packages/tools/deb_unpack rename to build/patch-packages/tools/deb_unpack diff --git a/fuel/build/patch-packages/tools/udeb_pack b/build/patch-packages/tools/udeb_pack similarity index 100% rename from fuel/build/patch-packages/tools/udeb_pack rename to build/patch-packages/tools/udeb_pack diff --git a/fuel/build/patch-packages/tools/udeb_unpack b/build/patch-packages/tools/udeb_unpack similarity index 100% rename from fuel/build/patch-packages/tools/udeb_unpack rename to build/patch-packages/tools/udeb_unpack diff --git a/fuel/build/patch-packages/tr_example/Makefile b/build/patch-packages/tr_example/Makefile similarity index 100% rename from fuel/build/patch-packages/tr_example/Makefile rename to build/patch-packages/tr_example/Makefile diff --git a/fuel/build/repo_info.sh b/build/repo_info.sh similarity index 100% rename from fuel/build/repo_info.sh rename to build/repo_info.sh diff --git a/fuel/ci/README b/ci/README similarity index 100% rename from fuel/ci/README rename to ci/README diff --git a/fuel/ci/build.sh b/ci/build.sh similarity index 100% rename from fuel/ci/build.sh rename to ci/build.sh diff --git a/fuel/ci/deploy.sh b/ci/deploy.sh similarity index 100% rename from fuel/ci/deploy.sh rename to ci/deploy.sh diff --git a/fuel/deploy/README b/deploy/README similarity index 100% rename from fuel/deploy/README rename to deploy/README diff --git a/fuel/deploy/__init__.py b/deploy/__init__.py similarity index 100% rename from fuel/deploy/__init__.py rename to deploy/__init__.py diff --git a/fuel/deploy/cloud/configure_environment.py b/deploy/cloud/configure_environment.py similarity index 100% rename from fuel/deploy/cloud/configure_environment.py rename to deploy/cloud/configure_environment.py diff --git a/fuel/deploy/cloud/configure_network.py b/deploy/cloud/configure_network.py similarity index 100% rename from fuel/deploy/cloud/configure_network.py rename to deploy/cloud/configure_network.py diff --git a/fuel/deploy/cloud/configure_nodes.py b/deploy/cloud/configure_nodes.py similarity index 100% rename from fuel/deploy/cloud/configure_nodes.py rename to deploy/cloud/configure_nodes.py diff --git a/fuel/deploy/cloud/configure_settings.py b/deploy/cloud/configure_settings.py similarity index 100% rename from fuel/deploy/cloud/configure_settings.py rename to deploy/cloud/configure_settings.py diff --git a/fuel/deploy/cloud/deploy.py b/deploy/cloud/deploy.py similarity index 100% rename from fuel/deploy/cloud/deploy.py rename to deploy/cloud/deploy.py diff --git a/fuel/deploy/cloud/deployment.py b/deploy/cloud/deployment.py similarity index 100% rename from fuel/deploy/cloud/deployment.py rename to deploy/cloud/deployment.py diff --git a/fuel/deploy/common.py b/deploy/common.py similarity index 100% rename from fuel/deploy/common.py rename to deploy/common.py diff --git a/fuel/deploy/dea.py b/deploy/dea.py similarity index 100% rename from fuel/deploy/dea.py rename to deploy/dea.py diff --git a/fuel/deploy/deploy.py b/deploy/deploy.py similarity index 100% rename from fuel/deploy/deploy.py rename to deploy/deploy.py diff --git a/fuel/deploy/deploy_env.py b/deploy/deploy_env.py similarity index 100% rename from fuel/deploy/deploy_env.py rename to deploy/deploy_env.py diff --git a/fuel/deploy/dha.py b/deploy/dha.py similarity index 100% rename from fuel/deploy/dha.py rename to deploy/dha.py diff --git a/fuel/deploy/dha_adapters/__init__.py b/deploy/dha_adapters/__init__.py similarity index 100% rename from fuel/deploy/dha_adapters/__init__.py rename to deploy/dha_adapters/__init__.py diff --git a/fuel/deploy/dha_adapters/amt_adapter.py b/deploy/dha_adapters/amt_adapter.py similarity index 100% rename from fuel/deploy/dha_adapters/amt_adapter.py rename to deploy/dha_adapters/amt_adapter.py diff --git a/fuel/deploy/dha_adapters/hardware_adapter.py b/deploy/dha_adapters/hardware_adapter.py similarity index 100% rename from fuel/deploy/dha_adapters/hardware_adapter.py rename to deploy/dha_adapters/hardware_adapter.py diff --git a/fuel/deploy/dha_adapters/hp_adapter.py b/deploy/dha_adapters/hp_adapter.py similarity index 100% rename from fuel/deploy/dha_adapters/hp_adapter.py rename to deploy/dha_adapters/hp_adapter.py diff --git a/fuel/deploy/dha_adapters/ipmi_adapter.py b/deploy/dha_adapters/ipmi_adapter.py similarity index 100% rename from fuel/deploy/dha_adapters/ipmi_adapter.py rename to deploy/dha_adapters/ipmi_adapter.py diff --git a/fuel/deploy/dha_adapters/libvirt_adapter.py b/deploy/dha_adapters/libvirt_adapter.py similarity index 100% rename from fuel/deploy/dha_adapters/libvirt_adapter.py rename to deploy/dha_adapters/libvirt_adapter.py diff --git a/fuel/deploy/environments/__init__.py b/deploy/environments/__init__.py similarity index 100% rename from fuel/deploy/environments/__init__.py rename to deploy/environments/__init__.py diff --git a/fuel/deploy/environments/execution_environment.py b/deploy/environments/execution_environment.py similarity index 100% rename from fuel/deploy/environments/execution_environment.py rename to deploy/environments/execution_environment.py diff --git a/fuel/deploy/environments/libvirt_environment.py b/deploy/environments/libvirt_environment.py similarity index 100% rename from fuel/deploy/environments/libvirt_environment.py rename to deploy/environments/libvirt_environment.py diff --git a/fuel/deploy/environments/virtual_fuel.py b/deploy/environments/virtual_fuel.py similarity index 100% rename from fuel/deploy/environments/virtual_fuel.py rename to deploy/environments/virtual_fuel.py diff --git a/fuel/deploy/execution_environment.py b/deploy/execution_environment.py similarity index 100% rename from fuel/deploy/execution_environment.py rename to deploy/execution_environment.py diff --git a/fuel/deploy/fuel_patch/ks.cfg.patch b/deploy/fuel_patch/ks.cfg.patch similarity index 100% rename from fuel/deploy/fuel_patch/ks.cfg.patch rename to deploy/fuel_patch/ks.cfg.patch diff --git a/fuel/deploy/install_fuel_master.py b/deploy/install_fuel_master.py similarity index 100% rename from fuel/deploy/install_fuel_master.py rename to deploy/install_fuel_master.py diff --git a/fuel/deploy/reap.py b/deploy/reap.py similarity index 100% rename from fuel/deploy/reap.py rename to deploy/reap.py diff --git a/fuel/deploy/ssh_client.py b/deploy/ssh_client.py similarity index 100% rename from fuel/deploy/ssh_client.py rename to 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 similarity index 100% rename from fuel/deploy/templates/hardware_environment/conf/ericsson_montreal_lab/dea.yaml rename to 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 similarity index 100% rename from fuel/deploy/templates/hardware_environment/conf/ericsson_montreal_lab/dha.yaml rename to 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 similarity index 100% rename from fuel/deploy/templates/hardware_environment/conf/ericsson_montreal_lab/plugins_conf/.gitkeep rename to 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 similarity index 100% rename from fuel/deploy/templates/hardware_environment/conf/linux_foundation_lab/pod1/dea.yaml rename to 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 similarity index 100% rename from fuel/deploy/templates/hardware_environment/conf/linux_foundation_lab/pod1/dha.yaml rename to 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 similarity index 100% rename from fuel/deploy/templates/hardware_environment/conf/linux_foundation_lab/pod1/plugins_conf/.gitkeep rename to 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 similarity index 100% rename from fuel/deploy/templates/hardware_environment/conf/linux_foundation_lab/pod2/dea.yaml rename to 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 similarity index 100% rename from fuel/deploy/templates/hardware_environment/conf/linux_foundation_lab/pod2/dha.yaml rename to 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 similarity index 100% rename from fuel/deploy/templates/hardware_environment/conf/linux_foundation_lab/pod2/plugins_conf/.gitkeep rename to 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 similarity index 100% rename from fuel/deploy/templates/hardware_environment/conf/opnfv_box/dea.yaml rename to 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 similarity index 100% rename from fuel/deploy/templates/hardware_environment/conf/opnfv_box/dha.yaml rename to 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 similarity index 100% rename from fuel/deploy/templates/hardware_environment/conf/opnfv_box/plugins_conf/.gitkeep rename to 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 similarity index 100% rename from fuel/deploy/templates/hardware_environment/vms/fuel.xml rename to deploy/templates/hardware_environment/vms/fuel.xml diff --git a/fuel/deploy/templates/plugins/.gitkeep b/deploy/templates/plugins/.gitkeep similarity index 100% rename from fuel/deploy/templates/plugins/.gitkeep rename to deploy/templates/plugins/.gitkeep diff --git a/fuel/deploy/templates/virtual_environment/conf/dea.yaml b/deploy/templates/virtual_environment/conf/dea.yaml similarity index 100% rename from fuel/deploy/templates/virtual_environment/conf/dea.yaml rename to 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 similarity index 100% rename from fuel/deploy/templates/virtual_environment/conf/dha.yaml rename to 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 similarity index 100% rename from fuel/deploy/templates/virtual_environment/conf/plugins_conf/.gitkeep rename to 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 similarity index 100% rename from fuel/deploy/templates/virtual_environment/networks/fuel1.xml rename to 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 similarity index 100% rename from fuel/deploy/templates/virtual_environment/networks/fuel2.xml rename to 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 similarity index 100% rename from fuel/deploy/templates/virtual_environment/networks/fuel3.xml rename to 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 similarity index 100% rename from fuel/deploy/templates/virtual_environment/networks/fuel4.xml rename to 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 similarity index 100% rename from fuel/deploy/templates/virtual_environment/vms/compute.xml rename to 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 similarity index 100% rename from fuel/deploy/templates/virtual_environment/vms/controller.xml rename to 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 similarity index 100% rename from fuel/deploy/templates/virtual_environment/vms/fuel.xml rename to deploy/templates/virtual_environment/vms/fuel.xml diff --git a/fuel/deploy/transplant_fuel_settings.py b/deploy/transplant_fuel_settings.py similarity index 100% rename from fuel/deploy/transplant_fuel_settings.py rename to deploy/transplant_fuel_settings.py diff --git a/fuel/docs/.DS_Store b/docs/.DS_Store similarity index 100% rename from fuel/docs/.DS_Store rename to docs/.DS_Store diff --git a/fuel/docs/src/build-instructions.rst b/docs/src/build-instructions.rst similarity index 100% rename from fuel/docs/src/build-instructions.rst rename to docs/src/build-instructions.rst diff --git a/fuel/docs/src/installation-instructions.rst b/docs/src/installation-instructions.rst similarity index 100% rename from fuel/docs/src/installation-instructions.rst rename to docs/src/installation-instructions.rst diff --git a/fuel/docs/src/release-notes.rst b/docs/src/release-notes.rst similarity index 100% rename from fuel/docs/src/release-notes.rst rename to docs/src/release-notes.rst diff --git a/fuel/.DS_Store b/fuel/.DS_Store deleted file mode 100644 index b1bc858e9..000000000 Binary files a/fuel/.DS_Store and /dev/null differ 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 @@ - - fuel-opnfv - de9d18ee-afc3-4b5a-8ede-3a007ffb3c2f - 4194304 - 4194304 - 4 - - /machine - - - hvm - - - - - - - - - - - SandyBridge - - - - - - - destroy - restart - restart - - - - - - /usr/libexec/qemu-kvm - - - - - - -
- - - - - - - - -
- - - -
- - - - -
- - - - -
- - - - -
- - - - - - -
- - - -
- - - - - - - -
- - - - - - - - - - - - - - -
- - - - - - - - -
- -