Change for network version

This commit is contained in:
monroid 2013-07-04 17:09:42 +04:00
parent 26f6ff1df8
commit ee4228a96e

View File

@ -239,7 +239,7 @@ class PrepareTempest():
'ADMIN_USER_NAME': self.username, 'ADMIN_USER_NAME': self.username,
'ADMIN_PASSWORD': self.password, 'ADMIN_PASSWORD': self.password,
'ADMIN_TENANT_NAME': self.tenant, 'ADMIN_TENANT_NAME': self.tenant,
'COMPUTE_ALLOW_TENANT_ISOLATION': 'true', 'COMPUTE_ALLOW_TENANT_ISOLATION': 'false',
'COMPUTE_ALLOW_TENANT_REUSE': 'true', 'COMPUTE_ALLOW_TENANT_REUSE': 'true',
'IMAGE_ID': image_ref, 'IMAGE_ID': image_ref,
'IMAGE_ID_ALT': image_ref_alt, 'IMAGE_ID_ALT': image_ref_alt,
@ -267,7 +267,7 @@ class PrepareTempest():
'COMPUTE_ADMIN_TENANT_NAME': self.tenant, 'COMPUTE_ADMIN_TENANT_NAME': self.tenant,
'IMAGE_CATALOG_TYPE': 'image', 'IMAGE_CATALOG_TYPE': 'image',
'IMAGE_API_VERSION': '1', 'IMAGE_API_VERSION': '1',
'NETWORK_API_VERSION': 'v2.0', 'NETWORK_API_VERSION': 'v1.1',
'NETWORK_CATALOG_TYPE': 'network', 'NETWORK_CATALOG_TYPE': 'network',
'TENANT_NETWORK_CIDR': '192.168.112.0/24', #TODO: ask Bogdan why # choose do not overlap with 'net04' 'TENANT_NETWORK_CIDR': '192.168.112.0/24', #TODO: ask Bogdan why # choose do not overlap with 'net04'
'TENANT_NETWORK_MASK_BITS': '28', # 29 is too less to test quantum quotas (at least 50 ips needed) 'TENANT_NETWORK_MASK_BITS': '28', # 29 is too less to test quantum quotas (at least 50 ips needed)