Merge pull request #43 from ripienaar/020

(misc) Release 0.2.0
choria-io · Aug 25, 2018 · a559cd9 · a559cd9
2 parents 9177dc6 + 8676467
commit a559cd9
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 2 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,8 @@
 |Date      |Issue |Description                                                                                              |
 |----------|------|---------------------------------------------------------------------------------------------------------|
+|2018/08/25|      |Release 0.2.0                                                                                            |
+|2018/08/25|38    |Listen for node life cycle events where component is `provision_mode_server`                             |
+|2018/08/24|36    |Emit a startup life cycle event with component `provisioner`                                             |
 |2018/08/09|      |Release 0.1.0                                                                                            |
 |2018/08/09|32    |Record successfully provisioned node counts                                                              |
 |2018/08/09|24    |Record busy workers in stats                                                                             |

diff --git a/README.md b/README.md
@@ -22,6 +22,8 @@ After this flow the node will join it's configured Member Collective with it's s
 
 You can invoke the `choria_provision#reprovision` action to ask it to leave its Member Collective and re-enter the provisioning flow.
 
+If you have a token compiled in you can restart a server when not in provisioning mode with the token via the `choria_provision#restart` action.
+
 This project includes a provisioner that you can use, it will call a `helper` that you provide and can write in any language to integrate with your CA and generate configuration.
 
 **WARNING** At present Choria Server does not yet support something like the Action Policy ACL system and inherently during provision there is no CA to provide Authentication against. While a token is supported the token is easily found in the `choria` binary.  Keep this in mind before adopting this approach.
@@ -167,9 +169,9 @@ Nodes will be discovered at startup and then every `interval` period:
   * Discover all nodes
     * Add each node to the work list
 
-It will also listen on the network for registration events:
+It will also listen on the network for registration and lifecycle events:
 
-  * Listen for node registration events
+  * Listen for node registration and lifecycle events
     * Add each node to the work list
 
 Regardless of how a node was found, this is the flow it will do:
@@ -182,6 +184,8 @@ Regardless of how a node was found, this is the flow it will do:
     * Configure the node using `choria_provision#configure`
     * Restart the node using `choria_provision#restart`
 
+When this provisioner start up it will emit a `choria:lifecycle:startup:1` event with component `provisioner`.
+
 #### Writing the helper
 
 Your helper can be written in any language, it will receive JSON on its STDIN and should return JSON on its STDOUT. It should complete within 10 seconds and could be called concurrently.