Merge pull request #73 from Alfresco/develop

Develop

Author: Enzo Rivello

README.md

@@ -1,94 +1,26 @@
-Checkout the [Alfresco SPK presentation](http://www.slideshare.net/m.pillitu/alfresco-spkalfrescoday) at Alfresco Day.
+# Alfresco SPK
 
-## What is Alfresco SPK
 Alfresco SPK is a toolset that can be used by stack operators (Devops/Architects/Engineers, Support, QA, Sales, Marketing, ...) to define Alfresco immutable Images, testing them locally first, also for arbitrarily complex architectures.
 
 It allows you to:
 
-1. Run an arbitrarily complex stack locally
-2. Build (immutable) image(s) with the exact same provisioning logic used for local run
-3. Test immutable images locally
-4. Run a stack on any orchestration tool with the same provisioning logic used for local runs
+- Run an arbitrarily complex stack locally
+- Build (immutable) image(s) with the exact same provisioning logic used for local run
+- Test immutable images locally
+- Run a stack on any orchestration tool with the same provisioning logic used for local runs
 
-## Installation
-Alfresco SPK uses ([Vagrant](https://www.vagrantup.com) and) [vagrant-packer-plugin](https://github.com/Alfresco/vagrant-packer-plugin) to build images and [chef-alfresco](https://github.com/Alfresco/chef-alfresco) to install Alfresco inside the boxes.
+### How to contribute
+To avoid any problem on master, we are implementing git-flow.
+To contribute, follow this:
 
-Please install:
-* [Vagrant](https://www.vagrantup.com/downloads.html)
-* [Virtualbox](https://www.virtualbox.org/)
-* [Packer](https://packer.io/downloads.html)
+- Fork this repository
+- Make your changes
+- Test your changes
+- Open a pull request to develop
 
-To install the Vagrant Packer Plugin:
-```
-vagrant plugin install vagrant-packer-plugin
-```
 
-## Run a stack locally
-```
-git clone https://github.com/Alfresco/alfresco-spk.git
-cd alfresco-spk/stacks/community-allinone
-vagrant up
-```
-Browse [stacks](stacks) folder and change `VAGRANT_VAGRANTFILE` to test the stack of your choice; to customize it, read more about `Stack definitions` below.
+### External References
 
-## Build an Image
-```
-git clone https://github.com/Alfresco/alfresco-spk.git
-cd alfresco-spk/stacks/community-allinone
-vagrant packer-build
-```
-This will build an Amazon AMI, but could also create an OVF, Vagrant .box or any other nature [supported by Packer](https://www.packer.io/docs/templates/builders.html)
-
-## Concepts
-
-### What is an Instance template
-An Instance Template is a JSON file that includes all information to build an immutable image; it contains:
-1. chef-alfresco configuration, using Chef attributes syntax; it also includes the list of recipes to invoke (`run_list`)
-2. vagrant-packer configuration, using Packer syntax
-
-Alfresco SPK provides a [list of pre-defined instance-templates](instance-templates) that are used by the sample stacks.
-
-### Stack definitions
-In every [stack example](stack-examples) you will find the following items:
-```
-# Where the instance template is located
-instance_template_path = "../instance-templates/community-allinone.json"
-
-# chef-alfresco binary
-cookbooks_url = "https://artifacts.alfresco.com/nexus/service/local/repositories/releases/content/org/alfresco/devops/chef-alfresco/0.6.20/chef-alfresco-0.6.20.tar.gz"
-
-# chef-alfresco recipes to invoke
-run_list = ["alfresco::default"]
-```
-
-Single-instance stacks - such as [Alfresco Community Allinone](stacks/community-allinone.vagrant.rb) - are simpler to start with; if you're looking for multi-machine configurations, check [Alfresco Enterprise Clustered](stacks/enterprise-clustered.vagrant.rb)
-
-### Alfresco Enterprise
-```
-export MVN_CHEF_REPO_USERNAME=<your_nexus_user>
-export MVN_CHEF_REPO_PASSWORD=<your_nexus_password>
-
-cd stacks/enterprise-clustered
-vagrant up
-```
-
-### Integrating with Orchestration tools (WIP)
-When AMIs are (or not) in place and provisioning logic have been tested locally, it is possible to configure other orchestration tools and/or Cloud providers in order to spin up the same stack remotely.
-
-Alfresco SPK provides a [chef-bootstrap.sh](scripts/chef-bootstrap.sh) that can be used to easily integrate with the orchestration tool of your choice; below we provide an integration example using AWS Cloudformation (and [UserData](http://docs.aws.amazon.com/AWSEC2/latest/UserGuide/user-data.html) attribute)
-
-```
-CHEF_NODE_NAME=allinone
-CHEF_INSTANCE_TEMPLATE=https://raw.githubusercontent.com/alfresco/alfresco-spk/master/instance-templates/community-allinone.json
-
-CHEF_LOCAL_YAML_VARS_URL=file://$WORK_DIR/local-vars.yaml
-cat > $CHEF_LOCAL_YAML_VARS_URL << "EOF"
----
-alfresco:
-  public_hostname: '{"Fn::GetAtt": ["ElasticLoadBalancer","DNSName"]}'
-EOF
-
-ruby chef-bootstrap.rb
-```
-
-The expression `{"Fn::GetAtt": ["ElasticLoadBalancer","DNSName"]}` is Cloudformation-specific and reads the `DNSName` value of an `ElasticLoadBalancer` instance defined in the same Cloudformation template.
+- [BeeCon presentation](https://www.youtube.com/watch?v=-L1CjPA2R6E)
+- [Alfresco Tech Talk Live #95](https://www.youtube.com/watch?v=y1ZbVvy_Evc)
+- [Alfresco SPK Presentation at AlfrescoDay](http://www.slideshare.net/m.pillitu/alfresco-spkalfrescoday)

packer/provisioners/chef.json

@@ -1,7 +1,7 @@
 {
   "type": "chef-solo",
   "execute_command" : "cd /tmp/packer-chef-solo && ln -s cookbooks-0 cookbooks && {{if .Sudo}}sudo {{end}}chef-client --no-color -z -j {{.JsonPath}}",
-  "install_command": "{{if .Sudo}}sudo {{end}}bash -c 'curl -L https://www.opscode.com/chef/install.sh| bash -s'",
+  "install_command": "{{if .Sudo}}sudo {{end}}bash -c 'curl -L https://www.opscode.com/chef/install.sh| bash -s -- -v {{ user `chef_version` }}'",
   "prevent_sudo": false,
   "skip_install": false,
   "run_list": ["{{user `run_list_item`}}"]