commit 843b4f2cf1239fdd02ff9925fa6683201e6837d5
author Zack Williams <zdw@cs.arizona.edu> Tue Jan 17 22:17:37 2017 -0700
committer Zack Williams <zdw@cs.arizona.edu> Wed Jan 18 07:00:09 2017 -0700
tree 5d69c2536b34f267ebc8ed301e0776ee4758aec1
parent 34c02ace9ca46420b96a63d21958d292a24644e2

run playbook from within /opt/cord
remove more
don't try to modify now-nonexistent file

Change-Id: If7d1d8453e8c1deb553dd69e52023d8d0900778e

roles/automation-integration/tasks/main.yml

diff --git a/roles/automation-integration/tasks/main.yml b/roles/automation-integration/tasks/main.yml
index cbd37d6..4f3a465 100644
--- a/roles/automation-integration/tasks/main.yml
+++ b/roles/automation-integration/tasks/main.yml
@@ -1,83 +1,18 @@
 ---
-- name: Ensure Ansible Directories
-  become: yes
-  file:
-    path=/etc/maas/ansible/{{ item }}
-    state=directory
-    owner=maas
-    group=maas
-    mode=0755
-  with_items:
-    - roles
-    - vars
-    - library
+# automation-integration/tasks/main.yml
 
-- name: Ensure XOS Cluster Enlist Script
+- name: Template do-enlist-compute-node script to /etc/maas/ansible/do-enlist-compute-node
   become: yes
   template:
-    src=do-enlist-compute-node
+    src=do-enlist-compute-node.j2
     dest=/etc/maas/ansible/do-enlist-compute-node
     owner=maas
     group=maas
     mode=0755
 
-- name: Copy Compute Node Playbook
-  become: yes
-  copy:
-    src=../../../cord-compute-playbook.yml
-    dest=/etc/maas/ansible
-    owner=maas
-    group=maas
-    mode=0644
-
-- name: Copy Required Ansible Libraries
-  become: yes
-  copy:
-    src=../../../library/{{ item }}
-    dest=/etc/maas/ansible/library
-    owner=maas
-    group=maas
-    mode=0644
-  with_items:
-    - juju_facts.py
-
-- name: Copy Required Ansible Roles
-  become: yes
-  copy:
-    src=../../../roles/{{ item }}
-    dest=/etc/maas/ansible/roles
-    owner=maas
-    group=maas
-    mode=0755
-  with_items:
-    - common-prep
-    - cloudlab-prep
-    - compute-prep
-    - dns-configure
-    - head-prep
-    - juju-compute-setup
-    - xos-compute-setup
-
-- name: Copy Required Ansible Variables
-  become: yes
-  copy:
-    src=../../../vars/{{ item }}
-    dest=/etc/maas/ansible/vars
-    owner=maas
-    group=maas
-    mode=0644
-  with_items:
-    - cord_defaults.yml
-    - cord.yml
-    - example_keystone.yml
-
-- name: Store cord_in_a_box value for compute node provisioning
-  become: yes
-  lineinfile: "dest=/etc/maas/ansible/vars/cord.yml state=present regexp='^cord_in_a_box' line='cord_in_a_box: True'"
-  when: cord_in_a_box
-
-- name: Ensure JuJu and XOS Compute Node Provisioning
+- name: Have MAAS do-ansible script run do-enlist-compute-node script
   become: yes
   lineinfile:
     dest=/etc/maas/ansible/do-ansible
     line='/etc/maas/ansible/do-enlist-compute-node $ID $HOSTNAME || exit $?'
+