have vm's use apt-cache
diff --git a/cord-single-playbook.yml b/cord-single-playbook.yml
index b32f61f..5c173db 100644
--- a/cord-single-playbook.yml
+++ b/cord-single-playbook.yml
@@ -11,12 +11,12 @@
- include_vars: vars/cord.yml
- include_vars: vars/cord_keystone.yml
-- name: Apt-Cache Setup
+- name: apt-cacher-ng Setup
hosts: head
become: yes
roles:
- apt-cacher-ng
-
+
- name: Prep systems
hosts: all
become: yes
@@ -40,7 +40,7 @@
- name: Configure head node, create VM's, setup juju
hosts: head
roles:
- - { role: head-prep, become: yes }
+ - { role: head-prep, become: yes }
- { role: config-virt, become: yes }
- juju-user-prep
- juju-setup
diff --git a/roles/apt-cacher-ng/defaults/main.yml b/roles/apt-cacher-ng/defaults/main.yml
index f54e9cc..84d55a4 100644
--- a/roles/apt-cacher-ng/defaults/main.yml
+++ b/roles/apt-cacher-ng/defaults/main.yml
@@ -1,6 +1,6 @@
---
# apt-cacher-ng/defaults/main.yml
-apt_cacher_ip: 127.0.0.1
+apt_cacher_name: 127.0.0.1
apt_cacher_port: 3142
diff --git a/roles/apt-cacher-ng/templates/02apt-cacher-ng.j2 b/roles/apt-cacher-ng/templates/02apt-cacher-ng.j2
index b07ba88..46740fb 100644
--- a/roles/apt-cacher-ng/templates/02apt-cacher-ng.j2
+++ b/roles/apt-cacher-ng/templates/02apt-cacher-ng.j2
@@ -1 +1 @@
-Acquire::http { Proxy "http://{{ apt_cacher_ip }}:{{ apt_cacher_port }}"; };
+Acquire::http { Proxy "http://{{ apt_cacher_name }}:{{ apt_cacher_port }}"; };
diff --git a/roles/juju-setup/tasks/main.yml b/roles/juju-setup/tasks/main.yml
index c416a09..53eaf2e 100644
--- a/roles/juju-setup/tasks/main.yml
+++ b/roles/juju-setup/tasks/main.yml
@@ -34,6 +34,10 @@
- name: Verify that we can log into every VM
command: ansible services -m ping -u ubuntu
+- name: Have VM's use the apt-cache
+ command: ansible services -m lineinfile -a "dest=/etc/apt/apt.conf.d/02apt-cacher-ng
+ mode=0644 owner=root group=root regexp='^Acquire' line='Acquire::http { Proxy \"http://{{ apt_cacher_name }}:{{ apt_cacher_port }}\"; };'"
+
- name: Update software in all the VMs
command: ansible services -m apt -b -u ubuntu -a "upgrade=dist update_cache=yes cache_valid_time=3600"
diff --git a/vars/cord_defaults.yml b/vars/cord_defaults.yml
index 23b22b2..3ced8b2 100644
--- a/vars/cord_defaults.yml
+++ b/vars/cord_defaults.yml
@@ -7,6 +7,12 @@
xos_configuration: cord-pod
+apt_cacher_name: apt-cache
+
+apt_ssl_sites:
+ - apt.dockerproject.org
+ - butler.opencloud.cs.arizona.edu
+
docker_compose_pull_list:
- name: 'onos-cord-1'
path: 'cord'
@@ -16,7 +22,6 @@
path: 'xos/xos/configurations/cord-pod'
up: no
-
charm_versions:
ceilometer: "cs:trusty/ceilometer-17"
ceilometer-agent: "cs:trusty/ceilometer-agent-13"