commit 7928696d6b62a4cd1eea2e50e3e449c884dcfbc9
author Zack Williams <zdw@cs.arizona.edu> Mon Jul 10 12:24:37 2017 -0700
committer Zack Williams <zdw@cs.arizona.edu> Wed Jul 12 11:06:28 2017 -0700
tree 71c9528a16fd171ebe808c877e9fdb1acec5997f
parent cc3fee4b8ef1a9d4782a411e628f06a895c2470d

[CORD-1530]
Make config file directory creation using become an optional step
Cleanup various incongruities in defaults

Change-Id: I6fb77ab1ccdf08a18468adbc59474f94d603fc11

roles/onos-cord-install/tasks/main.yml

diff --git a/roles/onos-cord-install/tasks/main.yml b/roles/onos-cord-install/tasks/main.yml
index 86ec128..000a73a 100644
--- a/roles/onos-cord-install/tasks/main.yml
+++ b/roles/onos-cord-install/tasks/main.yml
@@ -5,7 +5,7 @@
   docker_image:
     name: "{{ onos_docker_image }}"
 
-- name: Create dest directory
+- name: Create onos_cord directory
   become: yes
   file:
     path: "{{ head_onos_cord_dir }}"
@@ -14,7 +14,7 @@
     group: "{{ ansible_user_gid }}"
     mode: 0755
 
-- name: Copy over SSH key
+- name: Create node_key file with SSH private key for compute nodes
   copy:
     src: "{{ ssh_pki_dir }}/client_certs/{{ pod_sshkey_name }}_sshkey"
     dest: "{{ head_onos_cord_dir }}/node_key"
@@ -30,11 +30,7 @@
     - Dockerfile
     - onos-service
     - org.ops4j.pax.logging.cfg
-
-- name: Copy over ONOS playbook and other files
-  copy:
-    src: "onos-cord-docker-compose.yml"
-    dest: "{{ head_onos_cord_dir }}/docker-compose.yml"
+    - docker-compose.yml
 
 - name: Copy SSL Certs to ONOS so docker-compose can find them
   copy:
@@ -49,11 +45,13 @@
 
 - name: Build xos/onos docker image
   docker_image:
-    name: "xos/onos"
+    name: "xos/onos:{{ deploy_docker_tag }}"
     path: "{{ head_onos_cord_dir }}"
-    dockerfile: "Dockerfile"
+    pull: False
+    force: True
 
 - name: Start ONOS for CORD
   docker_service:
+    project_name: "onoscord"
     project_src: "{{ head_onos_cord_dir }}"