bosh_cli_plugin_redis 0.2.1 → 0.2.2

data/ChangeLog.md

@@ -8,11 +8,13 @@ Converted into a bosh plugin. Prefix "bosh" to the sub-commands below:
     prepare redis 
         Prepare bosh for deploying one or more Redis services 
 
-    create redis [--name] [--size] [--security_group] 
+    create redis [--name redis-<timestamp>] [--size small] [--disk 4096] 
+                 [--security-group default] 
         Create a Redis service deployed upon target bosh 
-        --name           Unique name for service (within bosh & cloud foundry) 
-        --size           Size of provisioned VMs 
-        --security_group Security group to assign to provisioned VMs 
+        --name redis-<timestamp> Unique bosh deployment name 
+        --size small             Size of provisioned VMs 
+        --disk 4096              Size of persistent disk (Mb) 
+        --security-group default Security group to assign to provisioned VMs 
 
     show redis uri 
         Show the redis URI for connection via bosh DNS 
@@ -25,6 +27,7 @@ Note: the `cf bind-redis-env-var` command has been removed as it is a) specific
 Other features/fixes:
 
 * Validates the resource size with available sizes in the template [v0.2.1]
+* `bosh create redis --disk 10000` to disk persistent disk size (Mb) [v0.2.2]
 
 ## v0.1 - redis-cf-plugin
 

data/README.md

@@ -55,11 +55,17 @@ Uploading new redis release to bosh...
 To create/provision a new redis service you run the following command. By default, it will select the smallest known instance size.
 
 ```
-$ bosh create redis myapp-redis
-$ bosh create redis myapp-redis --size small
-$ bosh create redis myapp-redis --size medium
-$ bosh create redis myapp-redis --size large
-$ bosh create redis myapp-redis --size xlarge
+$ bosh create redis
+$ bosh create redis --size small
+$ bosh create redis --size medium
+$ bosh create redis --size large
+$ bosh create redis --size xlarge
+```
+
+By default the redis server is assigned a 4096 Mb persistent volume/disk. To change this value use `--disk`:
+
+```
+$ bosh create redis myapp-redis --disk 8192
 ```
 
 NOTE: By default, the `default` security group is used. It must have port `6379` open.

data/bosh_cli_plugin_redis.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |spec|
   spec.name          = "bosh_cli_plugin_redis"
-  spec.version       = "0.2.1"
+  spec.version       = "0.2.2"
   spec.authors       = ["Dr Nic Williams"]
   spec.email         = ["drnicwilliams@gmail.com"]
   spec.description   = %q{Create dedicated Redis servers using Bosh}

data/bosh_release/templates/aws/sample_deployment_file.yml

@@ -14,3 +14,5 @@ properties:
   redis:
     resource: medium
     security_group: redis-server
+    redis_persistent_disk: 4096
+    

data/bosh_release/templates/aws/single_vm.yml.erb

@@ -22,6 +22,7 @@ redis_sg = find("properties.redis.security_group")
 redis_port = 6379
 redis_password = random_string 12, :redis
 redis_resource = find("properties.redis.resource")
+redis_persistent_disk = find("properties.redis.persistent_disk")
 -%>
 name: <%= find("name") %>
 director_uuid: <%= find("director_uuid") %>
@@ -98,10 +99,12 @@ jobs:
     default:
     - dns
     - gateway
+  persistent_disk: <%= redis_persistent_disk %>
 
 properties:
   redis:
     resource: <%= redis_resource %>
     security_group: <%= redis_sg %>
+    persistent_disk: <%= redis_persistent_disk %>
     port: <%= redis_port %>
     password: <%= redis_password %>

data/bosh_release/templates/aws/spec

@@ -10,4 +10,5 @@ properties:
   description: Resource/flavor of instance to use
 - name: redis.security_group
   description: Security group for instance(s). Must have TCP ports 22 & 6379 open.
-  default: default
+- name: redis.persistent_disk
+  description: Size of persistent disk for servers

data/bosh_release/templates/openstack/sample_deployment_file.yml

@@ -14,3 +14,4 @@ properties:
   redis:
     resource: medium
     security_group: redis-server
+    redis_persistent_disk: 4096

data/bosh_release/templates/openstack/single_vm.yml.erb

@@ -22,6 +22,7 @@ redis_sg = find("properties.redis.security_group")
 redis_port = 6379
 redis_password = random_string 12, :redis
 redis_resource = find("properties.redis.resource")
+redis_persistent_disk = find("properties.redis.persistent_disk")
 -%>
 name: <%= find("name") %>
 director_uuid: <%= find("director_uuid") %>
@@ -98,10 +99,12 @@ jobs:
     default:
     - dns
     - gateway
+  persistent_disk: <%= redis_persistent_disk %>
 
 properties:
   redis:
     resource: <%= redis_resource %>
     security_group: <%= redis_sg %>
+    persistent_disk: <%= redis_persistent_disk %>
     port: <%= redis_port %>
     password: <%= redis_password %>

data/bosh_release/templates/openstack/spec

@@ -10,4 +10,5 @@ properties:
   description: Resource/flavor of instance to use
 - name: redis.security_group
   description: Security group for instance(s). Must have TCP ports 22 & 6379 open.
-  default: default
+- name: redis.persistent_disk
+  description: Size of persistent disk for servers

data/lib/bosh/cli/commands/redis.rb

@@ -53,24 +53,27 @@ module Bosh::Cli::Command
     desc "Create a Redis service deployed upon target bosh"
     option "--name redis-<timestamp>", String, "Unique bosh deployment name"
     option "--size small", String, "Size of provisioned VMs"
+    option "--disk 4096", Integer, "Size of persistent disk (Mb)"
     option "--security-group default", String, "Security group to assign to provisioned VMs"
     def create_redis
       auth_required
 
       service_name = options[:name] || default_name
       resource_size = options[:size] || default_size
+      persistent_disk = options[:disk] || default_persistent_disk
       security_group = options[:security_group] || default_security_group
       redis_port = 6379
 
       bosh_status # preload
       nl
-      say "CPI: #{bosh_cpi}"
+      say "CPI: #{bosh_cpi.make_green}"
       say "Deployment name: #{service_name.make_green}"
       say "Resource size: #{validated_resource_size_colored(resource_size)}"
+      say "Persistent disk: #{persistent_disk.to_s.make_green}"
       say "Security group: #{security_group.make_green}"
       nl
 
-      step("Validating resource size", "Resource size must be in #{available_resource_sizes.join(', ')}", :fatal) do
+      step("Validating resource size", "Resource size must be in #{available_resource_sizes.join(', ')}", :non_fatal) do
         available_resource_sizes.include?(resource_size)
       end
 
@@ -81,6 +84,8 @@ module Bosh::Cli::Command
         cancel_deployment
       end
 
+      raise Bosh::Cli::ValidationHalted unless errors.empty?
+
       template_file = template_file("single_vm.yml.erb")
 
       # Create an initial deployment file; upon which the CPI-specific template will be applied below
@@ -154,6 +159,10 @@ module Bosh::Cli::Command
       "small"
     end
 
+    def default_persistent_disk
+      4096
+    end
+
     def default_security_group
       "default"
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bosh_cli_plugin_redis
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.2
   prerelease: 
 platform: ruby
 authors:
@@ -104,7 +104,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -3254480115549192426
+      hash: -4483315635940311713
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -113,7 +113,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -3254480115549192426
+      hash: -4483315635940311713
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.25