Updated openstack/openstack
Project: openstack/nova  cfde1522fa5a1619bcf1f93e498c76db9097b595

Update log message for add_host_to_aggregate

When add host to aggregates with availability zone, if the host
is already in one availability zone, then the host cannot be added
to another availability zone.

When user do above operation, nova api will report error message,
but the error message does not include blank space between
<availability zone> and zone name, also the error message include
two periods.

The fix was adding blank space and removes one period for the message.

Change-Id: I7307288be194d3ce6de05b77433bbe2626ae46d9
Closes-bug: #1237303
(cherry picked from commit c2ae5fb5659faeadc6f4d8afe27eb68e3c0ade0c)
Updated openstack/openstack
Project: openstack/ceilometer  0be95ac0bcacca091ad3093b18edb4ee612d7d5d

Fixes Hyper-V Inspector network metrics values

The Hyper-V inspector is currently returning the wrong metric values. The
current values are the aggregated ones, which is not correct in scenarios
in which instances have more than one nic.
Furthermore, values were taken from the
Msvm_EthernetPortAllocationSettingData, instead of
Msvm_EthernetSwitchPortAclSettingData.

(cherry picked from commit 01190ccee364dc061038ef7d8f3cc701c8d447ba)

Change-Id: I669ff52a1be2ee56bf69aa3b680ab42fdcaf1cb7
Closes-bug: #1289014