Repository: jclouds Updated Branches: refs/heads/2.0.x f210283ca -> 957592924
JCLOUDS-1249: Fix OpenStack server rollback Project: http://git-wip-us.apache.org/repos/asf/jclouds/repo Commit: http://git-wip-us.apache.org/repos/asf/jclouds/commit/95759292 Tree: http://git-wip-us.apache.org/repos/asf/jclouds/tree/95759292 Diff: http://git-wip-us.apache.org/repos/asf/jclouds/diff/95759292 Branch: refs/heads/2.0.x Commit: 95759292468b0dbfb5d3eda972f3b24dd117c826 Parents: f210283 Author: Ignasi Barrera <[email protected]> Authored: Tue Feb 28 12:13:26 2017 +0100 Committer: Ignasi Barrera <[email protected]> Committed: Mon Mar 6 11:24:50 2017 +0100 ---------------------------------------------------------------------- .../openstack/nova/v2_0/compute/NovaComputeServiceAdapter.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/jclouds/blob/95759292/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/compute/NovaComputeServiceAdapter.java ---------------------------------------------------------------------- diff --git a/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/compute/NovaComputeServiceAdapter.java b/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/compute/NovaComputeServiceAdapter.java index 08a169f..9864d17 100644 --- a/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/compute/NovaComputeServiceAdapter.java +++ b/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/compute/NovaComputeServiceAdapter.java @@ -149,7 +149,7 @@ public class NovaComputeServiceAdapter implements }, 30 * 60, 1, SECONDS).apply(lightweightServer.getId())) { final String message = format("Server %s was not created within %sms so it will be destroyed.", name, "30 * 60"); logger.warn(message); - destroyNode(lightweightServer.getId()); + destroyNode(RegionAndId.fromRegionAndId(regionId, lightweightServer.getId()).slashEncode()); throw new IllegalStateException(message); } logger.trace("<< server(%s)", lightweightServer.getId());
