fixes to set branch correctly for XOS checkout
diff --git a/cord-single-playbook.yml b/cord-single-playbook.yml
index b8a35f3..499721d 100644
--- a/cord-single-playbook.yml
+++ b/cord-single-playbook.yml
@@ -1,11 +1,8 @@
---
# CORD playbook, for installing a single-node CORD test-environment on cloudlab
-- name: Include Configuration
+- name: Include vars
hosts: all
- vars:
- - xos_repo_branch: "feature/container_ssl"
-
tasks:
- include_vars: vars/cord_defaults.yml
- include_vars: vars/cord.yml
@@ -39,7 +36,7 @@
- { role: config-virt, become: yes }
- create-vms
-- name: Set up VM's, juju, docker, simulate fabric
+- name: Set up VM's, juju, simulate fabric
hosts: head
roles:
- xos-vm-install
diff --git a/roles/docker-compose/tasks/main.yml b/roles/docker-compose/tasks/main.yml
index 8fa17aa..c845e85 100644
--- a/roles/docker-compose/tasks/main.yml
+++ b/roles/docker-compose/tasks/main.yml
@@ -29,5 +29,5 @@
- name: Copy admin-openrc.sh into XOS container
command: ansible xos-1 -b -u ubuntu -m copy \
- -a "src=~/admin-openrc.sh dest={{ xos_repo_dest }}/xos/configurations/{{ xos_configuration }}"
+ -a "src=~/admin-openrc.sh dest={{ ansible_user_dir }}/xos/xos/configurations/{{ xos_configuration }}"
diff --git a/vars/cord_defaults.yml b/vars/cord_defaults.yml
index 93bfb32..72dd991 100644
--- a/vars/cord_defaults.yml
+++ b/vars/cord_defaults.yml
@@ -7,6 +7,8 @@
xos_configuration: cord-pod
+xos_repo_branch: "feature/container_ssl"
+
apt_cacher_name: apt-cache
apt_ssl_sites: