Updating to use deb packages

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

playbooks/st2express.yaml

@@ -4,5 +4,8 @@
   roles:
     - mongodb
     - rabbitmq
+    - st2repos
     - mistral
     - st2
+    - st2web
+    - st2smoketests

roles/mistral/defaults/main.yml

@@ -1,4 +1,4 @@
-mistral_version: 0.13
+mistral_version: 1.3.2-99
 mistral_db_username: mistral
 mistral_db_password: StackStorm
 mistral_db: mistral

roles/mistral/meta/main.yml

@@ -23,3 +23,4 @@ dependencies:
       - name: "{{ mistral_db_username }}"
         pass: "{{ mistral_db_password }}"
         encrypted: yes
+  - role: st2repos

roles/mistral/tasks/main.yml

@@ -1,7 +1,67 @@
-- include: gather_facts.yml
-- include: install_deps.yml
-- include: install_mistral.yml
-- include: install_actions.yml
-- include: config.yml
-- include: sync.yml
-- include: install_client.yml
+---
+
+- name: Install st2mistral
+  sudo: yes
+  apt: 
+    name: st2mistral={{ mistral_version }}
+    state: present
+
+- name: Configure mistral
+  sudo: yes
+  ini_file:
+    dest: /etc/mistral/mistral.conf
+    section: database
+    option: connection
+    value: postgresql://{{ mistral_db_username }}:{{ mistral_db_password }}@localhost/{{ mistral_db }}
+    backup: yes
+
+- name: Deploy database init script
+  sudo: yes
+  template:
+    src: init_mistral_db.SQL.j2
+    dest: /etc/mistral/init_mistral_db.SQL 
+  notify: 
+    - restart mistral
+
+- name: Initiate database
+  become: yes
+  become_user: postgres
+  shell: psql < /etc/mistral/init_mistral_db.SQL
+  args: 
+    creates: /etc/mistral/init_mistral_db.SQL.ansible.has.run
+  notify:
+    - restart mistral
+
+- name: Make sure "Initiate database" doesn't run twice
+  sudo: yes
+  file:
+    path: /etc/mistral/init_mistral_db.SQL.ansible.has.run
+    state: touch
+
+- name: Setup Mistral DB tables, etc
+  sudo: yes
+  command: /opt/stackstorm/mistral/bin/mistral-db-manage --config-file /etc/mistral/mistral.conf upgrade head
+  args:
+    creates: /etc/mistral/mistral-db-manage.upgrade.head.ansible.has.run
+  notify: 
+    - restart mistral
+
+- name: Make sure "Setup Mistral DB tables, etc" does not run again
+  sudo: yes
+  file:
+    path: /etc/mistral/mistral-db-manage.upgrade.head.ansible.has.run
+    state: touch
+
+- name: Register mistral actions
+  sudo: yes
+  command: /opt/stackstorm/mistral/bin/mistral-db-manage --config-file /etc/mistral/mistral.conf populate
+  args:
+    creates: /etc/mistral/mistral-db-manage.populate.ansible.has.run
+  notify:
+    - restart mistral
+
+- name: Make sure "Register mistral actions" does not run again
+  sudo: yes
+  file:
+    path: /etc/mistral/mistral-db-manage.upgrade.head.ansible.has.run
+    state: touch

roles/mistral/templates/init_mistral_db.SQL.j2

@@ -0,0 +1,2 @@
+CREATE ROLE {{ mistral_db_username }} WITH CREATEDB LOGIN ENCRYPTED PASSWORD {{ mistral_db_password }};
+CREATE DATABASE {{ mistral_db }} OWNER {{ mistral_db_username }};

roles/mongodb/tasks/main.yml

@@ -5,5 +5,4 @@
     update_cache: yes
     state: present
   with_items:
-    - mongodb
     - mongodb-server

roles/rabbitmq/tasks/main.yml

@@ -1,12 +1,3 @@
-- name: Ensure rabbitmq repo
-  sudo: true
-  apt_repository:
-    repo: deb http://www.rabbitmq.com/debian/ testing main
-
-- name: Ensure rabbitmq repo key
-  sudo: true
-  apt_key:
-    url: http://www.rabbitmq.com/rabbitmq-signing-key-public.asc
 
 - name: Install rabbitmq packages
   sudo: true
@@ -15,19 +6,3 @@
     update_cache: true
   with_items:
     - rabbitmq-server
-
-- name: Enable rabbitmq_management plugin
-  sudo: true
-  rabbitmq_plugin:
-    names: rabbitmq_management
-  notify:
-    - restart rabbitmq
-
-- meta: flush_handlers
-
-- name: Install rabbitmqadmin
-  sudo: true
-  get_url:
-    url: http://127.0.0.1:15672/cli/rabbitmqadmin
-    dest: /usr/bin/rabbitmqadmin
-    mode: 0755

roles/st2/defaults/main.yml

@@ -24,10 +24,10 @@ st2_packages:
 # Number of action runners to register. Defaults to number of vCPUs, but not less than 2
 st2_action_runners: "{{ [ansible_processor_vcpus, 2] | max }}"
 
+enable_auth: true
 st2_auth_username: testu
 st2_auth_password: testp
 
 # Set to no if you do not want the st2_system_user to be added in
 # the sudoers file.
 st2_system_user_in_sudoers: yes
-

roles/st2/handlers/main.yml

@@ -1,6 +1,7 @@
 - name: restart st2
   sudo: true
-  service:
-    name: "{{ item }}"
-    state: restarted
-  with_items: st2_services
+  command: st2ctl restart 
+
+- name: restart st2-api
+  sudo: true
+  command: st2ctl restart-component st2api

roles/st2/meta/main.yml

@@ -12,4 +12,5 @@ galaxy_info:
         - precise
   categories:
     - system
-dependencies: []
+dependencies: 
+  - role: st2repos