Repository: jclouds-labs Updated Branches: refs/heads/2.1.x 5c97ea450 -> fbf1f4bdd
JCLOUDS-1421: Add default credentials to images created by the ImageExtension Project: http://git-wip-us.apache.org/repos/asf/jclouds-labs/repo Commit: http://git-wip-us.apache.org/repos/asf/jclouds-labs/commit/fbf1f4bd Tree: http://git-wip-us.apache.org/repos/asf/jclouds-labs/tree/fbf1f4bd Diff: http://git-wip-us.apache.org/repos/asf/jclouds-labs/diff/fbf1f4bd Branch: refs/heads/2.1.x Commit: fbf1f4bdd6c28caefb3cbc5fda7267fd37c843e7 Parents: 5c97ea4 Author: Ignasi Barrera <[email protected]> Authored: Tue May 22 16:31:19 2018 +0200 Committer: Ignasi Barrera <[email protected]> Committed: Tue May 22 16:32:33 2018 +0200 ---------------------------------------------------------------------- .../cloudapi/v6_5/compute/JoyentCloudComputeService.java | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/fbf1f4bd/joyent-cloudapi/src/main/java/org/jclouds/joyent/cloudapi/v6_5/compute/JoyentCloudComputeService.java ---------------------------------------------------------------------- diff --git a/joyent-cloudapi/src/main/java/org/jclouds/joyent/cloudapi/v6_5/compute/JoyentCloudComputeService.java b/joyent-cloudapi/src/main/java/org/jclouds/joyent/cloudapi/v6_5/compute/JoyentCloudComputeService.java index dba41e7..6352f41 100644 --- a/joyent-cloudapi/src/main/java/org/jclouds/joyent/cloudapi/v6_5/compute/JoyentCloudComputeService.java +++ b/joyent-cloudapi/src/main/java/org/jclouds/joyent/cloudapi/v6_5/compute/JoyentCloudComputeService.java @@ -41,11 +41,11 @@ import org.jclouds.compute.domain.NodeMetadata; import org.jclouds.compute.domain.TemplateBuilder; import org.jclouds.compute.extensions.ImageExtension; import org.jclouds.compute.extensions.SecurityGroupExtension; +import org.jclouds.compute.extensions.internal.DelegatingImageExtension; import org.jclouds.compute.functions.GroupNamingConvention; import org.jclouds.compute.internal.BaseComputeService; import org.jclouds.compute.internal.PersistNodeCredentials; import org.jclouds.compute.options.TemplateOptions; -import org.jclouds.compute.reference.ComputeServiceConstants.Timeouts; import org.jclouds.compute.strategy.CreateNodesInGroupThenAddToSet; import org.jclouds.compute.strategy.DestroyNodeStrategy; import org.jclouds.compute.strategy.GetImageStrategy; @@ -97,17 +97,18 @@ public class JoyentCloudComputeService extends BaseComputeService { @Named(TIMEOUT_NODE_SUSPENDED) Predicate<AtomicReference<NodeMetadata>> nodeSuspended, InitializeRunScriptOnNodeOrPlaceInBadMap.Factory initScriptRunnerFactory, RunScriptOnNode.Factory runScriptOnNodeFactory, InitAdminAccess initAdminAccess, - PersistNodeCredentials persistNodeCredentials, Timeouts timeouts, + PersistNodeCredentials persistNodeCredentials, @Named(Constants.PROPERTY_USER_THREADS) ListeningExecutorService userExecutor, JoyentCloudApi novaApi, LoadingCache<DatacenterAndName, KeyAndPrivateKey> keyCache, Function<Set<? extends NodeMetadata>, Multimap<String, String>> orphanedGroupsByDatacenterId, GroupNamingConvention.Factory namingConvention, Optional<ImageExtension> imageExtension, - Optional<SecurityGroupExtension> securityGroupExtension) { + Optional<SecurityGroupExtension> securityGroupExtension, + DelegatingImageExtension.Factory delegatingImageExtension) { super(context, credentialStore, images, sizes, locations, listNodesStrategy, getImageStrategy, getNodeMetadataStrategy, runNodesAndAddToSetStrategy, rebootNodeStrategy, destroyNodeStrategy, startNodeStrategy, stopNodeStrategy, templateBuilderProvider, templateOptionsProvider, nodeRunning, nodeTerminated, nodeSuspended, initScriptRunnerFactory, initAdminAccess, runScriptOnNodeFactory, - persistNodeCredentials, timeouts, userExecutor, imageExtension, securityGroupExtension); + persistNodeCredentials, userExecutor, imageExtension, securityGroupExtension, delegatingImageExtension); this.novaApi = checkNotNull(novaApi, "novaApi"); this.keyCache = checkNotNull(keyCache, "keyCache"); this.orphanedGroupsByDatacenterId = checkNotNull(orphanedGroupsByDatacenterId, "orphanedGroupsByDatacenterId");
