sparkle_formation 2.1.4 → 2.1.6

data/lib/sparkle_formation/resources/rackspace_resources.json

@@ -190,33 +190,6 @@
       }
     }
   },
-  "OS::Heat::ResourceChain": {
-    "properties": [
-      "concurrent",
-      "resource_properties",
-      "resources"
-    ],
-    "full_properties": {
-      "resources": {
-        "description": "The list of resource types to create. This list may contain type names or aliases defined in the resource registry. Specific template names are not supported.",
-        "required": true,
-        "type": "list",
-        "update_causes": "none"
-      },
-      "concurrent": {
-        "description": "If true, the resources in the chain will be created concurrently. If false or omitted, each resource will be treated as having a dependency on the previous resource in the list.",
-        "required": false,
-        "type": "boolean",
-        "update_causes": "replacement"
-      },
-      "resource_properties": {
-        "description": "Properties to pass to each resource being created in the chain.",
-        "required": false,
-        "type": "map",
-        "update_causes": "replacement"
-      }
-    }
-  },
   "OS::Heat::ResourceGroup": {
     "properties": [
       "count",
@@ -507,7 +480,9 @@
   "OS::Heat::TestResource": {
     "properties": [
       "action_wait_secs",
+      "attr_wait_secs",
       "client_name",
+      "constraint_prop_secs",
       "entity_name",
       "fail",
       "update_replace",
@@ -521,12 +496,24 @@
         "type": "map",
         "update_causes": "none"
       },
+      "attr_wait_secs": {
+        "description": "Number value for timeout during resolving output value.",
+        "required": false,
+        "type": "number",
+        "update_causes": "none"
+      },
       "client_name": {
         "description": "Client to poll.",
         "required": false,
         "type": "string",
         "update_causes": "none"
       },
+      "constraint_prop_secs": {
+        "description": "Number value for delay during resolve constraint.",
+        "required": false,
+        "type": "number",
+        "update_causes": "none"
+      },
       "entity_name": {
         "description": "Client entity to poll.",
         "required": false,
@@ -559,40 +546,6 @@
       }
     }
   },
-  "OS::Neutron::AddressScope": {
-    "properties": [
-      "ip_version",
-      "name",
-      "shared",
-      "tenant_id"
-    ],
-    "full_properties": {
-      "name": {
-        "description": "The name for the address scope.",
-        "required": true,
-        "type": "string",
-        "update_causes": "none"
-      },
-      "ip_version": {
-        "description": "Address family of the address scope, which is 4 or 6.",
-        "required": false,
-        "type": "integer",
-        "update_causes": "replacement"
-      },
-      "shared": {
-        "description": "Whether the address scope should be shared to other tenants. Note that the default policy setting restricts usage of this attribute to administrative users only, and restricts changing of shared address scope to unshared with update.",
-        "required": false,
-        "type": "boolean",
-        "update_causes": "none"
-      },
-      "tenant_id": {
-        "description": "The owner tenant ID of the address scope. Only administrative users can specify a tenant ID other than their own.",
-        "required": false,
-        "type": "string",
-        "update_causes": "replacement"
-      }
-    }
-  },
   "OS::Neutron::Net": {
     "properties": [
       "admin_state_up",
@@ -670,7 +623,7 @@
         "description": "Network this port belongs to. If you plan to use current port to assign Floating IP, you should specify fixed_ips with subnet.  Note if this changes to a different network update, the port will be replaced",
         "required": true,
         "type": "string",
-        "update_causes": "none"
+        "update_causes": "replacement"
       },
       "device_id": {
         "description": "Device ID of this port.",
@@ -710,6 +663,47 @@
       }
     }
   },
+  "OS::Neutron::RBACPolicy": {
+    "properties": [
+      "action",
+      "object_id",
+      "object_type",
+      "target_tenant",
+      "tenant_id"
+    ],
+    "full_properties": {
+      "action": {
+        "description": "Action for the RBAC policy.",
+        "required": true,
+        "type": "string",
+        "update_causes": "replacement"
+      },
+      "object_id": {
+        "description": "ID or name of the RBAC object.",
+        "required": true,
+        "type": "string",
+        "update_causes": "replacement"
+      },
+      "object_type": {
+        "description": "Type of the object that RBAC policy affects.",
+        "required": true,
+        "type": "string",
+        "update_causes": "replacement"
+      },
+      "target_tenant": {
+        "description": "ID of the tenant to which the RBAC policy will be enforced.",
+        "required": true,
+        "type": "string",
+        "update_causes": "none"
+      },
+      "tenant_id": {
+        "description": "The owner tenant ID. Only required if the caller has an administrative role and wants to create a RBAC for another tenant.",
+        "required": false,
+        "type": "string",
+        "update_causes": "replacement"
+      }
+    }
+  },
   "OS::Neutron::SecurityGroup": {
     "properties": [
       "description",
@@ -1068,13 +1062,13 @@
         "description": "Reference to a flavor for creating DB instance.",
         "required": true,
         "type": "string",
-        "update_causes": "replacement"
+        "update_causes": "none"
       },
       "size": {
         "description": "Database volume size in GB.",
         "required": true,
         "type": "integer",
-        "update_causes": "replacement"
+        "update_causes": "none"
       },
       "availability_zone": {
         "description": "Name of the availability zone for DB instance.",
@@ -1086,7 +1080,7 @@
         "description": "List of databases to be created on DB instance creation.",
         "required": false,
         "type": "list",
-        "update_causes": "replacement"
+        "update_causes": "none"
       },
       "datastore_type": {
         "description": "Name of registered datastore type.",
@@ -1104,7 +1098,7 @@
         "description": "Name of the DB instance to create.",
         "required": false,
         "type": "string",
-        "update_causes": "replacement"
+        "update_causes": "none"
       },
       "networks": {
         "description": "List of network interfaces to create on instance.",
@@ -1134,7 +1128,7 @@
         "description": "List of users to be created on DB instance creation.",
         "required": false,
         "type": "list",
-        "update_causes": "replacement"
+        "update_causes": "none"
       }
     }
   },
@@ -1305,7 +1299,8 @@
       "StartTimeMinute",
       "TimeZoneId",
       "VersionRetention",
-      "host_ip_address"
+      "host_ip_address",
+      "server"
     ],
     "full_properties": {
       "BackupConfigurationName": {
@@ -1368,12 +1363,6 @@
         "type": "string",
         "update_causes": "none"
       },
-      "host_ip_address": {
-        "description": "Cloud server ip address.",
-        "required": true,
-        "type": "string",
-        "update_causes": "replacement"
-      },
       "Enabled": {
         "description": "Indicates backup configuration is enabled or not.",
         "required": false,
@@ -1409,6 +1398,18 @@
         "required": false,
         "type": "integer",
         "update_causes": "none"
+      },
+      "host_ip_address": {
+        "description": "The IP address of the server to back up. Required if “server” is not specifed; should be omitted otherwise.",
+        "required": false,
+        "type": "string",
+        "update_causes": "replacement"
+      },
+      "server": {
+        "description": "The id of the Cloud Server to back up. Required if “host_ip_address” is not specified; should be omitted otherwise.",
+        "required": false,
+        "type": "string",
+        "update_causes": "replacement"
       }
     }
   },
@@ -1687,6 +1688,61 @@
       }
     }
   },
+  "Rackspace::Cloud::LBNode": {
+    "properties": [
+      "address",
+      "condition",
+      "draining_timeout",
+      "load_balancer",
+      "port",
+      "type",
+      "weight"
+    ],
+    "full_properties": {
+      "address": {
+        "description": "IP address for the node.",
+        "required": true,
+        "type": "string",
+        "update_causes": "replacement"
+      },
+      "load_balancer": {
+        "description": "The ID of the load balancer to associate the node with.",
+        "required": true,
+        "type": "string",
+        "update_causes": "replacement"
+      },
+      "port": {
+        "description": "Integer value expected.",
+        "required": true,
+        "type": "updates",
+        "update_causes": "unknown"
+      },
+      "condition": {
+        "description": "String value expected.",
+        "required": false,
+        "type": "can",
+        "update_causes": "unknown"
+      },
+      "draining_timeout": {
+        "description": "The time to wait, in seconds, for the node to drain before it is deleted.",
+        "required": false,
+        "type": "integer",
+        "update_causes": "none"
+      },
+      "type": {
+        "description": "String value expected.",
+        "required": false,
+        "type": "can",
+        "update_causes": "unknown"
+      },
+      "weight": {
+        "description": "Number value expected.",
+        "required": false,
+        "type": "can",
+        "update_causes": "unknown"
+      }
+    }
+  },
   "Rackspace::Cloud::LoadBalancer": {
     "properties": [
       "accessList",
@@ -1999,6 +2055,47 @@
       }
     }
   },
+  "Rackspace::CloudDatabase::ScheduledBackup": {
+    "properties": [
+      "day_of_week",
+      "full_backup_retention",
+      "hour",
+      "minute",
+      "source"
+    ],
+    "full_properties": {
+      "source": {
+        "description": "The database or HA instance to back up.",
+        "required": true,
+        "type": "map",
+        "update_causes": "replacement"
+      },
+      "day_of_week": {
+        "description": "The day of the week to run the backup. Sunday is 0.",
+        "required": false,
+        "type": "integer",
+        "update_causes": "none"
+      },
+      "full_backup_retention": {
+        "description": "The number of full automated backups to keep.",
+        "required": false,
+        "type": "integer",
+        "update_causes": "none"
+      },
+      "hour": {
+        "description": "The hour of the day to run the backup. Midnight is 0.",
+        "required": false,
+        "type": "integer",
+        "update_causes": "none"
+      },
+      "minute": {
+        "description": "The minute of the hour to run the backup.",
+        "required": false,
+        "type": "integer",
+        "update_causes": "none"
+      }
+    }
+  },
   "Rackspace::CloudMonitoring::AgentToken": {
     "properties": [
       "label"

data/lib/sparkle_formation/sparkle_formation.rb

@@ -357,10 +357,6 @@ class SparkleFormation
   attr_reader :dynamics_directory
   # @return [String] registry path
   attr_reader :registry_directory
-  # @return [Array] components to load
-  attr_reader :components
-  # @return [Array] order of loading
-  attr_reader :load_order
   # @return [Hash] parameters for stack generation
   attr_reader :parameters
   # @return [SparkleFormation] parent stack
@@ -377,6 +373,8 @@ class SparkleFormation
   attr_accessor :template_path
   # @return [Array<String>] black listed templates
   attr_reader :blacklisted_templates
+  # @return [Composition]
+  attr_reader :composition
 
   # Create new instance
   #
@@ -389,7 +387,7 @@ class SparkleFormation
   # @option options [Hash] :parameters parameters for stack generation
   # @option options [Truthy, Falsey] :disable_aws_builtins do not load builtins
   # @yield base context
-  def initialize(name, options={}, &block)
+  def initialize(name, options={}, &base_block)
     @name = name.to_sym
     @component_paths = []
     if(options[:sparkle_collection])
@@ -423,25 +421,18 @@ class SparkleFormation
       *options.fetch(:stack_resource_types, [])
     ].compact.uniq
     @blacklisted_templates = [name]
-    @components = Smash.new
-    @load_order = []
-    @overrides = []
+    @composition = Composition.new(self)
     @parent = options[:parent]
     @seed = Smash.new(
       :inherit => options[:inherit],
       :layering => options[:layering]
     )
-    if(block)
-      load_block(block)
+    if(base_block)
+      load_block(base_block)
     end
     @compiled = nil
   end
 
-  # @return [Array<Proc>]
-  def raw_overrides
-    @overrides
-  end
-
   # Update underlying data structures based on inherit
   # or layering behavior if defined for this template
   #
@@ -494,6 +485,7 @@ class SparkleFormation
   # @param template [SparkleFormation]
   # @return [self]
   def extract_template_data(template)
+    # TODO: Should allow forced override here for cases like: openstack -> rackspace
     if(provider != template.provider)
       raise TypeError.new "This template `#{name}` cannot inherit template `#{template.name}`! Provider mismatch: `#{provider}` != `#{template.provider}`" # rubocop:disable Metrics/LineLength
     end
@@ -502,20 +494,22 @@ class SparkleFormation
     blacklisted_templates.replace(
       (blacklisted_templates + template.blacklisted_templates).map(&:to_s).uniq
     )
-    @parameters = template.parameters
-    @overrides = template.raw_overrides + raw_overrides
-    new_components = template.components
-    new_load_order = template.load_order
-    load_order.each do |comp_key|
-      if(components[comp_key])
-        original_key = comp_key
-        comp_key = "#{comp_key}_#{Smash.new(:name => name, :path => template_path).checksum}_child"
-        new_components[comp_key] = components[original_key]
-      end
-      new_load_order << comp_key
-    end
-    @components = new_components
-    @load_order = new_load_order
+    @parameters = template.parameters.to_smash.deep_merge(parameters.to_smash)
+    new_composition = Composition.new(self,
+      :components => template.composition.composite,
+      :overrides => composition.overrides
+    )
+    composition.components.each do |item|
+      if(item.respond_to?(:key) && item.key == '__base__')
+        item.key = Smash.new(
+          :template => name,
+          :component => :__base__,
+          :object_id => object_id
+        ).checksum.to_s
+      end
+      new_composition.add_component(item)
+    end
+    @composition = new_composition
     self
   end
 
@@ -626,8 +620,7 @@ class SparkleFormation
   # @param block [Proc]
   # @return [TrueClass]
   def block(block)
-    @components[:__base__] = block
-    @load_order << :__base__
+    composition.new_component(:__base__, &block)
     true
   end
   alias_method :load_block, :block
@@ -638,14 +631,13 @@ class SparkleFormation
   # @return [self]
   def load(*args)
     args.each do |thing|
-      key = File.basename(thing.to_s).sub('.rb', '')
       if(thing.is_a?(String))
         # NOTE: This needs to be deprecated and removed
         # TODO: deprecate
-        components[key] = self.class.load_component(thing)
-        @load_order << key
+        key = File.basename(thing.to_s).sub('.rb', '')
+        composition.new_component(key, &self.class.load_component(thing))
       else
-        @load_order << thing
+        composition.new_component(thing)
       end
     end
     self
@@ -656,7 +648,7 @@ class SparkleFormation
   # @param args [Hash] optional arguments to provide state
   # @yield override block
   def overrides(args={}, &block)
-    @overrides << {:args => args, :block => block}
+    composition.new_override(args, &block)
     self
   end
 
@@ -701,21 +693,23 @@ class SparkleFormation
       if(compile_state)
         compiled.set_state!(compile_state)
       end
-      @load_order.each do |key|
-        if(components[key])
-          self.class.build(compiled, &components[key])
-        else
-          sparkle.get(:component, key).monochrome.each do |component_block|
-            self.class.build(compiled, &component_block[:block])
+      composition.each do |item|
+        case item
+        when Composition::Component
+          if(item.block)
+            self.class.build(compiled, &item.block)
+          else
+            sparkle.get(:component, item.key).monochrome.each do |component_block|
+              self.class.build(compiled, &component_block[:block])
+            end
           end
+        when Composition::Override
+          if(item.args && !item.args.empty?)
+            compiled._set_state(item.args)
+          end
+          self.class.build(compiled, &item.block)
         end
       end
-      @overrides.each do |override|
-        if(override[:args] && !override[:args].empty?)
-          compiled._set_state(override[:args])
-        end
-        self.class.build(compiled, &override[:block])
-      end
       if(compile_state && !compile_state.empty?)
         compiled.outputs.compile_state.value MultiJson.dump(compile_state)
       end