openstack
/
manila
Code Issues Proposed changes

Revert "[Devstack] Workaround osclient breakage" 

This reverts commit 10b14bb50e.

Change-Id: I1cbc33a4b76e5ab8a65db86ed00b0ccba579d5d9
This commit is contained in:
Valeriy Ponomaryov 2017-01-25 18:36:58 +00:00
parent 10b14bb50e
commit 32708bda48
1 changed files with 4 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
devstack/plugin.sh
View File

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