allow name of volumes group to be set
| ... | ... |
@@ -159,6 +159,9 @@ Q_PLUGIN=${Q_PLUGIN:-openvswitch}
|
| 159 | 159 |
# Specify which services to launch. These generally correspond to screen tabs |
| 160 | 160 |
ENABLED_SERVICES=${ENABLED_SERVICES:-g-api,g-reg,key,n-api,n-cpu,n-net,n-sch,n-vnc,horizon,mysql,rabbit}
|
| 161 | 161 |
|
| 162 |
+# Name of the lvm volume group to use/create for iscsi volumes |
|
| 163 |
+VOLUME_GROUP=${VOLUME_GROUP:-nova-volumes}
|
|
| 164 |
+ |
|
| 162 | 165 |
# Nova hypervisor configuration. We default to libvirt whth **kvm** but will |
| 163 | 166 |
# drop back to **qemu** if we are unable to load the kvm module. Stack.sh can |
| 164 | 167 |
# also install an **LXC** based system. |
| ... | ... |
@@ -783,12 +786,12 @@ if [[ "$ENABLED_SERVICES" =~ "n-vol" ]]; then |
| 783 | 783 |
# |
| 784 | 784 |
# By default, the backing file is 2G in size, and is stored in /opt/stack. |
| 785 | 785 |
# |
| 786 |
- if ! sudo vgdisplay | grep -q nova-volumes; then |
|
| 786 |
+ if ! sudo vgdisplay | grep -q $VOLUME_GROUP; then |
|
| 787 | 787 |
VOLUME_BACKING_FILE=${VOLUME_BACKING_FILE:-$DEST/nova-volumes-backing-file}
|
| 788 | 788 |
VOLUME_BACKING_FILE_SIZE=${VOLUME_BACKING_FILE_SIZE:-2052M}
|
| 789 | 789 |
truncate -s $VOLUME_BACKING_FILE_SIZE $VOLUME_BACKING_FILE |
| 790 | 790 |
DEV=`sudo losetup -f --show $VOLUME_BACKING_FILE` |
| 791 |
- sudo vgcreate nova-volumes $DEV |
|
| 791 |
+ sudo vgcreate $VOLUME_GROUP $DEV |
|
| 792 | 792 |
fi |
| 793 | 793 |
|
| 794 | 794 |
# Configure iscsitarget |
| ... | ... |
@@ -817,6 +820,9 @@ if [[ "$ENABLED_SERVICES" =~ "q-svc" ]]; then |
| 817 | 817 |
else |
| 818 | 818 |
add_nova_flag "--network_manager=nova.network.manager.$NET_MAN" |
| 819 | 819 |
fi |
| 820 |
+if [[ "$ENABLED_SERVICES" =~ "n-vol" ]]; then |
|
| 821 |
+ add_nova_flag "--volume_group=$VOLUME_GROUP" |
|
| 822 |
+fi |
|
| 820 | 823 |
add_nova_flag "--my_ip=$HOST_IP" |
| 821 | 824 |
add_nova_flag "--public_interface=$PUBLIC_INTERFACE" |
| 822 | 825 |
add_nova_flag "--vlan_interface=$VLAN_INTERFACE" |