From 269d59d62b3f9fb9ce64801ab4a2fddcf0c6c215 Mon Sep 17 00:00:00 2001 From: Roger Luethi Date: Thu, 14 Aug 2014 10:51:56 +0200 Subject: [PATCH] labs: quotation marks around variables It is generally a good idea to keep variables within quotation marks, even if we don't expect the value to ever contain whitespace. Also, it makes automated test tools (shellcheck) happy. Change-Id: I1c323a1dd10087694312892eac3c11cf54e07ce4 --- labs/scripts/setup_neutron_controller.sh | 8 ++++---- labs/scripts/setup_neutron_network.sh | 2 +- labs/scripts/setup_nova_controller.sh | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/labs/scripts/setup_neutron_controller.sh b/labs/scripts/setup_neutron_controller.sh index 9c6023e8..285c33e4 100755 --- a/labs/scripts/setup_neutron_controller.sh +++ b/labs/scripts/setup_neutron_controller.sh @@ -61,15 +61,15 @@ iniset_sudo $conf DEFAULT auth_strategy keystone # Configure AMQP parameters iniset_sudo $conf DEFAULT rpc_backend neutron.openstack.common.rpc.impl_kombu iniset_sudo $conf DEFAULT rabbit_host controller-mgmt -iniset_sudo $conf DEFAULT rabbit_password $RABBIT_PASSWORD +iniset_sudo $conf DEFAULT rabbit_password "$RABBIT_PASSWORD" iniset_sudo $conf DEFAULT notify_nova_on_port_status_changes True iniset_sudo $conf DEFAULT notify_nova_on_port_data_changes True # Configure nova related parameters iniset_sudo $conf DEFAULT nova_url http://controller-mgmt:8774/v2 -iniset_sudo $conf DEFAULT nova_admin_username $nova_admin_user -iniset_sudo $conf DEFAULT nova_admin_tenant_id $service_tenant_id -iniset_sudo $conf DEFAULT nova_admin_password $nova_admin_password +iniset_sudo $conf DEFAULT nova_admin_username "$nova_admin_user" +iniset_sudo $conf DEFAULT nova_admin_tenant_id "$service_tenant_id" +iniset_sudo $conf DEFAULT nova_admin_password "$nova_admin_password" iniset_sudo $conf DEFAULT nova_admin_auth_url http://controller-mgmt:35357/v2.0 # Configure network plugin parameters diff --git a/labs/scripts/setup_neutron_network.sh b/labs/scripts/setup_neutron_network.sh index 4c4251fd..513bb4db 100755 --- a/labs/scripts/setup_neutron_network.sh +++ b/labs/scripts/setup_neutron_network.sh @@ -38,7 +38,7 @@ iniset_sudo $conf DEFAULT verbose True # Configure AMQP parameters iniset_sudo $conf DEFAULT rpc_backend neutron.openstack.common.rpc.impl_kombu iniset_sudo $conf DEFAULT rabbit_host controller-mgmt -iniset_sudo $conf DEFAULT rabbit_password $RABBIT_PASSWORD +iniset_sudo $conf DEFAULT rabbit_password "$RABBIT_PASSWORD" # Configure network plugin parameters iniset_sudo $conf DEFAULT core_plugin ml2 diff --git a/labs/scripts/setup_nova_controller.sh b/labs/scripts/setup_nova_controller.sh index a6aab2c3..234d9a0d 100755 --- a/labs/scripts/setup_nova_controller.sh +++ b/labs/scripts/setup_nova_controller.sh @@ -59,7 +59,7 @@ conf=/etc/nova/nova.conf # 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 +iniset_sudo $conf DEFAULT rabbit_password "$RABBIT_PASSWORD" # Configure other variables iniset_sudo $conf DEFAULT my_ip controller-mgmt