From 3d1ecb7aa239f82ec62ef6e9b189036a4a883774 Mon Sep 17 00:00:00 2001 From: Jean-Philippe Evrard Date: Tue, 3 Jan 2017 13:06:51 +0000 Subject: [PATCH] Allow override of the repo filename Apt cannot have 2 mirrors with the same content in 2 different files. If a deployer has an apt mirror with mariadb (and others), the deployer still need to add a repository, but will also need to define the filename used, in order to avoid clashes. This commit makes possible to decide the filename for the repo. Change-Id: I047bdaf58a4057a96103f6d56c2f811886b1b625 Signed-off-by: Jean-Philippe Evrard --- .../notes/apt-source-filenamed-9f83d18619debf26.yaml | 6 ++++++ tasks/galera_install_apt.yml | 4 ++-- vars/ubuntu-16.04.yml | 2 ++ 3 files changed, 10 insertions(+), 2 deletions(-) create mode 100644 releasenotes/notes/apt-source-filenamed-9f83d18619debf26.yaml diff --git a/releasenotes/notes/apt-source-filenamed-9f83d18619debf26.yaml b/releasenotes/notes/apt-source-filenamed-9f83d18619debf26.yaml new file mode 100644 index 00000000..6f5488c7 --- /dev/null +++ b/releasenotes/notes/apt-source-filenamed-9f83d18619debf26.yaml @@ -0,0 +1,6 @@ +--- +features: + - The filename of the apt source can now be defined + with the variable ``filename`` inside the dicts + ``galera_repo`` and + ``galera_percona_xtrabackup_repo``. diff --git a/tasks/galera_install_apt.yml b/tasks/galera_install_apt.yml index 0ab916b9..53cd7e16 100644 --- a/tasks/galera_install_apt.yml +++ b/tasks/galera_install_apt.yml @@ -73,7 +73,7 @@ - name: Add galera repo apt_repository: repo: "{{ galera_repo.repo }}" - filename: MariaDB + filename: "{{ galera_repo.filename }}" state: "{{ galera_repo.state }}" register: add_repos until: add_repos|success @@ -85,7 +85,7 @@ - name: Add percona repo apt_repository: repo: "{{ galera_percona_xtrabackup_repo.repo }}" - filename: Percona + filename: "{{ galera_percona_xtrabackup_repo.filename }}" state: "{{ galera_percona_xtrabackup_repo.state }}" register: add_repos until: add_repos|success diff --git a/vars/ubuntu-16.04.yml b/vars/ubuntu-16.04.yml index 18e22154..1efe8f83 100644 --- a/vars/ubuntu-16.04.yml +++ b/vars/ubuntu-16.04.yml @@ -91,10 +91,12 @@ galera_percona_xtrabackup_repo_url: "http://repo.percona.com/apt" galera_percona_xtrabackup_repo: repo: "deb {{ galera_percona_xtrabackup_repo_url }} {{ ansible_distribution_release }} main" state: "present" + filename: "Percona" _galera_repo_url: "http://mirror.rackspace.com/mariadb/repo/10.1/ubuntu" galera_repo: repo: "deb {{ galera_repo_url }} {{ ansible_distribution_release }} main" state: "present" + filename: "MariaDB" use_percona_upstream: no