Add 'debops.apt_listchanges', 'debops.apt_proxy'

debops · Sep 14, 2016 · d258101 · d258101
1 parent f464dd6
commit d258101
Show file tree

Hide file tree

Showing 9 changed files with 56 additions and 0 deletions.
diff --git a/CHANGES.rst b/CHANGES.rst
@@ -50,6 +50,10 @@ Added
 - Add ``debops.sysctl`` role with corresponding playbook and include it in
   the :file:`common.yml` playbook. [ypid_]
 
+- Add ``debops.apt_listchanges`` and ``debops.apt_proxy`` roles with their
+  corresponding playbooks. Both roles are included in the ``common.yml``
+  playbook. [drybjed_]
+
 Changed
 ~~~~~~~
 

diff --git a/galaxy/requirements-testing.txt b/galaxy/requirements-testing.txt
@@ -1,7 +1,9 @@
 debops.apt,testing
 debops.apt_cacher_ng,testing
 debops.apt_install,testing
+debops.apt_listchanges,testing
 debops.apt_preferences,testing
+debops.apt_proxy,testing
 debops.atd,testing
 debops.auth,testing
 debops.authorized_keys,testing

diff --git a/galaxy/requirements-testing.yml b/galaxy/requirements-testing.yml
@@ -7,9 +7,15 @@
 - src: debops.apt_install
   version: testing
 
+- src: debops.apt_listchanges
+  version: testing
+
 - src: debops.apt_preferences
   version: testing
 
+- src: debops.apt_proxy
+  version: testing
+
 - src: debops.atd
   version: testing
 

diff --git a/galaxy/requirements.txt b/galaxy/requirements.txt
@@ -1,7 +1,9 @@
 debops.apt
 debops.apt_cacher_ng
 debops.apt_install
+debops.apt_listchanges
 debops.apt_preferences
+debops.apt_proxy
 debops.atd
 debops.auth
 debops.authorized_keys

diff --git a/galaxy/requirements.yml b/galaxy/requirements.yml
@@ -4,8 +4,12 @@
 
 - src: debops.apt_install
 
+- src: debops.apt_listchanges
+
 - src: debops.apt_preferences
 
+- src: debops.apt_proxy
+
 - src: debops.atd
 
 - src: debops.auth

diff --git a/playbooks/common.yml b/playbooks/common.yml
@@ -38,6 +38,9 @@
         - '{{ apt_install__apt_preferences__dependent_list }}'
         - '{{ rsyslog__apt_preferences__dependent_list }}'
 
+    - role: debops.apt_proxy
+      tags: [ 'role::apt_proxy' ]
+
     - role: debops.atd
       tags: [ 'role::atd' ]
 
@@ -50,6 +53,9 @@
     - role: debops.apt
       tags: [ 'role::apt' ]
 
+    - role: debops.apt_listchanges
+      tags: [ 'role::apt_listchanges' ]
+
     - role: debops.apt_install
       tags: [ 'role::apt_install' ]
 

diff --git a/playbooks/service/apt_listchanges.yml b/playbooks/service/apt_listchanges.yml
@@ -0,0 +1,14 @@
+---
+
+- name: Configure apt-listchanges
+  hosts: [ 'debops_all_hosts', 'debops_service_apt_listchanges' ]
+  become: True
+
+  environment: '{{ inventory__environment | d({})
+                   | combine(inventory__group_environment | d({}))
+                   | combine(inventory__host_environment  | d({})) }}'
+
+  roles:
+
+    - role: debops.apt_listchanges
+      tags: [ 'role::apt_listchanges' ]
diff --git a/playbooks/service/apt_proxy.yml b/playbooks/service/apt_proxy.yml
@@ -0,0 +1,14 @@
+---
+
+- name: Configure APT proxy
+  hosts: [ 'debops_all_hosts', 'debops_service_apt_proxy' ]
+  become: True
+
+  environment: '{{ inventory__environment | d({})
+                   | combine(inventory__group_environment | d({}))
+                   | combine(inventory__host_environment  | d({})) }}'
+
+  roles:
+
+    - role: debops.apt_proxy
+      tags: [ 'role::apt_proxy' ]
diff --git a/playbooks/service/authorized_keys.yml b/playbooks/service/authorized_keys.yml
@@ -4,6 +4,10 @@
   hosts: [ 'debops_all_hosts', 'debops_service_authorized_keys' ]
   become: True
 
+  environment: '{{ inventory__environment | d({})
+                   | combine(inventory__group_environment | d({}))
+                   | combine(inventory__host_environment  | d({})) }}'
+
   roles:
 
     - role: debops.authorized_keys