From f4bd16ac84904eb3afc0eca283b63a1a6efd2c5a Mon Sep 17 00:00:00 2001 From: Dean Troyer Date: Mon, 23 Sep 2013 14:07:31 -0500 Subject: [PATCH] fake hypervisor plugin Convert fake hypervisor configuration in Nova to the new plugin setup. Change-Id: I8b1404ee97a2a65f0884efae642b98bb134cb2aa --- lib/nova_plugins/hypervisor-fake | 77 ++++++++++++++++++++++++++++++++ stack.sh | 20 --------- 2 files changed, 77 insertions(+), 20 deletions(-) create mode 100644 lib/nova_plugins/hypervisor-fake diff --git a/lib/nova_plugins/hypervisor-fake b/lib/nova_plugins/hypervisor-fake new file mode 100644 index 0000000000..fe0d1900ee --- /dev/null +++ b/lib/nova_plugins/hypervisor-fake @@ -0,0 +1,77 @@ +# lib/nova_plugins/hypervisor-fake +# Configure the fake hypervisor + +# Enable with: +# VIRT_DRIVER=fake + +# Dependencies: +# ``functions`` file +# ``nova`` configuration + +# install_nova_hypervisor - install any external requirements +# configure_nova_hypervisor - make configuration changes, including those to other services +# start_nova_hypervisor - start any external services +# stop_nova_hypervisor - stop any external services +# cleanup_nova_hypervisor - remove transient data and cache + +# Save trace setting +MY_XTRACE=$(set +o | grep xtrace) +set +o xtrace + + +# Defaults +# -------- + + +# Entry Points +# ------------ + +# clean_nova_hypervisor - Clean up an installation +function cleanup_nova_hypervisor() { + # This function intentionally left blank + : +} + +# configure_nova_hypervisor - Set config files, create data dirs, etc +function configure_nova_hypervisor() { + iniset $NOVA_CONF DEFAULT compute_driver "nova.virt.fake.FakeDriver" + # Disable arbitrary limits + iniset $NOVA_CONF DEFAULT quota_instances -1 + iniset $NOVA_CONF DEFAULT quota_cores -1 + iniset $NOVA_CONF DEFAULT quota_ram -1 + iniset $NOVA_CONF DEFAULT quota_floating_ips -1 + iniset $NOVA_CONF DEFAULT quota_fixed_ips -1 + iniset $NOVA_CONF DEFAULT quota_metadata_items -1 + iniset $NOVA_CONF DEFAULT quota_injected_files -1 + iniset $NOVA_CONF DEFAULT quota_injected_file_path_bytes -1 + iniset $NOVA_CONF DEFAULT quota_security_groups -1 + iniset $NOVA_CONF DEFAULT quota_security_group_rules -1 + iniset $NOVA_CONF DEFAULT quota_key_pairs -1 + iniset $NOVA_CONF DEFAULT scheduler_default_filters "RetryFilter,AvailabilityZoneFilter,ComputeFilter,ComputeCapabilitiesFilter,ImagePropertiesFilter" +} + +# install_nova_hypervisor() - Install external components +function install_nova_hypervisor() { + # This function intentionally left blank + : +} + +# start_nova_hypervisor - Start any required external services +function start_nova_hypervisor() { + # This function intentionally left blank + : +} + +# stop_nova_hypervisor - Stop any external services +function stop_nova_hypervisor() { + # This function intentionally left blank + : +} + + +# Restore xtrace +$MY_XTRACE + +# Local variables: +# mode: shell-script +# End: diff --git a/stack.sh b/stack.sh index 71e7317ee3..6bab2183d6 100755 --- a/stack.sh +++ b/stack.sh @@ -1104,26 +1104,6 @@ if is_service_enabled nova; then iniset $NOVA_CONF vmware integration_bridge $OVS_BRIDGE fi - # fake - # ---- - - elif [ "$VIRT_DRIVER" = 'fake' ]; then - echo_summary "Using fake Virt driver" - iniset $NOVA_CONF DEFAULT compute_driver "nova.virt.fake.FakeDriver" - # Disable arbitrary limits - iniset $NOVA_CONF DEFAULT quota_instances -1 - iniset $NOVA_CONF DEFAULT quota_cores -1 - iniset $NOVA_CONF DEFAULT quota_ram -1 - iniset $NOVA_CONF DEFAULT quota_floating_ips -1 - iniset $NOVA_CONF DEFAULT quota_fixed_ips -1 - iniset $NOVA_CONF DEFAULT quota_metadata_items -1 - iniset $NOVA_CONF DEFAULT quota_injected_files -1 - iniset $NOVA_CONF DEFAULT quota_injected_file_path_bytes -1 - iniset $NOVA_CONF DEFAULT quota_security_groups -1 - iniset $NOVA_CONF DEFAULT quota_security_group_rules -1 - iniset $NOVA_CONF DEFAULT quota_key_pairs -1 - iniset $NOVA_CONF DEFAULT scheduler_default_filters "RetryFilter,AvailabilityZoneFilter,ComputeFilter,ComputeCapabilitiesFilter,ImagePropertiesFilter" - # Default libvirt # ---------------