Merge pull request #78 from johanherman/stackstorm-version-1.4.0

Stackstorm version 1.4.0
arteria-project · May 12, 2016 · 840e7d0 · 840e7d0
2 parents c0dbdb6 + b62b077
commit 840e7d0
Show file tree

Hide file tree

Showing 58 changed files with 377 additions and 665 deletions.
diff --git a/.gitignore b/.gitignore
@@ -2,3 +2,4 @@
 *.swp
 private_key*
 arteria_user.key*
+*.retry
diff --git a/ansible-st2-local/playbooks/arteriaexpress.yaml b/ansible-st2-local/playbooks/arteriaexpress.yaml
@@ -3,9 +3,8 @@
   remote_user: vagrant
   hosts: master
   vars:
-    st2_version: 0.13.2
-    st2_revision: 5
-    st2web_version: 0.13.2
+    st2_version: 1.4.0
+    st2_revision: 8
     st2_system_user_in_sudoers: no
     st2_system_user: arteria
     st2_auth_username: testu

diff --git a/ansible-st2-local/roles/arteria/tasks/main.yml b/ansible-st2-local/roles/arteria/tasks/main.yml
@@ -6,8 +6,17 @@
 - include: conf.yml
   tags: arteria_master_conf
 
-- name: Pause for 1 minute until stackstorm services are up and online
-  pause: minutes=1
+# This is needed because handlers are run last, after all tasks are finished, 
+# which is obviously too late for us
+- command: /bin/true
+  notify: 
+    - restart st2
+    - Restart nginx
+  tags: arteria_register_components
+
+- name: Force a manual (re)start of st2 services so we can register components
+  meta: flush_handlers
+  tags: arteria_register_components
 
 # FIXME: These steps has to be done manually for non-test systems at the moment, 
 # because we do not want passwords on live systems in clear text. Have to find

diff --git a/ansible-st2-local/roles/st2web/defaults/main.yml b/ansible-st2-local/roles/st2web/defaults/main.yml
diff --git a/ansible-st2-local/roles/st2web/tasks/main.yml b/ansible-st2-local/roles/st2web/tasks/main.yml
diff --git a/ansible-st2-local/roles/st2web/templates/config.js.j2 b/ansible-st2-local/roles/st2web/templates/config.js.j2
diff --git a/ansible-st2-local/symlink b/ansible-st2-local/symlink
@@ -2,8 +2,9 @@
 
 # 1. Remove ansible-st2
 # 2. Copy upstream ansible-st2
-# 3. Symlink arteria specific stuff with this script
-# 4. Commit changes
+# 3. Go into upstream ansible-st2 dir and run: ansible-galaxy install -r roles/mistral/requirements.yml
+# 4. Symlink arteria specific stuff with this script
+# 5. Commit changes
 
 SCRIPT_PATH=$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )
 

diff --git a/ansible-st2/README.md b/ansible-st2/README.md
@@ -5,9 +5,9 @@ With over [50+ integrations](https://github.com/StackStorm/st2contrib/tree/maste
 Aka IFTTT orchestration for Ops.
 
 [![Circle CI Build Status](https://circleci.com/gh/StackStorm/ansible-st2/tree/master.svg?style=shield)](https://circleci.com/gh/StackStorm/ansible-st2/tree/master)
+[![Repository deb/rpm](https://img.shields.io/badge/Repository-deb/rpm-blue.svg)](https://packagecloud.io/StackStorm/stable/)
 
 ## Supported platforms
-* Ubuntu 12.04
 * Ubuntu 14.04
 
 ## Requirements
@@ -29,9 +29,8 @@ Below is the list of variables you can redefine in your playbook to customize st
 
 | Variable              | Default       | Description  |
 | --------------------- | ------------- | ----- |
-| `st2_version`         | `stable`      | StackStorm version to install. Latest `stable`, `unstable` to get automatic updates or pin it to numeric version like `0.12.1`.
-| `st2_revision`        | `current`     | StackStorm revision to install. `current` to get latest build (autoupdating) or pin it to numeric build like `6`.
-| `st2_action_runners`  | `ansible_processor_vcpus` | Number of action runner workers to start. Defaults to number of machine vCPUs, but not less than 2.
+| `st2_version`         | `stable`      | StackStorm version to install. Use latest `stable` to get automatic updates or pin it to numeric version like `1.4.0`.
+| `st2_revision`        | `1`           | StackStorm revision to install. Used only with pinned `st2_version`.
 | `st2_system_user`     | `stanley`     | System user on whose behalf st2 would work, including remote/local action runners.
 | `st2_system_user_in_sudoers` | `yes`| Add `st2_system_user` to the sudoers (recommended for most `st2` features to work).
 | `st2_auth_username`   | `testu`       | Username used by StackStorm standalone authentication.
@@ -41,32 +40,28 @@ Below is the list of variables you can redefine in your playbook to customize st
 | `mistral_db_password` | `StackStorm`  | PostgreSQL DB password for Mistral.
 
 ## Examples
-Install `stable` StackStorm with all its components on local machine:
+Install latest `stable` StackStorm with all its components on local machine:
 ```sh
 ansible-playbook playbooks/st2express.yaml -i 'localhost,' --connection=local
 ```
 
 > Note that keeping `stable` version is useful to update StackStorm by re-running playbook, since it will reinstall st2 if there is new version available.
-This is default behavior. If you don't want updates - consider pinning version numbers. 
+This is default behavior. If you don't want updates - consider pinning version-revision numbers. 
 
 Install specific numeric version of st2 with pinned revision number as well:
 ```sh
-ansible-playbook playbooks/st2express.yaml --extra-vars='st2_version=0.12.2 st2_revision=6'
-```
-or latest unstable (development branch):
-```sh
-ansible-playbook playbooks/st2express.yaml --extra-vars='st2_version=unstable'
+ansible-playbook playbooks/st2express.yaml --extra-vars='st2_version=1.4.0 st2_revision=8'
 ```
 
 ## Other Installers
-For your best experience there are different convenient ways to install and explore StackStorm engine.
-* [All-in-one Installer](http://docs.stackstorm.com/install/all_in_one.html) - preferred way (especially for production). Graphical installer, more secure, better tested and robust.
-* [Chef](https://supermarket.chef.io/cookbooks/stackstorm)
-* [Puppet](https://forge.puppetlabs.com/stackstorm/st2)
-* [Bash](http://docs.stackstorm.com/install/index.html#installation)
-* [Vagrant](https://github.com/StackStorm/st2workroom/)
+You might be interested in other OS flavors to explore StackStorm engine:
+* [Ubuntu/Debian](https://docs.stackstorm.com/install/deb.html)
+* [RHEL7/CentOS7](https://docs.stackstorm.com/install/rhel7.html)
+* [RHEL6/CentOS7](https://docs.stackstorm.com/install/rhel6.html)
 
 ## Help
 If you're in stuck, our community always ready to help, feel free to:
-* Ask questions on [IRC: #stackStorm on freenode.net](http://webchat.freenode.net/?channels=stackstorm) or our [public Slack channel](https://stackstorm.typeform.com/to/K76GRP)
-* Report bug, provide feature request or just give us a ✮ star at [GitHub st2](https://github.com/StackStorm/st2)
+* Ask questions in our [public Slack channel](https://stackstorm.com/community-signup)
+* [Report bug](https://github.com/StackStorm/ansible-st2/issues), provide [feature request](https://github.com/StackStorm/ansible-st2/pulls) or just give us a ✮ star
+
+Your contribution is more than welcome!
diff --git a/ansible-st2/circle.yml b/ansible-st2/circle.yml
@@ -6,14 +6,16 @@ machine:
     # complete uninstall fails on CircleCI due to old kernel bugs, doing selective uninstall gently
     - sudo apt-get purge -y postgresql-9.4 postgresql-server-dev-9.4 postgresql-client-9.4 postgresql-server-dev-9.1
     # use aptitude to remove dependencies
-    - sudo aptitude remove -y ~nrabbitmq
-    - sudo aptitude remove -y ~nmongo
+    - sudo aptitude purge -y ~nrabbitmq
+    - sudo aptitude purge -y ~nmongo
     - sudo apt-get -y autoremove
     - sudo dpkg --configure -a
     - sudo apt-get -y update
 
 dependencies:
   pre:
+    - sudo apt-get install python-pip python-dev
+    - sudo pip install --upgrade  setuptools
     - sudo pip install ansible
     - ansible --version
     - ansible-galaxy install -r roles/mistral/requirements.yml

diff --git a/ansible-st2/playbooks/st2express.yaml b/ansible-st2/playbooks/st2express.yaml
@@ -4,5 +4,8 @@
   roles:
     - mongodb
     - rabbitmq
+    - st2repos
     - mistral
     - st2
+    - st2web
+    - st2smoketests
diff --git a/ansible-st2/roles/ANXS.postgresql/meta/.galaxy_install_info b/ansible-st2/roles/ANXS.postgresql/meta/.galaxy_install_info
@@ -1 +1 @@
-{install_date: 'Thu Oct  8 12:06:16 2015', version: v1.2.1}
+{install_date: 'Wed May 11 14:06:14 2016', version: v1.2.1}
diff --git a/ansible-st2/roles/mistral/defaults/main.yml b/ansible-st2/roles/mistral/defaults/main.yml
@@ -1,4 +1,4 @@
-mistral_version: 0.13
+mistral_version: stable
 mistral_db_username: mistral
 mistral_db_password: StackStorm
 mistral_db: mistral
diff --git a/ansible-st2/roles/mistral/meta/main.yml b/ansible-st2/roles/mistral/meta/main.yml
@@ -23,3 +23,4 @@ dependencies:
       - name: "{{ mistral_db_username }}"
         pass: "{{ mistral_db_password }}"
         encrypted: yes
+  - role: st2repos
diff --git a/ansible-st2/roles/mistral/tasks/config.yml b/ansible-st2/roles/mistral/tasks/config.yml
diff --git a/ansible-st2/roles/mistral/tasks/gather_facts.yml b/ansible-st2/roles/mistral/tasks/gather_facts.yml
diff --git a/ansible-st2/roles/mistral/tasks/install_actions.yml b/ansible-st2/roles/mistral/tasks/install_actions.yml
diff --git a/ansible-st2/roles/mistral/tasks/install_client.yml b/ansible-st2/roles/mistral/tasks/install_client.yml
diff --git a/ansible-st2/roles/mistral/tasks/install_deps.yml b/ansible-st2/roles/mistral/tasks/install_deps.yml
diff --git a/ansible-st2/roles/mistral/tasks/install_mistral.yml b/ansible-st2/roles/mistral/tasks/install_mistral.yml
-Original file line number
+Diff line change
@@ Expand Up / @@ -2,3 +2,4 @@ @@
     *.swp
     private_key*
     arteria_user.key*
+    *.retry
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		{install_date: 'Thu Oct 8 12:06:16 2015', version: v1.2.1}
		{install_date: 'Wed May 11 14:06:14 2016', version: v1.2.1}