From 907de91b55522260d47981d7aac0ad17f240b280 Mon Sep 17 00:00:00 2001
From: tikitavi <rtikitavi@gmail.com>
Date: Fri, 9 Jun 2017 14:45:06 +0300
Subject: [PATCH] turn on disable_ec2_classic in devstack installation

fix problem with incorrect creation of default vpc from metadata

Change-Id: If84c4cc1b7ec5664ff194cecb64b8f85ba4ca844
---
 devstack/plugin.sh     | 1 +
 ec2api/api/instance.py | 2 +-
 ec2api/api/vpc.py      | 2 +-
 3 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/devstack/plugin.sh b/devstack/plugin.sh
index dd672323..855b8498 100755
--- a/devstack/plugin.sh
+++ b/devstack/plugin.sh
@@ -151,6 +151,7 @@ function configure_ec2api_networking {
     if [[ -n "$ext_net" ]]; then
         iniset $EC2API_CONF_FILE DEFAULT external_network $ext_net
     fi
+    iniset $EC2API_CONF_FILE DEFAULT disable_ec2_classic True
 }
 
 # Entry points
diff --git a/ec2api/api/instance.py b/ec2api/api/instance.py
index 9d951e96..c6e4f0fa 100644
--- a/ec2api/api/instance.py
+++ b/ec2api/api/instance.py
@@ -1030,7 +1030,7 @@ def _populate_parsed_bdm_parameter(bdm, short_root_device_name):
 
 def _format_group_set(context, os_security_groups, groups):
     if not os_security_groups:
-        return None
+        return []
     return [{'groupName': sg['name'],
              'groupId': groups[sg['name']]}
             for sg in os_security_groups
diff --git a/ec2api/api/vpc.py b/ec2api/api/vpc.py
index dba3f98a..1babdb70 100644
--- a/ec2api/api/vpc.py
+++ b/ec2api/api/vpc.py
@@ -164,7 +164,7 @@ def _create_vpc(context, cidr_block, is_default=False):
 
 
 def _check_and_create_default_vpc(context):
-    if CONF.disable_ec2_classic:
+    if CONF.disable_ec2_classic and not context.is_os_admin:
         for vpc in db_api.get_items(context, 'vpc'):
             if vpc.get('is_default'):
                 return vpc