openstack/ironic
Code Issues Proposed changes

Add extensions to the scripts at devstack/tools/ironic/scripts

Browse Source 
In order to easily determine the file type of the scripts in
devstack/tools/ironic/scripts directory, this patch is adding the
correspoding extension to each script.

Change-Id: Ifb53b768b7a3b38561031c92c279fa520e289b3d
This commit is contained in:
Lucas Alvares Gomes 2015-12-17 18:07:04 +00:00
parent d7c41ebf9b
commit cd9975dc0a
6 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
devstack/lib/ironic
View File

@ -576,7 +576,7 @@ function setup_qemu_log_hook {
function create_bridge_and_vms { function create_bridge_and_vms {
# Call libvirt setup scripts in a new shell to ensure any new group membership # Call libvirt setup scripts in a new shell to ensure any new group membership
sudo su $STACK_USER -c "$IRONIC_SCRIPTS_DIR/setup-network" sudo su $STACK_USER -c "$IRONIC_SCRIPTS_DIR/setup-network.sh"
if [[ "$IRONIC_VM_LOG_CONSOLE" == "True" ]] ; then if [[ "$IRONIC_VM_LOG_CONSOLE" == "True" ]] ; then
local log_arg="$IRONIC_VM_LOG_DIR" local log_arg="$IRONIC_VM_LOG_DIR"
@ -588,7 +588,7 @@ function create_bridge_and_vms {
fi fi
local vm_name local vm_name
for vm_name in $(_ironic_bm_vm_names); do for vm_name in $(_ironic_bm_vm_names); do
sudo su $STACK_USER -c "$IRONIC_SCRIPTS_DIR/create-node $vm_name \ sudo su $STACK_USER -c "$IRONIC_SCRIPTS_DIR/create-node.sh $vm_name \
$IRONIC_VM_SPECS_CPU $IRONIC_VM_SPECS_RAM $IRONIC_VM_SPECS_DISK \ $IRONIC_VM_SPECS_CPU $IRONIC_VM_SPECS_RAM $IRONIC_VM_SPECS_DISK \
amd64 $IRONIC_VM_NETWORK_BRIDGE $IRONIC_VM_EMULATOR \ amd64 $IRONIC_VM_NETWORK_BRIDGE $IRONIC_VM_EMULATOR \
$log_arg" >> $IRONIC_VM_MACS_CSV_FILE $log_arg" >> $IRONIC_VM_MACS_CSV_FILE
@ -880,7 +880,7 @@ function cleanup_baremetal_basic_ops {
local vm_name local vm_name
for vm_name in $(_ironic_bm_vm_names); do for vm_name in $(_ironic_bm_vm_names); do
sudo su $STACK_USER -c "$IRONIC_SCRIPTS_DIR/cleanup-node $vm_name $IRONIC_VM_NETWORK_BRIDGE" sudo su $STACK_USER -c "$IRONIC_SCRIPTS_DIR/cleanup-node.sh $vm_name $IRONIC_VM_NETWORK_BRIDGE"
done done
sudo rm -rf /etc/xinetd.d/tftp /etc/init/tftpd-hpa.override sudo rm -rf /etc/xinetd.d/tftp /etc/init/tftpd-hpa.override

0
devstack/tools/ironic/scripts/cleanup-node → devstack/tools/ironic/scripts/cleanup-node.sh
View File

0
devstack/tools/ironic/scripts/configure-vm → devstack/tools/ironic/scripts/configure-vm.py
View File

2
devstack/tools/ironic/scripts/create-node → devstack/tools/ironic/scripts/create-node.sh
View File

@ -68,7 +68,7 @@ if ! virsh list --all | grep -q $NAME; then
# Pre-touch the VM to set +C, as it can only be set on empty files. # Pre-touch the VM to set +C, as it can only be set on empty files.
sudo touch "$volume_path" sudo touch "$volume_path"
sudo chattr +C "$volume_path" || true sudo chattr +C "$volume_path" || true
$TOP_DIR/scripts/configure-vm \ $TOP_DIR/scripts/configure-vm.py \
--bootdev network --name $NAME --image "$volume_path" \ --bootdev network --name $NAME --image "$volume_path" \
--arch $ARCH --cpus $CPU --memory $MEM --libvirt-nic-driver $LIBVIRT_NIC_DRIVER \ --arch $ARCH --cpus $CPU --memory $MEM --libvirt-nic-driver $LIBVIRT_NIC_DRIVER \
--emulator $EMULATOR --network $BRIDGE $VM_LOGGING >&2 --emulator $EMULATOR --network $BRIDGE $VM_LOGGING >&2

0
devstack/tools/ironic/scripts/setup-network → devstack/tools/ironic/scripts/setup-network.sh
View File

2
tools/run_bashate.sh
View File

@ -18,7 +18,7 @@ find "$@" -not \( -type d -name .?\* -prune \) \
-not -name \*~ \ -not -name \*~ \
-not -name \*.xml \ -not -name \*.xml \
-not -name \*.template \ -not -name \*.template \
-not -wholename \*scripts/configure-vm \ -not -name \*.py \
\( \ \( \
-name \*.sh -or \ -name \*.sh -or \
-wholename \*/lib/\* -or \ -wholename \*/lib/\* -or \