CORD-912
OpenCloud support
Change-Id: I170597cacd76c84c795a7bf4c8e77e068ebcd72a
diff --git a/roles/common-prep/defaults/main.yml b/roles/common-prep/defaults/main.yml
index 0bcd73c..7bfbb56 100644
--- a/roles/common-prep/defaults/main.yml
+++ b/roles/common-prep/defaults/main.yml
@@ -1,3 +1,4 @@
---
+# file: common-prep/defaults/main.yml
-run_dist_upgrade: true
+run_dist_upgrade: False
diff --git a/roles/common-prep/handlers/main.yml b/roles/common-prep/handlers/main.yml
index 537ccb3..9161ccd 100644
--- a/roles/common-prep/handlers/main.yml
+++ b/roles/common-prep/handlers/main.yml
@@ -1,9 +1,10 @@
---
-# file: roles/common-prep/handlers/main.yml
+# file: common-prep/handlers/main.yml
# from https://support.ansible.com/hc/en-us/articles/201958037-Reboot-a-server-and-wait-for-it-to-come-back
- name: restart host
- shell: sleep 2 && shutdown -r now "Ansible updates triggered"
+ shell: >
+ sleep 2 && shutdown -r now "Ansible updates triggered"
async: 1
poll: 0
ignore_errors: true
@@ -12,8 +13,10 @@
- name: wait for host
become: false
local_action:
- wait_for host={{ inventory_hostname }}
+ wait_for
+ host={{ inventory_hostname }}
port=22
- delay=60 timeout=600
- state=started
+ search_regex=OpenSSH
+ delay=60
+ timeout=600
diff --git a/roles/common-prep/tasks/main.yml b/roles/common-prep/tasks/main.yml
index 39bced7..51b0997 100644
--- a/roles/common-prep/tasks/main.yml
+++ b/roles/common-prep/tasks/main.yml
@@ -1,5 +1,5 @@
---
-# file: roles/common-prep/tasks/main.yml
+# file: common-prep/tasks/main.yml
- name: Upgrade system to current using apt
when: run_dist_upgrade
@@ -20,10 +20,9 @@
- name: Install standard packages
apt:
- pkg={{ item }}
- state=present
- update_cache=yes
- cache_valid_time=3600
+ pkg: "{{ item }}"
+ update_cache: yes
+ cache_valid_time: 3600
with_items:
- tmux
- vim
@@ -39,12 +38,13 @@
- jove
- name: Enable vim syntax highlighting
- lineinfile: dest=/etc/vim/vimrc
- regexp="^\s*syntax on"
- line="syntax on"
+ lineinfile:
+ dest: '/etc/vim/vimrc'
+ regexp: '^\s*syntax on'
+ line: 'syntax on'
- name: Configure tmux
copy:
- src=tmux.conf
- dest="{{ ansible_user_dir }}/.tmux.conf"
+ src: tmux.conf
+ dest: "{{ ansible_user_dir }}/.tmux.conf"