VOL-241 VOL-239 VOL-257 VOL-258 This update solves multiple problems
and cleans up the ansible tree somewhat.
VOL-241 Removes the error messages during dependent software installation
VOL-239 Removes the dependency on apt-get -y -f
VOL-257 Adds a config file to specify the docker containers required for
a production deployment of vOLT-HA
VOL-258 Adds error checking after the voltha VM executes the vOLT-HA
build to stop on errors rather than continuing and having the
installer fail much later when docker containers are missing.
- General cleanup of the ansible tree.
- Removal of ansible centos conditionals since they're not required.
- Removal of the check for puppet and chef, not required.
- Adds a cleanup script that will remove temporary files added
during an install so they don't get submitted to the repo by
accident.
Note there are lots of commented out lines in the ansible scripts.
These will be removed in a subsequent update.
Change-Id: I92da352408dbfed1a05d13a1e10003f169be6a66
diff --git a/install/ansible/roles/swarm/tasks/main.yml b/install/ansible/roles/swarm/tasks/main.yml
index 92e73c2..b0a7009 100644
--- a/install/ansible/roles/swarm/tasks/main.yml
+++ b/install/ansible/roles/swarm/tasks/main.yml
@@ -1,2 +1,24 @@
-- include: swarm.yml
- when: ansible_distribution == 'Debian' or ansible_distribution == 'Ubuntu'
+---
+- name: Ensure Swarm Master Initialization
+ command: "docker swarm init --advertise-addr {{ swarm_master_addr }}"
+ when: target == "swarm-master"
+ tags: [swarm]
+
+- name: Capture Swarm Cluster Manager Token
+ become: voltha
+ shell: ssh -i /home/voltha/.keys/{{ swarm_master_addr }} voltha@{{ swarm_master_addr }} sudo docker swarm join-token -q manager 2>/dev/null
+ register: manager_token
+ changed_when: false
+ when: target == "swarm-master-backup"
+ tags: [swarm]
+
+- name: Debug
+ debug:
+ msg: "TOKEN: {{ manager_token.stdout }}"
+ when: target == "swarm-master-backup"
+ tags: [swarm]
+
+- name: Join Swarm Cluster
+ command: "docker swarm join --token {{ manager_token.stdout }} {{ swarm_master_addr }}:2377"
+ when: target == "swarm-master-backup"
+ tags: [swarm]