diff --git a/pom.xml b/pom.xml index 1e39807..49e2816 100644 --- a/pom.xml +++ b/pom.xml @@ -10,7 +10,7 @@ com.eightydegreeswest bfmgr - 1.0.3 + 1.0.4 bfmgr Buildfarm Manager diff --git a/src/main/java/com/eightydegreeswest/bfmgr/model/CreateClusterRequest.java b/src/main/java/com/eightydegreeswest/bfmgr/model/CreateClusterRequest.java index bbc85fd..45662b6 100644 --- a/src/main/java/com/eightydegreeswest/bfmgr/model/CreateClusterRequest.java +++ b/src/main/java/com/eightydegreeswest/bfmgr/model/CreateClusterRequest.java @@ -18,4 +18,5 @@ public class CreateClusterRequest { private String workerRepo; private String workerTag; private String workerConfig; + private String elbType; } diff --git a/src/main/java/com/eightydegreeswest/bfmgr/service/impl/BfMgrCtrlAws.java b/src/main/java/com/eightydegreeswest/bfmgr/service/impl/BfMgrCtrlAws.java index 8130a12..34942c1 100644 --- a/src/main/java/com/eightydegreeswest/bfmgr/service/impl/BfMgrCtrlAws.java +++ b/src/main/java/com/eightydegreeswest/bfmgr/service/impl/BfMgrCtrlAws.java @@ -142,6 +142,7 @@ public CreateClusterRequest getDefaultCreateClusterRequest() { createClusterRequest.setWorkerInstanceType(defaultWorkerInstanceType); createClusterRequest.setWorkerRepo(workerRepo); createClusterRequest.setWorkerTag(buildfarmTag); + createClusterRequest.setElbType("internet-facing"); return createClusterRequest; } @@ -226,6 +227,7 @@ private Collection getCloudFormationParameters(CreateClusterRequest c parameters.add(getParameter("ServerConfigFile", createClusterRequest.getServerConfig())); parameters.add(getParameter("ClusterName", createClusterRequest.getClusterName())); parameters.add(getParameter("RequiredTagName", getAssetTag())); + parameters.add(getParameter("ElbType", createClusterRequest.getElbType())); return parameters; } diff --git a/src/main/resources/aws.json b/src/main/resources/aws.json index daf7b29..50eca8e 100644 --- a/src/main/resources/aws.json +++ b/src/main/resources/aws.json @@ -61,6 +61,12 @@ "RequiredTagName":{ "Type":"String", "Description":"Required tag name (Asset)." + }, + "ElbType":{ + "Type":"String", + "Default" : "internet-facing", + "AllowedValues" : ["internet-facing", "internal"], + "Description":"Load balancer type." } }, "Resources":{ @@ -285,7 +291,9 @@ "LoadBalancerServer":{ "Type":"AWS::ElasticLoadBalancingV2::LoadBalancer", "Properties":{ - "Scheme":"internet-facing", + "Scheme":{ + "Ref": "ElbType" + }, "Subnets":{ "Ref":"SubnetPool" }, diff --git a/src/main/resources/templates/dashboard.html b/src/main/resources/templates/dashboard.html index 8127751..19babab 100644 --- a/src/main/resources/templates/dashboard.html +++ b/src/main/resources/templates/dashboard.html @@ -97,6 +97,13 @@