openstack/training-labs
Code Issues Proposed changes

Rename bash libraries for tox+bashate

Browse Source 
This patch renames a few libraries whose names don't match *.sh. This
allows tox to easily find all bash libraries and check them with
bashate.

Change-Id: Icf231dacc3fa78d20f1b48a4befb917a1d15dd3d
This commit is contained in:
Roger Luethi
2015-11-12 07:28:05 +01:00
committed by Pranav Salunke
parent 051565759a
commit 8c066e031f
41 changed files with 37 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

0
labs/osbash/lib/functions.guest → labs/osbash/lib/functions.guest.sh
View File

0
labs/osbash/lib/osbash/lib.fedora-20-x86_64 → labs/osbash/lib/osbash/lib.fedora-20-x86_64.sh
View File

0
labs/osbash/lib/osbash/lib.ubuntu-12.04.4-server-amd64 → labs/osbash/lib/osbash/lib.ubuntu-12.04.4-server-amd64.sh
View File

0
labs/osbash/lib/osbash/lib.ubuntu-14.04-server-amd64 → labs/osbash/lib/osbash/lib.ubuntu-14.04-server-amd64.sh
View File

2
labs/osbash/osbash.sh
View File

@@ -16,7 +16,7 @@ source "$TOP_DIR/config/paths"
source "$CONFIG_DIR/openstack"
source "$CONFIG_DIR/deploy.osbash"
source "$CONFIG_DIR/provider.$PROVIDER"
source "$OSBASH_LIB_DIR/lib.$DISTRO"
source "$OSBASH_LIB_DIR/lib.$DISTRO.sh"
source "$OSBASH_LIB_DIR/functions-host.sh"
source "$OSBASH_LIB_DIR/$PROVIDER-functions.sh"
source "$OSBASH_LIB_DIR/$PROVIDER-install_base.sh"

2
labs/osbash/scripts/config_external_network.sh
View File

@@ -3,7 +3,7 @@ set -o errexit -o nounset
TOP_DIR=$(cd "$(dirname "$0")/.." && pwd)
source "$TOP_DIR/config/paths"
source "$CONFIG_DIR/credentials"
source "$LIB_DIR/functions.guest"
source "$LIB_DIR/functions.guest.sh"
exec_logfile
indicate_current_auto

2
labs/osbash/scripts/config_tenant_network.sh
View File

@@ -3,7 +3,7 @@ set -o errexit -o nounset
TOP_DIR=$(cd "$(dirname "$0")/.." && pwd)
source "$TOP_DIR/config/paths"
source "$CONFIG_DIR/credentials"
source "$LIB_DIR/functions.guest"
source "$LIB_DIR/functions.guest.sh"
exec_logfile
indicate_current_auto

2
labs/osbash/scripts/etc_hosts.sh
View File

@@ -2,7 +2,7 @@
set -o errexit -o nounset
TOP_DIR=$(cd "$(dirname "$0")/.." && pwd)
source "$TOP_DIR/config/paths"
source "$LIB_DIR/functions.guest"
source "$LIB_DIR/functions.guest.sh"
indicate_current_auto

2
labs/osbash/scripts/osbash/activate_autostart.sh
View File

@@ -11,7 +11,7 @@ TOP_DIR=$(cd "$(dirname "$0")/.." && pwd)
source "$TOP_DIR/config/paths"
# source_deploy doesn't work here
source "$CONFIG_DIR/deploy.osbash"
source "$LIB_DIR/functions.guest"
source "$LIB_DIR/functions.guest.sh"
readonly RCAUTOSTART=osbashauto

2
labs/osbash/scripts/osbash/base_fixups.sh
View File

@@ -2,7 +2,7 @@
set -o errexit -o nounset
TOP_DIR=$(cd "$(dirname "$0")/.." && pwd)
source "$TOP_DIR/config/paths"
source "$LIB_DIR/functions.guest"
source "$LIB_DIR/functions.guest.sh"
indicate_current_auto

2
labs/osbash/scripts/osbash/enable_osbash_ssh_keys.sh
View File

@@ -6,7 +6,7 @@ set -o errexit -o nounset
TOP_DIR=$(cd "$(dirname "$0")/.." && pwd)
source "$TOP_DIR/config/paths"
source "$LIB_DIR/functions.guest"
source "$LIB_DIR/functions.guest.sh"
indicate_current_auto

2
labs/osbash/scripts/osbash/init_xxx_node.sh
View File

@@ -7,7 +7,7 @@ set -o errexit -o nounset
TOP_DIR=$(cd "$(dirname "$0")/.." && pwd)
source "$TOP_DIR/config/paths"
source "$CONFIG_DIR/credentials"
source "$LIB_DIR/functions.guest"
source "$LIB_DIR/functions.guest.sh"
# Determine hostname from script name
re=".*init_(.*)_node.sh$"

2
labs/osbash/scripts/osbash/template-osbashauto
View File

@@ -25,7 +25,7 @@ mkdir -p $STATUS_DIR
TOP_DIR=/$SHARE_NAME
source "$TOP_DIR/config/paths"
source "$LIB_DIR/functions.guest"
source "$LIB_DIR/functions.guest.sh"
exec_logpath "$LOG_DIR/%RCAUTOSTART%.log"

2
labs/osbash/scripts/osbash/wait_debug.sh
View File

@@ -2,7 +2,7 @@
set -o errexit -o nounset
TOP_DIR=$(cd "$(dirname "$0")/.." && pwd)
source "$TOP_DIR/config/paths"
source "$LIB_DIR/functions.guest"
source "$LIB_DIR/functions.guest.sh"
indicate_current_auto

2
labs/osbash/scripts/shutdown.sh
View File

@@ -2,7 +2,7 @@
set -o errexit -o nounset
TOP_DIR=$(cd "$(dirname "$0")/.." && pwd)
source "$TOP_DIR/config/paths"
source "$LIB_DIR/functions.guest"
source "$LIB_DIR/functions.guest.sh"
indicate_current_auto

2
labs/osbash/scripts/shutdown_controller.sh
View File

@@ -2,7 +2,7 @@
set -o errexit -o nounset
TOP_DIR=$(cd "$(dirname "$0")/.." && pwd)
source "$TOP_DIR/config/paths"
source "$LIB_DIR/functions.guest"
source "$LIB_DIR/functions.guest.sh"
indicate_current_auto

2
labs/osbash/scripts/test/launch_instance.sh
View File

@@ -3,7 +3,7 @@ set -o errexit -o nounset
TOP_DIR=$(cd "$(dirname "$0")/.." && pwd)
source "$TOP_DIR/config/paths"
source "$CONFIG_DIR/credentials"
source "$LIB_DIR/functions.guest"
source "$LIB_DIR/functions.guest.sh"
source "$CONFIG_DIR/demo-openstackrc.sh"
exec_logfile

2
labs/osbash/scripts/ubuntu/apt_init.sh
View File

@@ -5,7 +5,7 @@ source "$TOP_DIR/config/paths"
source "$CONFIG_DIR/openstack"
# Pick up VM_PROXY
source "$CONFIG_DIR/localrc"
source "$LIB_DIR/functions.guest"
source "$LIB_DIR/functions.guest.sh"
indicate_current_auto

2
labs/osbash/scripts/ubuntu/apt_install_mysql.sh
View File

@@ -3,7 +3,7 @@ set -o errexit -o nounset
TOP_DIR=$(cd "$(dirname "$0")/.." && pwd)
source "$TOP_DIR/config/paths"
source "$CONFIG_DIR/credentials"
source "$LIB_DIR/functions.guest"
source "$LIB_DIR/functions.guest.sh"
exec_logfile

2
labs/osbash/scripts/ubuntu/apt_pre-download.sh
View File

@@ -3,7 +3,7 @@ set -o errexit -o nounset
TOP_DIR=$(cd "$(dirname "$0")/.." && pwd)
source "$TOP_DIR/config/paths"
source "$CONFIG_DIR/openstack"
source "$LIB_DIR/functions.guest"
source "$LIB_DIR/functions.guest.sh"
exec_logfile

2
labs/osbash/scripts/ubuntu/apt_upgrade.sh
View File

@@ -3,7 +3,7 @@ set -o errexit -o nounset
TOP_DIR=$(cd "$(dirname "$0")/.." && pwd)
source "$TOP_DIR/config/paths"
source "$CONFIG_DIR/openstack"
source "$LIB_DIR/functions.guest"
source "$LIB_DIR/functions.guest.sh"
indicate_current_auto

2
labs/osbash/scripts/ubuntu/install_rabbitmq.sh
View File

@@ -3,7 +3,7 @@ set -o errexit -o nounset
TOP_DIR=$(cd "$(dirname "$0")/.." && pwd)
source "$TOP_DIR/config/paths"
source "$CONFIG_DIR/credentials"
source "$LIB_DIR/functions.guest"
source "$LIB_DIR/functions.guest.sh"
exec_logfile

2
labs/osbash/scripts/ubuntu/setup_cinder_controller.sh
View File

@@ -3,7 +3,7 @@ set -o errexit -o nounset
TOP_DIR=$(cd "$(dirname "$0")/.." && pwd)
source "$TOP_DIR/config/paths"
source "$CONFIG_DIR/credentials"
source "$LIB_DIR/functions.guest"
source "$LIB_DIR/functions.guest.sh"
exec_logfile
indicate_current_auto

2
labs/osbash/scripts/ubuntu/setup_cinder_volumes.sh
View File

@@ -4,7 +4,7 @@ TOP_DIR=$(cd "$(dirname "$0")/.." && pwd)
source "$TOP_DIR/config/paths"
source "$CONFIG_DIR/credentials"
source "$CONFIG_DIR/openstack"
source "$LIB_DIR/functions.guest"
source "$LIB_DIR/functions.guest.sh"
source "$CONFIG_DIR/admin-openstackrc.sh"
exec_logfile

2
labs/osbash/scripts/ubuntu/setup_glance.sh
View File

@@ -3,7 +3,7 @@ set -o errexit -o nounset
TOP_DIR=$(cd "$(dirname "$0")/.." && pwd)
source "$TOP_DIR/config/paths"
source "$CONFIG_DIR/credentials"
source "$LIB_DIR/functions.guest"
source "$LIB_DIR/functions.guest.sh"
exec_logfile
indicate_current_auto

2
labs/osbash/scripts/ubuntu/setup_heat_controller.sh
View File

@@ -3,7 +3,7 @@ set -o errexit -o nounset
TOP_DIR=$(cd "$(dirname "$0")/.." && pwd)
source "$TOP_DIR/config/paths"
source "$CONFIG_DIR/credentials"
source "$LIB_DIR/functions.guest"
source "$LIB_DIR/functions.guest.sh"
exec_logfile

2
labs/osbash/scripts/ubuntu/setup_heat_network.sh
View File

@@ -3,7 +3,7 @@ set -o errexit -o nounset
TOP_DIR=$(cd "$(dirname "$0")/.." && pwd)
source "$TOP_DIR/config/paths"
source "$CONFIG_DIR/credentials"
source "$LIB_DIR/functions.guest"
source "$LIB_DIR/functions.guest.sh"
source "$CONFIG_DIR/openstack"
exec_logfile

2
labs/osbash/scripts/ubuntu/setup_horizon.sh
View File

@@ -2,7 +2,7 @@
set -o errexit -o nounset
TOP_DIR=$(cd "$(dirname "$0")/.." && pwd)
source "$TOP_DIR/config/paths"
source "$LIB_DIR/functions.guest"
source "$LIB_DIR/functions.guest.sh"
exec_logfile
indicate_current_auto

2
labs/osbash/scripts/ubuntu/setup_keystone.sh
View File

@@ -5,7 +5,7 @@ source "$TOP_DIR/config/paths"
source "$CONFIG_DIR/credentials"
# Get REGION
source "$CONFIG_DIR/openstack"
source "$LIB_DIR/functions.guest"
source "$LIB_DIR/functions.guest.sh"
exec_logfile

2
labs/osbash/scripts/ubuntu/setup_lbaas_controller.sh
View File

@@ -3,7 +3,7 @@ set -o errexit -o nounset
TOP_DIR=$(cd "$(dirname "$0")/.." && pwd)
source "$TOP_DIR/config/paths"
source "$CONFIG_DIR/credentials"
source "$LIB_DIR/functions.guest"
source "$LIB_DIR/functions.guest.sh"
source "$CONFIG_DIR/admin-openstackrc.sh"
exec_logfile

2
labs/osbash/scripts/ubuntu/setup_lbaas_network.sh
View File

@@ -3,7 +3,7 @@ set -o errexit -o nounset
TOP_DIR=$(cd "$(dirname "$0")/.." && pwd)
source "$TOP_DIR/config/paths"
source "$CONFIG_DIR/credentials"
source "$LIB_DIR/functions.guest"
source "$LIB_DIR/functions.guest.sh"
source "$CONFIG_DIR/openstack"
exec_logfile

2
labs/osbash/scripts/ubuntu/setup_neutron_compute.sh
View File

@@ -3,7 +3,7 @@ set -o errexit -o nounset
TOP_DIR=$(cd "$(dirname "$0")/.." && pwd)
source "$TOP_DIR/config/paths"
source "$CONFIG_DIR/credentials"
source "$LIB_DIR/functions.guest"
source "$LIB_DIR/functions.guest.sh"
source "$CONFIG_DIR/admin-openstackrc.sh"
exec_logfile

2
labs/osbash/scripts/ubuntu/setup_neutron_controller.sh
View File

@@ -3,7 +3,7 @@ set -o errexit -o nounset
TOP_DIR=$(cd "$(dirname "$0")/.." && pwd)
source "$TOP_DIR/config/paths"
source "$CONFIG_DIR/credentials"
source "$LIB_DIR/functions.guest"
source "$LIB_DIR/functions.guest.sh"
exec_logfile
indicate_current_auto

2
labs/osbash/scripts/ubuntu/setup_neutron_network.sh
View File

@@ -3,7 +3,7 @@ set -o errexit -o nounset
TOP_DIR=$(cd "$(dirname "$0")/.." && pwd)
source "$TOP_DIR/config/paths"
source "$CONFIG_DIR/credentials"
source "$LIB_DIR/functions.guest"
source "$LIB_DIR/functions.guest.sh"
source "$CONFIG_DIR/openstack"
exec_logfile

2
labs/osbash/scripts/ubuntu/setup_nova_compute.sh
View File

@@ -3,7 +3,7 @@ set -o errexit -o nounset
TOP_DIR=$(cd "$(dirname "$0")/.." && pwd)
source "$TOP_DIR/config/paths"
source "$CONFIG_DIR/credentials"
source "$LIB_DIR/functions.guest"
source "$LIB_DIR/functions.guest.sh"
source "$CONFIG_DIR/admin-openstackrc.sh"
exec_logfile

2
labs/osbash/scripts/ubuntu/setup_nova_controller.sh
View File

@@ -3,7 +3,7 @@ set -o errexit -o nounset
TOP_DIR=$(cd "$(dirname "$0")/.." && pwd)
source "$TOP_DIR/config/paths"
source "$CONFIG_DIR/credentials"
source "$LIB_DIR/functions.guest"
source "$LIB_DIR/functions.guest.sh"
exec_logfile
indicate_current_auto

2
labs/osbash/scripts/ubuntu/setup_telemetry_compute.sh
View File

@@ -3,7 +3,7 @@ set -o errexit -o nounset
TOP_DIR=$(cd "$(dirname "$0")/.." && pwd)
source "$TOP_DIR/config/paths"
source "$CONFIG_DIR/credentials"
source "$LIB_DIR/functions.guest"
source "$LIB_DIR/functions.guest.sh"
source "$CONFIG_DIR/openstack"
exec_logfile

2
labs/osbash/scripts/ubuntu/setup_telemetry_controller.sh
View File

@@ -3,7 +3,7 @@ set -o errexit -o nounset
TOP_DIR=$(cd "$(dirname "$0")/.." && pwd)
source "$TOP_DIR/config/paths"
source "$CONFIG_DIR/credentials"
source "$LIB_DIR/functions.guest"
source "$LIB_DIR/functions.guest.sh"
source "$CONFIG_DIR/openstack"
exec_logfile

2
labs/osbash/scripts/yum_init.sh
View File

@@ -5,7 +5,7 @@ source "$TOP_DIR/config/paths"
source "$CONFIG_DIR/openstack"
# Pick up VM_PROXY
source "$CONFIG_DIR/localrc"
source "$LIB_DIR/functions.guest"
source "$LIB_DIR/functions.guest.sh"
indicate_current_auto

2
labs/osbash/scripts/yum_update.sh
View File

@@ -3,7 +3,7 @@ set -o errexit -o nounset
TOP_DIR=$(cd "$(dirname "$0")/.." && pwd)
source "$TOP_DIR/config/paths"
source "$CONFIG_DIR/openstack"
source "$LIB_DIR/functions.guest"
source "$LIB_DIR/functions.guest.sh"
indicate_current_auto

2
labs/osbash/scripts/zero_empty.sh
View File

@@ -2,7 +2,7 @@
set -o errexit -o nounset
TOP_DIR=$(cd "$(dirname "$0")/.." && pwd)
source "$TOP_DIR/config/paths"
source "$LIB_DIR/functions.guest"
source "$LIB_DIR/functions.guest.sh"
indicate_current_auto