Merge "Clean up readme and unused logic"

README.md

@@ -1,4 +1,6 @@
 detach-rabbitmq
-============
+===============
 
-Plugin description
+This plugin enables a user to deploy RabbitMQ on a separate host from
+controller. This plugin serves as an example of flexible granular deployment
+options for Fuel.

deployment_scripts/rabbitmq_hiera_override.pp

@@ -11,17 +11,15 @@ if ($detach_rabbitmq_plugin) {
   $rabbit_nodes = get_nodes_hash_by_roles($network_metadata, $rabbitmq_roles)
 #lint:ignore:80chars
   $rabbit_address_map = get_node_to_ipaddr_map_by_network_role($rabbit_nodes, 'mgmt/messaging')
-  $yaml_additional_config = pick($detach_rabbitmq_plugin['yaml_additional_config'], {})
 #lint:endignore
   $amqp_port = hiera('amqp_port', '5673')
   $rabbit_nodes_ips = values($rabbit_address_map)
   $rabbit_nodes_names = keys($rabbit_address_map)
-  $settings_hash = parseyaml($yaml_additional_config)
 
   case hiera_array('roles', 'none') {
     /rabbitmq/: {
       $rabbit_enabled = true
-      $corosync_roles = $rabbitmq_roles 
+      $corosync_roles = $rabbitmq_roles
       $deploy_vrouter = false
       # Set to true HA
       $corosync_nodes = $rabbit_nodes
@@ -59,7 +57,7 @@ deploy_vrouter: <%= @deploy_vrouter %>
   } ->
   file { "${hiera_dir}/${plugin_yaml}":
     ensure  => file,
-    content => "${detach_rabbitmq_plugin['yaml_additional_config']}\n${calculated_content}\n",
+    content => "${calculated_content}\n",
   }
 
   package {'ruby-deep-merge':

environment_config.yaml

@@ -1,16 +1,4 @@
 attributes:
   metadata:
-    label: "Rabbitmq settings"
+    label: "Detach RabbitMQ Plugin"
     weight: 90
-  # Gathering variables from user about our DCP
-  yaml_additional_config:
-    type: "textarea"
-    weight: 52
-    value: |
-      # TODO: fill me out
-      queue_provider: 'rabbitmq'
-    label: "Additional config"
-    description: "Just put here valid yaml"
-    regex:
-      source: '.+'
-      error: "This field should not be empty"

metadata.yaml

@@ -3,7 +3,7 @@ name: detach-rabbitmq
 # Human-readable name for your plugin
 title: Separate rabbitmq from controller
 # Plugin version
-version: '1.0.0'
+version: '1.0.1'
 # Description
 description: Creates seperate RabbitMQ role for deploying
 # Required fuel version
@@ -13,7 +13,7 @@ licenses: ['Apache License Version 2.0']
 # Specify author or company name
 authors: ['Alex Schultz','Mirantis']
 # A link to the plugin's page
-homepage: 'https://github.com/stackforge/fuel-plugins'
+homepage: 'https://github.com/stackforge/fuel-plugin-detach-rabbitmq'
 # Specify a group which your plugin implements, possible options:
 # network, storage, storage::cinder, storage::glance, hypervisor
 groups: [network]

tasks.yaml

@@ -1,7 +1,3 @@
-# This tasks will be applied on controller nodes,
-# here you can also specify several roles, for example
-# ['cinder', 'compute'] will be applied only on
-# cinder and compute nodes
 - role: '*'
   stage: pre_deployment
   type: shell