From 648a6cc2b69cd9c9710736c4f00cb29c2cb53ce7 Mon Sep 17 00:00:00 2001 From: Pranav Salunke Date: Mon, 25 Aug 2014 15:32:27 +0530 Subject: [PATCH] Updates Nova under training labs Updates to nova, fixes some of the issues present in the scripts. Changes the compute package from "nova-compute-kvm" to "nova-compute-qemu". Fixes Bug 1312764 Implements Blueprint: openstack-training-labs Change-Id: Id3a2dc5f06921f803e07ef2dc8c4dbf64ea508be --- labs/scripts/apt_pre-download.sh | 2 +- labs/scripts/setup_nova_compute.sh | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/labs/scripts/apt_pre-download.sh b/labs/scripts/apt_pre-download.sh index 251bde27..639980db 100755 --- a/labs/scripts/apt_pre-download.sh +++ b/labs/scripts/apt_pre-download.sh @@ -19,5 +19,5 @@ sudo apt-get install -y --download-only cinder-api cinder-scheduler lvm2 \ cinder-volume glance openstack-dashboard memcached keystone \ neutron-server neutron-plugin-ml2 nova-api nova-cert nova-conductor \ nova-consoleauth nova-novncproxy nova-scheduler python-novaclient \ - nova-compute-kvm python-guestfs neutron-common \ + nova-compute-qemu libguestfs-tools python-guestfs neutron-common \ neutron-plugin-openvswitch-agent neutron-l3-agent neutron-dhcp-agent diff --git a/labs/scripts/setup_nova_compute.sh b/labs/scripts/setup_nova_compute.sh index 24fbaea0..372208af 100755 --- a/labs/scripts/setup_nova_compute.sh +++ b/labs/scripts/setup_nova_compute.sh @@ -13,7 +13,7 @@ indicate_current_auto #------------------------------------------------------------------------------ echo "Installing nova for compute node." -sudo apt-get install -y nova-compute-kvm python-guestfs +sudo apt-get install -y nova-compute-qemu python-guestfs libguestfs-tools echo "Making the current kernel image world-readable." sudo dpkg-statoverride \ @@ -53,11 +53,11 @@ iniset_sudo $conf DEFAULT rabbit_host controller-mgmt iniset_sudo $conf DEFAULT rabbit_password "$RABBIT_PASSWORD" # Configure other variables -iniset_sudo $conf DEFAULT my_ip controller-mgmt -iniset_sudo $conf DEFAULT vncserver_listen controller-mgmt -iniset_sudo $conf DEFAULT vncserver_proxyclient_address compute-mgmt +iniset_sudo $conf DEFAULT my_ip compute-mgmt +iniset_sudo $conf DEFAULT vncserver_listen 0.0.0.0 iniset_sudo $conf DEFAULT vnc_enabled True iniset_sudo $conf DEFAULT vncserver_proxyclient_address compute-mgmt +iniset_sudo $conf DEFAULT novncproxy_base_url http://"$(hostname_to_ip controller-api)":6080/vnc_auto.html iniset_sudo $conf DEFAULT glance_host controller-mgmt iniset_sudo $conf DEFAULT auth_strategy keystone @@ -72,7 +72,7 @@ iniset_sudo $conf keystone_authtoken admin_password "$nova_admin_password" # Configure nova-comptue.conf conf=/etc/nova/nova-compute.conf -iniset_sudo $conf DEFAULT virt_type qemu +iniset_sudo $conf libvirt virt_type qemu echo "Restarting nova services." sudo service nova-compute restart