CORD-993
elasticstack role, installs on head node
fix elasticstack/java apt-cacher passthrough
reliability fix for download Glance VM images
more reliable reliability fix
simplify apt-cacher ssl passthrough
apt-cacher defaults in other roles
Change-Id: Ia78d256f562c30539240d12ba163f7af6e375131
diff --git a/roles/apt-cacher-ng/defaults/main.yml b/roles/apt-cacher-ng/defaults/main.yml
index 84d55a4..ec5a1e1 100644
--- a/roles/apt-cacher-ng/defaults/main.yml
+++ b/roles/apt-cacher-ng/defaults/main.yml
@@ -1,6 +1,12 @@
---
# apt-cacher-ng/defaults/main.yml
-apt_cacher_name: 127.0.0.1
+apt_cacher_name: apt-cache
apt_cacher_port: 3142
+apt_ssl_sites:
+ - apt.dockerproject.org
+ - butler.opencloud.cs.arizona.edu
+ - deb.nodesource.com
+ - artifacts.elastic.co
+
diff --git a/roles/apt-cacher-ng/tasks/main.yml b/roles/apt-cacher-ng/tasks/main.yml
index a8b9d90..97bfb7c 100644
--- a/roles/apt-cacher-ng/tasks/main.yml
+++ b/roles/apt-cacher-ng/tasks/main.yml
@@ -3,9 +3,9 @@
- name: Install apt-cacher-ng with apt
apt:
- name={{ item }}
- update_cache=yes
- cache_valid_time=3600
+ name: "{{ item }}"
+ update_cache: yes
+ cache_valid_time: 3600
with_items:
- apt-cacher-ng
@@ -21,7 +21,12 @@
- name: Configure local system to use apt-cacher-ng
template:
- src=02apt-cacher-ng.j2
- dest=/etc/apt/apt.conf.d/02apt-cacher-ng
- mode=0644 owner=root group=root
+ src: "{{ item }}.j2"
+ dest: "/etc/apt/apt.conf.d/{{ item }}"
+ owner: root
+ group: root
+ mode: "0644"
+ with_items:
+ - 02broken-repos
+ - 03apt-cacher-ng
diff --git a/roles/apt-cacher-ng/templates/02broken-repos.j2 b/roles/apt-cacher-ng/templates/02broken-repos.j2
new file mode 100644
index 0000000..ecbc200
--- /dev/null
+++ b/roles/apt-cacher-ng/templates/02broken-repos.j2
@@ -0,0 +1 @@
+Acquire::http::Proxy { download.oracle.com DIRECT; };
diff --git a/roles/apt-cacher-ng/templates/02apt-cacher-ng.j2 b/roles/apt-cacher-ng/templates/03apt-cacher-ng.j2
similarity index 100%
rename from roles/apt-cacher-ng/templates/02apt-cacher-ng.j2
rename to roles/apt-cacher-ng/templates/03apt-cacher-ng.j2