Merge pull request #285 from andrewklau/add_region_support

Add extra district, zone and region options

Author: sdodson

README.asciidoc

@@ -648,6 +648,34 @@ Default max number of gears a user is allowed to use
 
 Default: 100
 
+=== conf_broker_default_region_name
+Default region if one is not specified.
+
+Default: ""
+
+=== conf_broker_allow_region_selection
+Should the user be allowed to select the region the application is placed in.
+
+Default: true
+
+=== conf_broker_require_districts
+When true, gear placement will fail if there are no available districts
+with the correct gear profile.
+
+Default: true
+
+=== conf_broker_require_zones
+When true, gear placement will fail if there are no available zones
+with the correct gear profile.
+
+Default: false
+
+=== conf_broker_zone_min_gear_group
+desired minimum number of zones between which gears in application
+gear groups are distributed.
+
+Default: 1
+
 === broker_dns_plugin
 
 DNS plugin used by the broker to register application DNS entries.

manifests/init.pp

@@ -433,6 +433,34 @@
 #   Session secrets used to encode cookies used by console and broker. This
 #   value must be the same on all broker nodes.
 #
+# [*conf_broker_default_region_name*]
+#  Default region if one is not specified.
+# 
+#  Default: ""
+# 
+# [*conf_broker_allow_region_selection*]
+#  Should the user be allowed to select the region the application is placed in.
+# 
+#  Default: true
+# 
+# [*conf_broker_require_districts*]
+#  When true, gear placement will fail if there are no available districts
+#  with the correct gear profile.
+# 
+#  Default: true
+# 
+# [*conf_broker_require_zones*]
+#  When true, gear placement will fail if there are no available zones
+#  with the correct gear profile.
+# 
+#  Default: false
+# 
+# [*conf_broker_zone_min_gear_group*]
+#  desired minimum number of zones between which gears in application
+#  gear groups are distributed.
+# 
+#  Default: 1
+#
 # [*conf_valid_gear_sizes*]
 #   List of all gear sizes this will be used in this OpenShift installation.
 #   Default: ['small']
@@ -864,6 +892,11 @@
   $conf_broker_auth_salt                = inline_template('<%= require "securerandom"; SecureRandom.base64 %>'),
   $conf_broker_auth_private_key         = undef,
   $conf_broker_session_secret           = undef,
+  $conf_broker_default_region_name      = '',
+  $conf_broker_allow_region_selection   = false,
+  $conf_broker_require_districts        = true,
+  $conf_broker_require_zones            = false,
+  $conf_broker_zone_min_gear_group      = '1',
   $conf_broker_multi_haproxy_per_node   = false,
   $conf_console_product_logo            = undef,
   $conf_console_product_title           = undef,

templates/broker/broker.conf.erb

@@ -179,3 +179,10 @@ DEFAULT_APP_TEMPLATES=
 # All node platforms must be present in the node network.
 # In the case of conflicting cartridges, priority is given to the platforms with a lower index.
 # NODE_PLATFORMS=linux
+
+# Default region for new applications
+DEFAULT_REGION_NAME="<%= scope.lookupvar('::openshift_origin::conf_broker_default_region_name') %>"
+
+# Allow region selection when creating applications. Default is true
+ALLOW_REGION_SELECTION="<%= scope.lookupvar('::openshift_origin::conf_broker_allow_region_selection') %>"
+

templates/broker/msg-broker-mcollective.conf.erb

@@ -8,7 +8,7 @@ DISTRICTS_ENABLED=true
 
 # Require new gears to be placed in a district; when true, placement will fail
 # if there isn't a district with capacity and the right gear profile.
-DISTRICTS_REQUIRE_FOR_APP_CREATE=false
+DISTRICTS_REQUIRE_FOR_APP_CREATE=<%= scope.lookupvar('::openshift_origin::conf_broker_require_districts') %>
 
 # Used as the default max gear capacity when creating a district.
 DISTRICTS_MAX_CAPACITY=6000
@@ -28,7 +28,7 @@ NODE_PROFILE_ENABLED=true
 
 # Require new gears to be placed in a Region/Zone; when true, placement will fail
 # if there isn't a region/zone with right gear profile.
-ZONES_REQUIRE_FOR_APP_CREATE=false
+ZONES_REQUIRE_FOR_APP_CREATE=<%= scope.lookupvar('::openshift_origin::conf_broker_require_zones') %>
 
 # Minimum zones required for gears in application gear group to be distributed.
-ZONES_MIN_PER_GEAR_GROUP=1
+ZONES_MIN_PER_GEAR_GROUP=<%= scope.lookupvar('::openshift_origin::conf_broker_zone_min_gear_group') %>