Make network optional (for ETRI?)

CloudBindle · Dec 17, 2014 · f5fc9b9 · f5fc9b9
1 parent aa7ee9c
commit f5fc9b9
Showing 1 changed file with 5 additions and 1 deletion.
diff --git a/youxia-deployer/src/main/java/io/cloudbindle/youxia/deployer/Deployer.java b/youxia-deployer/src/main/java/io/cloudbindle/youxia/deployer/Deployer.java
@@ -404,13 +404,17 @@ private void runDeployment(int clientsToDeploy) throws Exception {
                 ComputeService computeService = genericOpenStackApi.getComputeService();
                 // have to use the specific api here to designate a keypair, weird
                 TemplateOptions templateOptions = NovaTemplateOptions.Builder
-                        .networks(Lists.newArrayList(youxiaConfig.getString(DEPLOYER_OPENSTACK_NETWORK_ID)))
                         .securityGroupNames(youxiaConfig.getString(DEPLOYER_OPENSTACK_SECURITY_GROUP))
                         .userMetadata("Name", "instance_managed_by_" + youxiaConfig.getString(ConfigTools.YOUXIA_MANAGED_TAG))
                         .userMetadata(ConfigTools.YOUXIA_MANAGED_TAG, youxiaConfig.getString(ConfigTools.YOUXIA_MANAGED_TAG))
                         .userMetadata(Constants.STATE_TAG, Constants.STATE.SETTING_UP.toString()).blockUntilRunning(true)
                         .keyPairName(youxiaConfig.getString(ConfigTools.YOUXIA_OPENSTACK_KEY_NAME)).blockOnComplete(true);
 
+                if (youxiaConfig.getString(DEPLOYER_OPENSTACK_NETWORK_ID) != null
+                        && !youxiaConfig.getString(DEPLOYER_OPENSTACK_NETWORK_ID).isEmpty()) {
+                    templateOptions.networks(Lists.newArrayList(youxiaConfig.getString(DEPLOYER_OPENSTACK_NETWORK_ID)));
+                }
+
                 Template template = computeService
                         .templateBuilder()
                         .imageId(