openstack/manila
Code Issues Proposed changes

[Devstack] Workaround osclient breakage

Browse Source 
Creation of security group using openstack client is broken. So,
use nova client for it temporary while 'related' bug is not fixed.

Change-Id: I51b5be5157bd49d5835b30eaa8b6b0e7185cabdf
Related-Bug: #1652317
This commit is contained in:
vponomaryov 2016-12-23 17:07:39 +02:00
parent b76a2af237
commit 10b14bb50e
1 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
devstack/plugin.sh
View File

@ -389,10 +389,16 @@ function create_manila_service_image {
# create_manila_service_secgroup - creates security group that is used by
# Nova VMs when generic driver is configured.
function create_manila_service_secgroup {
# TODO(vponomaryov): replace usage of novaclient with openstackclient back
# right after bug #1652317 is fixed.
# Create a secgroup
if ! openstack security group list | grep -q $MANILA_SERVICE_SECGROUP; then
openstack security group create $MANILA_SERVICE_SECGROUP --description "$MANILA_SERVICE_SECGROUP description"
if ! timeout 30 sh -c "while ! openstack security group list | grep -q $MANILA_SERVICE_SECGROUP; do sleep 1; done"; then
# if ! openstack security group list | grep -q $MANILA_SERVICE_SECGROUP; then
if ! nova secgroup-list | grep -q $MANILA_SERVICE_SECGROUP; then
# openstack security group create $MANILA_SERVICE_SECGROUP --description "$MANILA_SERVICE_SECGROUP description"
nova secgroup-create $MANILA_SERVICE_SECGROUP "$MANILA_SERVICE_SECGROUP description"
# if ! timeout 30 sh -c "while ! openstack security group list | grep -q $MANILA_SERVICE_SECGROUP; do sleep 1; done"; then
if ! timeout 30 sh -c "while ! nova secgroup-list | grep -q $MANILA_SERVICE_SECGROUP; do sleep 1; done"; then
echo "Security group not created"
exit 1
fi
@ -425,7 +431,8 @@ function create_manila_service_secgroup {
fi
# List secgroup rules
openstack security group rule list $MANILA_SERVICE_SECGROUP
# openstack security group rule list $MANILA_SERVICE_SECGROUP
nova secgroup-list-rules $MANILA_SERVICE_SECGROUP
}
# create_manila_accounts - Set up common required manila accounts