Import install_venv from oslo

The new version of install_venv_common evaluates requirements.txt
and test-requirements.txt at the same time and we avoid Django 1.6
is installed when evaluating django-nose dependencies.

Change-Id: I2ab7108b3615ac6c0525089b81b80e5c0a4793fc
Closes-Bug: #1250581
(cherry picked from commit 7a0581bb701dbb4d7d9fb1bbe1d7644e98ac2b2e)
Give HealthMonitor a proper display name

Closes-Bug: #1237377

Change-Id: If901008171d964bf93941c0b6de2c66e20f0aa27
(cherry picked from commit 3a28423cd96596edd5e30a1a53956fa6c93f439f)
Bump stable/havana next version to 2013.2.2

Change-Id: I3a7170180717bd62fce4cbc2c3a9107187f89fb1
Gracefully handle Users with no email attribute

In certain environments, such as when using Keystone with a LDAP
backend, it's possible that the email attribute won't exist for all
users.

Change-Id: I71041be832206e52bfb73926199f2c89e0e84a0b
Closes-Bug: #1260423
Merge "Import install_venv from oslo" into stable/havana
Merge "Gracefully handle Users with no email attribute" into stable/havana
Add check for BlockDeviceMappingV2 nova extension

Booting instance from image (creates a volume) option is using
the new BDM format when submitting the create server request to
Nova. Adding a check for Nova extensions if it is supported
before displaying the option.

Closes-bug: #1223875

In the original fix API call is not wrapped with try/except
and it was fixed in bug 1262223 in master. The fix is also
cherry-picked from commit a10436e6a376fb2c3478796e7ad728eb0e1f0ba3.

Related-bug: #1262223

Change-Id: Ie0b2b5d574babc910e2dac7ce9e3ab6603382ffb
(cherry picked from commit a10436e6a376fb2c3478796e7ad728eb0e1f0ba3)
Specify tenant_id when retrieving LBaaS/VPNaaS resource

In Neutron API, resources from all tenants are listed when
retrieving a list of resources with admin role. Horizon
project dashboard is for project-specific operations,
so we should retrieve only resources of the given project.
LBaaS/VPNaaS panels have this problem, but FWaaS does not.
router_list should be called with tenant_id filter too.

This commit also fixes VPN/FWaaS tests so that it extract tenant_id
from request attribute rather than use tenant_id of test_data.

Change-Id: I080e6c6d1e426a878c1d088763bbc7e5add15820
Closes-Bug: #1244126
(cherry picked from commit 630b43349160f8b35d54196aabaa6e1afe5e4d61)
Common keystone version fallback

If OPENSTACK_API_VERSIONS["identity"] was not set in local_settings.py,
django_openstack_auth and horizon had their own fallback method which
did not necessarily fallback on the same version and was leading to
discrepancies and erratic behavior.

Refactored in order to use the same fallback method defined in
django_openstack_auth.utils

Change-Id: I583d49a73077a20baf5f01628b0b6e8480296964
Closes-Bug: #1231357
(cherry picked from commit ea447939a88dd80e54612a49a66ae57243e1164b)
Change how scrollShift is calculated

In Firefox $('body').scrollTop returns 0, that's why the modal
appear outside the visible screen. Added $('hmtl).scrollTop.

var scrollShift = $('body').scrollTop() || $('html').scrollTop()

Closes-Bug: 1251361

Change-Id: Icf691eb140e091615a98f1fbd415428cd418ba9e
(cherry picked from commit 8950b90d1777e265f98379098cebef7517642efe)
fix help text in "Create An image" window

In the "Create An image" window, there are "minimum disk" and "minimun
memory" text input. But both help text on the two text inputs are using
"the minimum disk size...". Actually for the second one we should say
"the minimum memory size...", and now this patch fix this.

Change-Id: Ife19acba5fafb41d99e9416d2f9e8082b9eaef53
(cherry picked from commit 0314d54391775f09b35759a650dbae2e2ba567aa)
unify keypair name handling

CreateKeyPair and ImportKeypair handled name checks in a different
way. When importing a keypair, one got a generic error message
without a hint, that the name was wrong.

This is the backport to Havana.

Managed to drop the original changei, which was
Ie82c0cd21f70aae3f55b84a1c05c9f170eaec312

Closes-Bug: #1265563
(cherry picked from commit eafe0b260d24f65d6f0b0487a74c352a01a53d84)

Change-Id: I10d5a7151242afeeed59965b361c89cc97b53b46
Wrong marker sent to keystone

Removed nonsense marker that prevents charts grouped by project
working. Dropping also pagination for now, there is a UX design
in progress that would present how pagination should work.

Fixes bug 1260528

Change-Id: I3c2c2b2d0c3fcc6947f53a10441f9cd1440ef0fa
(cherry picked from commit 09a2e97a9c031df8b2f2005f4e4c804fb11dd0c4)
Adding management_url to test mock client

Mocking management_url property in keystoneclient.Client for mox.

Closes-Bug: #1268631
(cherry picked from commit f7d00b5960c4e7f878a647e6c83ead986d55f921)

Change-Id: I3e1067aa4bc6cd5d2875433197d7bea69a16195b
Bad workflow-steps check: has_required_fields

Many of the tabs on the Instance Creation screen don't show a "*"
despite having require fields.  This is due to faulty logic in determining
whether the workflow-step has require fields.  (Previously, only keys from
the contributes list were checked.)

Closes-Bug: 1252005

Change-Id: Id609da27c51f8d4725683d7fd1534ead0c3bb984
(cherry picked from commit 788ec08c4f3e53b1f3dbaa40c19a0a71c21cdf42)
Merge "Wrong marker sent to keystone" into stable/havana
disable volume creation, when cinder is disabled

before this patch, it's possible to try to create a volume
from an image, create a volume during instance creation etc.

The same applies to create a volume from snapshot.

Closes-bug: 1267438
(cherry picked from commit 33076684a9db19b5e25ba517ce3ac90bb5c25fc0)

Conflicts:
	openstack_dashboard/dashboards/project/images_and_snapshots/images/tables.py
	openstack_dashboard/dashboards/project/instances/workflows/create_instance.py

Change-Id: Ib573487938e0833668b002d05574e587734ef829
Merge "fix help text in "Create An image" window" into stable/havana
Merge "Change how scrollShift is calculated" into stable/havana
Merge "unify keypair name handling" into stable/havana