Improve idempotency across multiple runs
Change-Id: Ibf84d9347974ef6978b0d9c241f271945b2f331e
(cherry picked from commit 310abc1ea9c90853e8f003301a6e0ff80a0966b3)
diff --git a/roles/common-prep/tasks/main.yml b/roles/common-prep/tasks/main.yml
index 3fa4625..5026631 100644
--- a/roles/common-prep/tasks/main.yml
+++ b/roles/common-prep/tasks/main.yml
@@ -1,12 +1,6 @@
---
# file: roles/common-prep/tasks/main.yml
-- name: Upgrade system to current using apt
- apt:
- upgrade=dist
- update_cache=yes
- cache_valid_time=3600
-
- stat:
path=/var/run/reboot-required
register: reboot-required
@@ -47,4 +41,3 @@
copy:
src=tmux.conf
dest="{{ ansible_user_dir }}/.tmux.conf"
-
diff --git a/roles/create-vms/tasks/main.yml b/roles/create-vms/tasks/main.yml
index 48cbb3a..09d23d3 100644
--- a/roles/create-vms/tasks/main.yml
+++ b/roles/create-vms/tasks/main.yml
@@ -35,9 +35,6 @@
- name: Update apt cache
command: ansible services -m apt -b -u ubuntu -a "update_cache=yes"
-- name: Update software in all the VMs
- command: ansible services -m apt -b -u ubuntu -a "upgrade=dist"
-
- name: Create VM's eth0 interface config file for DNS config via resolvconf program
template:
src=eth0.cfg.j2
@@ -71,4 +68,3 @@
- name: Install docker in VM's that require it
command: ansible-playbook "{{ ansible_user_dir }}/docker-install-playbook.yml"
-
diff --git a/scripts/single-node-pod.sh b/scripts/single-node-pod.sh
index bb1a312..70a56aa 100755
--- a/scripts/single-node-pod.sh
+++ b/scripts/single-node-pod.sh
@@ -35,7 +35,7 @@
[ -e ~/.ssh/id_rsa ] || ssh-keygen -t rsa -N "" -f ~/.ssh/id_rsa
cat ~/.ssh/id_rsa.pub >> ~/.ssh/authorized_keys
- [ -d platform-install ] || git clone -b $SETUP_BRANCH $SETUP_REPO_URL platform-install
+ [ -d ~/platform-install ] || git clone -b $SETUP_BRANCH $SETUP_REPO_URL ~/platform-install
cd ~/platform-install
sed -i "s/replaceme/`whoami`/" $INVENTORY