Fixes for ansible-lint 3.4.3
Change-Id: I5499d9b34a8a071f7416286f86c55a92367ab948
diff --git a/roles/juju-setup/handlers/main.yml b/roles/juju-setup/handlers/main.yml
new file mode 100644
index 0000000..695b2cb
--- /dev/null
+++ b/roles/juju-setup/handlers/main.yml
@@ -0,0 +1,9 @@
+- name: update-ca-certificates
+ become: yes
+ command: update-ca-certificates
+
+- name: Move cert to all service VMs
+ command: ansible services -b -u ubuntu -m copy -a "src={{ ansible_user_dir }}/keystone_juju_ca_cert.crt dest=/usr/local/share/ca-certificates/keystone_juju_ca_cert.crt owner=root group=root mode=0644"
+
+- name: update-ca-certificates in service VMs
+ command: ansible services -b -u ubuntu -m command -a "update-ca-certificates"
diff --git a/roles/juju-setup/tasks/main.yml b/roles/juju-setup/tasks/main.yml
index 2646ec0..e0ea5a0 100644
--- a/roles/juju-setup/tasks/main.yml
+++ b/roles/juju-setup/tasks/main.yml
@@ -110,18 +110,7 @@
src: "{{ ansible_user_dir }}/keystone_juju_ca_cert.crt"
dest: "/usr/local/share/ca-certificates/keystone_juju_ca_cert.crt"
remote_src: true
- register: copied_cert
-
-- name: update-ca-certificates
- when: copied_cert.changed
- become: yes
- command: update-ca-certificates
-
-- name: Move cert to all service VM's
- when: copied_cert.changed
- command: ansible services -b -u ubuntu -m copy -a "src={{ ansible_user_dir }}/keystone_juju_ca_cert.crt dest=/usr/local/share/ca-certificates/keystone_juju_ca_cert.crt owner=root group=root mode=0644"
-
-- name: update-ca-certificates in service VM's
- when: copied_cert.changed
- command: ansible services -b -u ubuntu -m command -a "update-ca-certificates"
-
+ notify:
+ - update-ca-certificates
+ - Move cert to all service VMs
+ - update-ca-certificates in service VMs
diff --git a/roles/xos-vm-install/files/xos-setup-cord-pod-playbook.yml b/roles/xos-vm-install/files/xos-setup-cord-pod-playbook.yml
index ea26d36..bf613be 100644
--- a/roles/xos-vm-install/files/xos-setup-cord-pod-playbook.yml
+++ b/roles/xos-vm-install/files/xos-setup-cord-pod-playbook.yml
@@ -103,6 +103,8 @@
become: yes
service: name=docker state=restarted
when: set_docker_opts.changed
+ tags:
+ - skip_ansible_lint # Wants this to be a handler
- name: Pull docker images for XOS
become: yes
@@ -130,6 +132,3 @@
chdir="{{ xos_repo_dest }}/containers/xos/"
with_items:
- base
-
-
-