switched hp default availablility zone to 2

This commit is contained in:
Adrian Cole 2012-03-21 19:11:27 -07:00
parent 09d97a2103
commit 18562f5dbb
2 changed files with 13 additions and 1 deletions

View File

@ -40,6 +40,9 @@ public class HPCloudComputePropertiesBuilder extends NovaPropertiesBuilder {
properties.setProperty(PROPERTY_ISO3166_CODES, "US-NV"); properties.setProperty(PROPERTY_ISO3166_CODES, "US-NV");
properties.setProperty(PROPERTY_ENDPOINT, "https://region-a.geo-1.identity.hpcloudsvc.com:35357"); properties.setProperty(PROPERTY_ENDPOINT, "https://region-a.geo-1.identity.hpcloudsvc.com:35357");
properties.setProperty(PROPERTY_NOVA_AUTO_ALLOCATE_FLOATING_IPS, "true"); properties.setProperty(PROPERTY_NOVA_AUTO_ALLOCATE_FLOATING_IPS, "true");
// auth fail can happen while cloud-init applies keypair updates
properties.setProperty("jclouds.ssh.max-retries", "7");
properties.setProperty("jclouds.ssh.retry-auth", "true");
properties.setProperty(PROPERTY_NOVA_AUTO_GENERATE_KEYPAIRS, "true"); properties.setProperty(PROPERTY_NOVA_AUTO_GENERATE_KEYPAIRS, "true");
// deallocating ip addresses can take a while // deallocating ip addresses can take a while
properties.setProperty(PROPERTY_TIMEOUT_NODE_TERMINATED, 60 * 1000 + ""); properties.setProperty(PROPERTY_TIMEOUT_NODE_TERMINATED, 60 * 1000 + "");

View File

@ -18,10 +18,13 @@
*/ */
package org.jclouds.hpcloud.compute.config; package org.jclouds.hpcloud.compute.config;
import org.jclouds.compute.domain.TemplateBuilder;
import org.jclouds.hpcloud.compute.HPCloudComputeServiceAdapter; import org.jclouds.hpcloud.compute.HPCloudComputeServiceAdapter;
import org.jclouds.openstack.nova.v1_1.compute.NovaComputeServiceAdapter; import org.jclouds.openstack.nova.v1_1.compute.NovaComputeServiceAdapter;
import org.jclouds.openstack.nova.v1_1.compute.config.NovaComputeServiceContextModule; import org.jclouds.openstack.nova.v1_1.compute.config.NovaComputeServiceContextModule;
import com.google.inject.Injector;
/** /**
* *
* @author Adrian Cole * @author Adrian Cole
@ -34,4 +37,10 @@ public class HPCloudComputeServiceContextModule extends NovaComputeServiceContex
bind(NovaComputeServiceAdapter.class).to(HPCloudComputeServiceAdapter.class); bind(NovaComputeServiceAdapter.class).to(HPCloudComputeServiceAdapter.class);
} }
@Override
protected TemplateBuilder provideTemplate(Injector injector, TemplateBuilder template) {
// account on az-1.region-a.geo-1 hosed
return super.provideTemplate(injector, template).locationId("az-2.region-a.geo-1");
}
} }