Minor fixes

.gitignore

@@ -1,2 +1,3 @@
 .kitchen/
 .kitchen.local.yml
+*.retry

Vagrantfile

@@ -28,9 +28,9 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
   end
 
   config.vm.provision :ansible do |ansible|
-    ansible.playbook = "playbooks/requirements.yml"
+    ansible.playbook = "requirements.yml"
   end
   config.vm.provision :ansible do |ansible|
-    ansible.playbook = "playbooks/stackstorm.yml"
+    ansible.playbook = "stackstorm.yml"
   end
 end

playbooks/requirements.yml → requirements.yml

@@ -1,7 +1,7 @@
 ---
 - hosts: all
+  connection: local
   tasks:
   - name: Install galaxy dependencies
     command: ansible-galaxy install -r roles/mistral/requirements.yml
-    delegate_to: 127.0.0.1
     run_once: true

roles/mistral/handlers/main.yml

@@ -1,5 +1,5 @@
 - name: restart mistral
-  sudo: true
+  become: true
   service:
     name: mistral
     state: restarted

roles/mistral/meta/main.yml

@@ -16,7 +16,7 @@ dependencies:
   - role: ANXS.postgresql
     version: v1.5.0
     tags: [db, postgresql]
-    sudo: yes
+    become: yes
     postgresql_databases:
       - name: "{{ mistral_db }}"
     postgresql_users:

roles/mistral/tasks/main.yml

@@ -1,21 +1,21 @@
 ---
 
 - name: Install latest st2mistral
-  sudo: yes
+  become: yes
   apt: 
     name: st2mistral
     state: latest
   when: mistral_version == "stable"
 
 - name: Install latest st2mistral
-  sudo: yes
+  become: yes
   apt:
     name: st2mistral={{ mistral_version }}
     state: present
   when: mistral_version != "stable"
 
 - name: Configure mistral
-  sudo: yes
+  become: yes
   ini_file:
     dest: /etc/mistral/mistral.conf
     section: database
@@ -24,7 +24,7 @@
     backup: yes
 
 - name: Deploy database init script
-  sudo: yes
+  become: yes
   template:
     src: init_mistral_db.SQL.j2
     dest: /etc/mistral/init_mistral_db.SQL 
@@ -43,35 +43,35 @@
     - restart mistral
 
 - name: Make sure "Initiate database" doesn't run twice
-  sudo: yes
+  become: yes
   file:
     path: /etc/mistral/init_mistral_db.SQL.ansible.has.run
     state: touch
 
 - name: Setup Mistral DB tables, etc
-  sudo: yes
+  become: 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
+  become: yes
   file:
     path: /etc/mistral/mistral-db-manage.upgrade.head.ansible.has.run
     state: touch
 
 - name: Register mistral actions
-  sudo: yes
+  become: 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
+  become: yes
   file:
     path: /etc/mistral/mistral-db-manage.upgrade.head.ansible.has.run
     state: touch

roles/mongodb/handlers/main.yml

@@ -1,6 +1,6 @@
 ---
 - name: restart mongodb
-  sudo: yes
+  become: yes
   service:
     name: mongod
     state: restarted

roles/mongodb/tasks/main.yml

@@ -1,21 +1,21 @@
 ---
 - name: Add mongodb key
-  sudo: yes
+  become: yes
   apt_key:
     keyserver: keyserver.ubuntu.com
     id: 42F3E95A2C4F08279C4960ADD68FA50FEA312927
     state: present
   tags: [databases, mongodb]
 
 - name: Add mongodb repository
-  sudo: yes
+  become: yes
   apt_repository:
     repo: 'deb http://repo.mongodb.org/apt/{{ ansible_distribution|lower }} {{ ansible_distribution_release|lower }}/mongodb-org/3.2 multiverse'
     state: present
   tags: [databases, mongodb]
 
 - name: Install mongodb
-  sudo: yes
+  become: yes
   apt:
     name: mongodb-org
     update_cache: yes

roles/rabbitmq/handlers/main.yml

@@ -1,6 +1,6 @@
 ---
 - name: restart rabbitmq
-  sudo: yes
+  become: yes
   service:
     name: rabbitmq-server
     state: restarted

roles/rabbitmq/tasks/main.yml

@@ -1,6 +1,6 @@
 ---
 - name: Install rabbitmq packages
-  sudo: yes
+  become: yes
   apt:
     name: rabbitmq-server
     update_cache: yes

roles/st2/handlers/main.yml

@@ -1,12 +1,12 @@
 - name: restart st2
-  sudo: true
+  become: true
   command: "{{ item }}"
   with_items:
     - st2ctl reload --register-all
     - st2ctl restart
 
 - name: restart st2api/st2stream
-  sudo: true
+  become: true
   command: "st2ctl restart-component {{ item }}"
   with_items:
     - st2api

roles/st2/tasks/config_auth.yml

@@ -1,5 +1,5 @@
 - name: Install auth pre-reqs
-  sudo: yes
+  become: yes
   apt:
     name: "{{ item }}"
     state: present
@@ -8,7 +8,7 @@
     - apache2-utils
 
 - name: Create htpasswd file
-  sudo: true
+  become: true
   htpasswd:
     path: /etc/st2/htpasswd
     name: "{{ st2_auth_username }}"
@@ -17,7 +17,7 @@
     - restart st2api/st2stream
 
 - name: Enable autentication
-  sudo: yes
+  become: yes
   ini_file:
     dest: /etc/st2/st2.conf
     section: auth

roles/st2/tasks/main.yml

@@ -1,7 +1,7 @@
 ---
 
 - name: Install latest st2 package
-  sudo: yes
+  become: yes
   apt:
     name: st2
     state: latest
@@ -10,7 +10,7 @@
     - restart st2
 
 - name: Install latest st2 package
-  sudo: yes
+  become: yes
   apt:
     name: st2={{ st2_version }}-{{ st2_revision }}
     state: present

roles/st2/tasks/user.yml

@@ -2,7 +2,7 @@
 # See: http://docs.stackstorm.com/install/config.html#configure-ssh
 ---
 - name: user | Create system user
-  sudo: yes
+  become: yes
   user:
     name: "{{ st2_system_user }}"
     home: "/home/{{ st2_system_user }}"
@@ -15,16 +15,16 @@
 - name: user | Authorize key-based access for system user
   vars:
       ansible_ssh_pipelining: true
-  sudo: yes
-  sudo_user: "{{ st2_system_user }}"
+  become: yes
+  become_user: "{{ st2_system_user }}"
   authorized_key:
     user: "{{ st2_system_user }}"
     key: "{{ _user.ssh_public_key }}"
     state: present
   tags: [st2, user]
 
 - name: user | Add system user to sudoers
-  sudo: yes
+  become: yes
   lineinfile:
     create: yes
     dest: /etc/sudoers.d/st2
@@ -37,7 +37,7 @@
 
 
 - name: Configure system user in /etc/st2/st2.conf
-  sudo: yes
+  become: yes
   ini_file:
     dest: /etc/st2/st2.conf
     section: system_user
@@ -46,7 +46,7 @@
     backup: yes
 
 - name: Configure system user ssh key in /etc/st2/st2.conf
-  sudo: yes
+  become: yes
   ini_file:
     dest: /etc/st2/st2.conf
     section: system_user

roles/st2repos/tasks/main.yml

@@ -2,7 +2,7 @@
 # tasks file for st2repos
 
 - name: Install prereqs
-  sudo: yes
+  become: yes
   apt:
     name: "{{ item }}"
     state: present
@@ -12,13 +12,13 @@
     - apt-transport-https
 
 - name: Add keys to keyring
-  sudo: yes
+  become: yes
   apt_key:
     url: https://packagecloud.io/StackStorm/{{ st2_pkg_repo }}/gpgkey
     state: present
 
 - name: Add StackStorm repos
-  sudo: yes
+  become: yes
   apt_repository:
     repo: 'deb https://packagecloud.io/StackStorm/{{ st2_pkg_repo }}/{{ ansible_distribution|lower }}/ {{ ansible_distribution_release|lower }} main'
     state: present

roles/st2smoketests/tasks/main.yml

@@ -7,7 +7,7 @@
 
 
 - name: Make sure packs are reloaded
-  sudo: yes
+  become: yes
   command: st2ctl reload --register-all
   tags:
     - smoke-tests

roles/st2web/handlers/main.yml

@@ -1,11 +1,11 @@
 ---
 # handlers file for st2web
 - name: restart st2
-  sudo: true
+  become: true
   command: st2ctl restart 
 
 - name: Restart nginx
-  sudo: yes
+  become: yes
   service:
      name: nginx
      state: restarted