Fixing different mirror_mode interface. Hopefully.

This commit is contained in:
Emiliano Vavassori 2016-02-17 02:08:34 +01:00
parent 55c54033de
commit ad5f46793e
12 changed files with 92 additions and 46 deletions

View File

@ -3,7 +3,7 @@
# At the end of system configuration, we should have a complete
# Edubuntu system
# Requires fact execmirrorpath, already set by prereq role.
# Requires fact execpath, already set by prereq role.
- include: apt-sources.yml
tags:

View File

@ -1,2 +1,2 @@
deb http://{{ execmirrorpath }}ppa.launchpad.net/ansible/ansible/ubuntu trusty main
# deb-src http://{{ execmirrorpath }}ppa.launchpad.net/ansible/ansible/ubuntu trusty main
deb http://{{ execpath }}ppa.launchpad.net/ansible/ansible/ubuntu trusty main
# deb-src http://{{ execpath }}ppa.launchpad.net/ansible/ansible/ubuntu trusty main

View File

@ -2,55 +2,55 @@
# See http://help.ubuntu.com/community/UpgradeNotes for how to upgrade to
# newer versions of the distribution.
deb http://{{ execmirrorpath }}archive.ubuntu.com/ubuntu/ trusty main restricted
deb-src http://{{ execmirrorpath }}archive.ubuntu.com/ubuntu/ trusty main restricted
deb http://{{ execpath }}archive.ubuntu.com/ubuntu/ trusty main restricted
deb-src http://{{ execpath }}archive.ubuntu.com/ubuntu/ trusty main restricted
## Major bug fix updates produced after the final release of the
## distribution.
deb http://{{ execmirrorpath }}archive.ubuntu.com/ubuntu/ trusty-updates main restricted
deb-src http://{{ execmirrorpath }}archive.ubuntu.com/ubuntu/ trusty-updates main restricted
deb http://{{ execpath }}archive.ubuntu.com/ubuntu/ trusty-updates main restricted
deb-src http://{{ execpath }}archive.ubuntu.com/ubuntu/ trusty-updates main restricted
## N.B. software from this repository is ENTIRELY UNSUPPORTED by the Ubuntu
## team. Also, please note that software in universe WILL NOT receive any
## review or updates from the Ubuntu security team.
deb http://{{ execmirrorpath }}archive.ubuntu.com/ubuntu/ trusty universe
deb-src http://{{ execmirrorpath }}archive.ubuntu.com/ubuntu/ trusty universe
deb http://{{ execmirrorpath }}archive.ubuntu.com/ubuntu/ trusty-updates universe
deb-src http://{{ execmirrorpath }}archive.ubuntu.com/ubuntu/ trusty-updates universe
deb http://{{ execpath }}archive.ubuntu.com/ubuntu/ trusty universe
deb-src http://{{ execpath }}archive.ubuntu.com/ubuntu/ trusty universe
deb http://{{ execpath }}archive.ubuntu.com/ubuntu/ trusty-updates universe
deb-src http://{{ execpath }}archive.ubuntu.com/ubuntu/ trusty-updates universe
## N.B. software from this repository is ENTIRELY UNSUPPORTED by the Ubuntu
## team, and may not be under a free licence. Please satisfy yourself as to
## your rights to use the software. Also, please note that software in
## multiverse WILL NOT receive any review or updates from the Ubuntu
## security team.
deb http://{{ execmirrorpath }}archive.ubuntu.com/ubuntu/ trusty multiverse
deb-src http://{{ execmirrorpath }}archive.ubuntu.com/ubuntu/ trusty multiverse
deb http://{{ execmirrorpath }}archive.ubuntu.com/ubuntu/ trusty-updates multiverse
deb-src http://{{ execmirrorpath }}archive.ubuntu.com/ubuntu/ trusty-updates multiverse
deb http://{{ execpath }}archive.ubuntu.com/ubuntu/ trusty multiverse
deb-src http://{{ execpath }}archive.ubuntu.com/ubuntu/ trusty multiverse
deb http://{{ execpath }}archive.ubuntu.com/ubuntu/ trusty-updates multiverse
deb-src http://{{ execpath }}archive.ubuntu.com/ubuntu/ trusty-updates multiverse
## N.B. software from this repository may not have been tested as
## extensively as that contained in the main release, although it includes
## newer versions of some applications which may provide useful features.
## Also, please note that software in backports WILL NOT receive any review
## or updates from the Ubuntu security team.
deb http://{{ execmirrorpath }}archive.ubuntu.com/ubuntu/ trusty-backports main restricted universe multiverse
deb-src http://{{ execmirrorpath }}archive.ubuntu.com/ubuntu/ trusty-backports main restricted universe multiverse
deb http://{{ execpath }}archive.ubuntu.com/ubuntu/ trusty-backports main restricted universe multiverse
deb-src http://{{ execpath }}archive.ubuntu.com/ubuntu/ trusty-backports main restricted universe multiverse
deb http://{{ execmirrorpath }}security.ubuntu.com/ubuntu trusty-security main restricted
deb-src http://{{ execmirrorpath }}security.ubuntu.com/ubuntu trusty-security main restricted
deb http://{{ execmirrorpath }}security.ubuntu.com/ubuntu trusty-security universe
deb-src http://{{ execmirrorpath }}security.ubuntu.com/ubuntu trusty-security universe
deb http://{{ execmirrorpath }}security.ubuntu.com/ubuntu trusty-security multiverse
deb-src http://{{ execmirrorpath }}security.ubuntu.com/ubuntu trusty-security multiverse
deb http://{{ execpath }}security.ubuntu.com/ubuntu trusty-security main restricted
deb-src http://{{ execpath }}security.ubuntu.com/ubuntu trusty-security main restricted
deb http://{{ execpath }}security.ubuntu.com/ubuntu trusty-security universe
deb-src http://{{ execpath }}security.ubuntu.com/ubuntu trusty-security universe
deb http://{{ execpath }}security.ubuntu.com/ubuntu trusty-security multiverse
deb-src http://{{ execpath }}security.ubuntu.com/ubuntu trusty-security multiverse
## Uncomment the following two lines to add software from Canonical's
## 'partner' repository.
## This software is not part of Ubuntu, but is offered by Canonical and the
## respective vendors as a service to Ubuntu users.
# deb http://{{ execmirrorpath }}archive.canonical.com/ubuntu trusty partner
# deb-src http://{{ execmirrorpath }}archive.canonical.com/ubuntu trusty partner
# deb http://{{ execpath }}archive.canonical.com/ubuntu trusty partner
# deb-src http://{{ execpath }}archive.canonical.com/ubuntu trusty partner
## This software is not part of Ubuntu, but is offered by third-party
## developers who want to ship their latest software.
deb http://{{ execmirrorpath }}extras.ubuntu.com/ubuntu trusty main
deb-src http://{{ execmirrorpath }}extras.ubuntu.com/ubuntu trusty main
deb http://{{ execpath }}extras.ubuntu.com/ubuntu trusty main
deb-src http://{{ execpath }}extras.ubuntu.com/ubuntu trusty main

View File

@ -0,0 +1,3 @@
---
addpkg: ""
delpkg: ""

View File

@ -1,2 +1,9 @@
---
execmirrorpath: ""
# Defaults for installation
mirror_mode: local
mirror_host: archive.ubuntu.com
mirror_path: /ubuntu
mirror_security_host: security.ubuntu.com
mirror_security_path: /ubuntu
mirror_localpath: /ks/mirror
execpath: ""

View File

@ -1,5 +1,8 @@
---
- include: mirror-config.yml
tags: prereq
- include: prereq.yml
tags: prereq

View File

@ -0,0 +1,38 @@
---
# Determining other variables to be used inside templates
- name: Determining mirror_mode
set_fact: mirror_mode="{{ ansible_local.domain.mirror_mode }}"
when: "ansible_local.domain.mirror_mode is defined"
- name: Determining mirror_host
set_fact: mirror_host="{{ ansible_local.domain.mirror_host }}"
when: ansible_local.domain.mirror_host is defined
- name: Determining mirror_path
set_fact: mirror_path="{{ ansible_local.domain.mirror_path }}"
when: ansible_local.domain.mirror_path is defined
- name: Determining mirror_security_host
set_fact: mirror_security_host="{{ ansible_local.domain.mirror_security_host }}"
when: ansible_local.domain.mirror_security_host is defined
- name: Determining mirror_security_path
set_fact: mirror_security_path="{{ ansible_local.domain.mirror_security_path }}"
when: ansible_local.domain.mirror_security_path is defined
- name: Determining mirror_localpath
set_fact: mirror_localpath="{{ ansible_local.domain.mirror_localpath }}"
when: ansible_local.domain.mirror_localpath is defined
# The remote option is already configured as it is.
# Configuring correctly local mirror
- name: Determining variables for local and nfs mode
set_fact:
execpath: "{{ ansible_local.domain.serverfqdn }}{{ ansible_localpath }}/"
mirror_path: "{{ mirror_localpath }}/{{ mirror_host }}{{ mirror_path }}"
mirror_host: "{{ ansible_local.domain.serverfqdn }}"
mirror_security_path: "{{ mirror_localpath }}/{{ mirror_security_host }}{{mirror_security_path }}"
mirror_security_host: "{{ ansible_local.domain.serverfqdn }}"
when: mirror_mode != 'remote'

View File

@ -41,8 +41,3 @@
- name: Loading repo/pkg versions
setup: filter=ansible_local
- name: Configuring executive mirrorpath
set_fact:
execmirrorpath: "{{ ansible_local.domain.mirrorpath}}"
when: ansible_local.domain.mirror_mode == 'local' or ansible_local.domain.mirror_mode == 'nfs'

View File

@ -1,2 +1,2 @@
## Ansible Official PPA
deb http://{{ execmirrorpath }}ppa.launchpad.net/ansible/ansible/ubuntu trusty main
deb http://{{ execpath }}ppa.launchpad.net/ansible/ansible/ubuntu trusty main

View File

@ -1,2 +1,2 @@
## LibreOffice Official PPA
deb http://{{ execmirrorpath }}ppa.launchpad.net/libreoffice/libreoffice-5-0/ubuntu trusty main
deb http://{{ execpath }}ppa.launchpad.net/libreoffice/libreoffice-5-0/ubuntu trusty main

View File

@ -1,19 +1,19 @@
# Base
deb http://{{ execmirrorpath }}archive.ubuntu.com/ubuntu trusty main restricted universe multiverse
deb-src http://{{ execmirrorpath }}archive.ubuntu.com/ubuntu trusty main restricted universe multiverse
deb http://{{ execpath }}archive.ubuntu.com/ubuntu trusty main restricted universe multiverse
deb-src http://{{ execpath }}archive.ubuntu.com/ubuntu trusty main restricted universe multiverse
# updates
deb http://{{ execmirrorpath }}archive.ubuntu.com/ubuntu trusty-updates main restricted universe multiverse
deb-src http://{{ execmirrorpath }}archive.ubuntu.com/ubuntu trusty-updates main restricted universe multiverse
deb http://{{ execpath }}archive.ubuntu.com/ubuntu trusty-updates main restricted universe multiverse
deb-src http://{{ execpath }}archive.ubuntu.com/ubuntu trusty-updates main restricted universe multiverse
# backports
deb http://{{ execmirrorpath }}archive.ubuntu.com/ubuntu trusty-backports main restricted universe multiverse
deb-src http://{{ execmirrorpath }}archive.ubuntu.com/ubuntu trusty-backports main restricted universe multiverse
deb http://{{ execpath }}archive.ubuntu.com/ubuntu trusty-backports main restricted universe multiverse
deb-src http://{{ execpath }}archive.ubuntu.com/ubuntu trusty-backports main restricted universe multiverse
# security
deb http://{{ execmirrorpath }}security.ubuntu.com/ubuntu trusty-security main restricted universe multiverse
deb-src http://{{ execmirrorpath }}security.ubuntu.com/ubuntu trusty-security main restricted universe multiverse
deb http://{{ execpath }}security.ubuntu.com/ubuntu trusty-security main restricted universe multiverse
deb-src http://{{ execpath }}security.ubuntu.com/ubuntu trusty-security main restricted universe multiverse
# extras
deb http://{{ execmirrorpath }}extras.ubuntu.com/ubuntu trusty main
deb-src http://{{ execmirrorpath }}extras.ubuntu.com/ubuntu trusty main
deb http://{{ execpath }}extras.ubuntu.com/ubuntu trusty main
deb-src http://{{ execpath }}extras.ubuntu.com/ubuntu trusty main

View File

@ -1,2 +1,2 @@
# BgLUG repo @ sys42
deb http://{{ execmirrorpath }}bglug.sys42.eu/ubuntu trusty main
deb http://{{ execpath }}bglug.sys42.eu/ubuntu trusty main