diff options
| author | Micah Anderson <micah@leap.se> | 2014-05-22 16:38:28 -0400 |
|---|---|---|
| committer | Micah Anderson <micah@leap.se> | 2014-05-22 16:38:28 -0400 |
| commit | 6100b6ded99241f10e7fb12c13a0820fda084912 (patch) | |
| tree | 863a9120010f32fdae304af94cd102c1da5096a6 /platform.rb | |
| parent | 327d5c934e408f90011d7949b89ab01fed88998e (diff) | |
| parent | a622e49c5df2150049afb6f6ed47177537b7e6da (diff) | |
Merge branch 'develop' (0.5.1)0.5.1
Change-Id: I4e9d845f9758232f4da0d4bfbf785e52982b825b
Diffstat (limited to 'platform.rb')
| -rw-r--r-- | platform.rb | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/platform.rb b/platform.rb index 689c58b7..d36cb3af 100644 --- a/platform.rb +++ b/platform.rb @@ -4,7 +4,7 @@ # Leap::Platform.define do - self.version = "0.4.0" + self.version = "0.5.2" self.compatible_cli = "1.5.0".."1.99" # @@ -27,12 +27,16 @@ Leap::Platform.define do # input config files :common_config => 'common.json', :provider_config => 'provider.json', - :provider_env_config => 'provider.#{arg}.json', :secrets_config => 'secrets.json', :node_config => 'nodes/#{arg}.json', :service_config => 'services/#{arg}.json', :tag_config => 'tags/#{arg}.json', + # input config files, environmentally scoped + :provider_env_config => 'provider.#{arg}.json', + :service_env_config => 'services/#{arg[0]}.#{arg[1]}.json', + :tag_env_config => 'tags/#{arg[0]}.#{arg[1]}.json', + # input templates :provider_json_template => 'files/service-definitions/provider.json.erb', :eip_service_json_template => 'files/service-definitions/#{arg}/eip-service.json.erb', |