Reorder nova_controller to match Juno
Reorder nova_controller to match the Juno install-guide. No functional changes. Change-Id: Ie5c25515bd3ddb22ee98db4bc930b242355ace29
This commit is contained in:
Roger Luethi
@@ -4,58 +4,20 @@ TOP_DIR=$(cd $(dirname "$0")/.. && pwd)
|
||||
source "$TOP_DIR/config/paths"
|
||||
source "$CONFIG_DIR/credentials"
|
||||
source "$LIB_DIR/functions.guest"
|
||||
source "$CONFIG_DIR/admin-openstackrc.sh"
|
||||
exec_logfile
|
||||
|
||||
indicate_current_auto
|
||||
|
||||
#------------------------------------------------------------------------------------------
|
||||
#------------------------------------------------------------------------------
|
||||
# Install Compute controller services
|
||||
# http://docs.openstack.org/icehouse/install-guide/install/apt/content/nova-controller.html
|
||||
#------------------------------------------------------------------------------------------
|
||||
|
||||
echo "Installing nova for controller node."
|
||||
sudo apt-get install -y nova-api nova-cert nova-conductor nova-consoleauth \
|
||||
nova-novncproxy nova-scheduler python-novaclient
|
||||
|
||||
function get_database_url {
|
||||
local db_user=$(service_to_db_user nova)
|
||||
local db_password=$(service_to_db_password nova)
|
||||
local database_host=controller-mgmt
|
||||
|
||||
echo "mysql://$db_user:$db_password@$database_host/nova"
|
||||
}
|
||||
|
||||
database_url=$(get_database_url)
|
||||
|
||||
echo "Configuring [database] section in /etc/nova/nova.conf for controller node."
|
||||
|
||||
echo "Setting database connection: $database_url."
|
||||
iniset_sudo /etc/nova/nova.conf database connection "$database_url"
|
||||
|
||||
echo "Configuring [DEFAULT] section in /etc/nova/nova.conf for controller node."
|
||||
conf=/etc/nova/nova.conf
|
||||
|
||||
# Configuring [DEFAULT] section
|
||||
|
||||
# Configure RabbitMQ variables
|
||||
iniset_sudo $conf DEFAULT rpc_backend rabbit
|
||||
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 "$(hostname_to_ip controller-mgmt)"
|
||||
iniset_sudo $conf DEFAULT vncserver_listen controller-mgmt
|
||||
iniset_sudo $conf DEFAULT vncserver_proxyclient_address controller-mgmt
|
||||
|
||||
# Remove SQLite database created by Ubuntu package for nova.
|
||||
sudo rm -v /var/lib/nova/nova.sqlite
|
||||
# http://docs.openstack.org/juno/install-guide/install/apt/content/ch_nova.html#nova-controller-install
|
||||
#------------------------------------------------------------------------------
|
||||
|
||||
echo "Setting up database for nova."
|
||||
setup_database nova
|
||||
|
||||
echo "Creating the database tables for nova."
|
||||
sudo nova-manage db sync
|
||||
echo "Sourcing the admin credentials."
|
||||
source "$CONFIG_DIR/admin-openstackrc.sh"
|
||||
|
||||
nova_admin_user=$(service_to_user_name nova)
|
||||
nova_admin_password=$(service_to_user_password nova)
|
||||
@@ -71,21 +33,6 @@ keystone user-role-add \
|
||||
--tenant "$SERVICE_TENANT_NAME" \
|
||||
--role "$ADMIN_ROLE_NAME"
|
||||
|
||||
echo "Configuring nova to use keystone for authentication."
|
||||
|
||||
# Configuring the [DEFAULT] section
|
||||
iniset_sudo $conf DEFAULT auth_strategy keystone
|
||||
|
||||
# Configure [keystone_authtoken] section
|
||||
iniset_sudo $conf keystone_authtoken auth_uri http://controller-mgmt:5000
|
||||
iniset_sudo $conf keystone_authtoken auth_host controller-mgmt
|
||||
iniset_sudo $conf keystone_authtoken auth_port 35357
|
||||
iniset_sudo $conf keystone_authtoken auth_protocol http
|
||||
iniset_sudo $conf keystone_authtoken admin_tenant_name "$SERVICE_TENANT_NAME"
|
||||
iniset_sudo $conf keystone_authtoken admin_user "$nova_admin_user"
|
||||
iniset_sudo $conf keystone_authtoken admin_password "$nova_admin_password"
|
||||
|
||||
|
||||
echo "Registering nova with keystone so that other services can locate it."
|
||||
keystone service-create \
|
||||
--name nova \
|
||||
@@ -96,8 +43,50 @@ nova_service_id=$(keystone service-list | awk '/ compute / {print $2}')
|
||||
keystone endpoint-create \
|
||||
--service-id "$nova_service_id" \
|
||||
--publicurl 'http://controller-api:8774/v2/%(tenant_id)s' \
|
||||
--adminurl 'http://controller-mgmt:8774/v2/%(tenant_id)s' \
|
||||
--internalurl 'http://controller-mgmt:8774/v2/%(tenant_id)s'
|
||||
--internalurl 'http://controller-mgmt:8774/v2/%(tenant_id)s' \
|
||||
--adminurl 'http://controller-mgmt:8774/v2/%(tenant_id)s'
|
||||
|
||||
echo "Installing nova for controller node."
|
||||
sudo apt-get install -y nova-api nova-cert nova-conductor nova-consoleauth \
|
||||
nova-novncproxy nova-scheduler python-novaclient
|
||||
|
||||
function get_database_url {
|
||||
local db_user=$(service_to_db_user nova)
|
||||
local db_password=$(service_to_db_password nova)
|
||||
local database_host=controller-mgmt
|
||||
|
||||
echo "mysql://$db_user:$db_password@$database_host/nova"
|
||||
}
|
||||
|
||||
database_url=$(get_database_url)
|
||||
|
||||
conf=/etc/nova/nova.conf
|
||||
|
||||
echo "Setting database connection: $database_url."
|
||||
iniset_sudo $conf database connection "$database_url"
|
||||
|
||||
echo "Configuring [DEFAULT] section in /etc/nova/nova.conf for controller node."
|
||||
|
||||
iniset_sudo $conf DEFAULT rpc_backend rabbit
|
||||
iniset_sudo $conf DEFAULT rabbit_host controller-mgmt
|
||||
iniset_sudo $conf DEFAULT rabbit_password "$RABBIT_PASSWORD"
|
||||
|
||||
iniset_sudo $conf DEFAULT auth_strategy keystone
|
||||
|
||||
iniset_sudo $conf keystone_authtoken auth_uri http://controller-mgmt:5000
|
||||
iniset_sudo $conf keystone_authtoken auth_host controller-mgmt
|
||||
iniset_sudo $conf keystone_authtoken auth_port 35357
|
||||
iniset_sudo $conf keystone_authtoken auth_protocol http
|
||||
iniset_sudo $conf keystone_authtoken admin_tenant_name "$SERVICE_TENANT_NAME"
|
||||
iniset_sudo $conf keystone_authtoken admin_user "$nova_admin_user"
|
||||
iniset_sudo $conf keystone_authtoken admin_password "$nova_admin_password"
|
||||
|
||||
iniset_sudo $conf DEFAULT my_ip "$(hostname_to_ip controller-mgmt)"
|
||||
iniset_sudo $conf DEFAULT vncserver_listen controller-mgmt
|
||||
iniset_sudo $conf DEFAULT vncserver_proxyclient_address controller-mgmt
|
||||
|
||||
echo "Creating the database tables for nova."
|
||||
sudo nova-manage db sync
|
||||
|
||||
echo "Restarting nova services."
|
||||
declare -a components=(nova-api nova-cert nova-consoleauth nova-scheduler
|
||||
@@ -107,12 +96,13 @@ for component in "${components[@]}"; do
|
||||
sudo service "$component" restart
|
||||
done
|
||||
|
||||
# Remove SQLite database created by Ubuntu package for nova.
|
||||
sudo rm -v /var/lib/nova/nova.sqlite
|
||||
|
||||
#------------------------------------------------------------------------------
|
||||
# Verify the Compute controller installation
|
||||
#------------------------------------------------------------------------------
|
||||
|
||||
echo "Verifying nova output."
|
||||
|
||||
echo "Verify nova service status."
|
||||
# This call needs root privileges for read access to /etc/nova/nova.conf.
|
||||
echo "sudo nova-manage service list"
|
||||
|
||||
Reference in New Issue
Block a user