diff --git a/defaults/main.yml b/defaults/main.yml index f5894480..d98fda29 100644 --- a/defaults/main.yml +++ b/defaults/main.yml @@ -43,8 +43,21 @@ galera_server_distro_package_pins: [] galera_debconf_items: [] galera_server_percona_distro_packages: [] galera_mariadb_server_package: "{{ _galera_mariadb_server_package }}" + +# Set the URL for the MariaDB repository galera_repo_url: "{{ _galera_repo_url }}" +# Set the repo information for the MariaDB repository +galera_repo: "{{ _galera_repo }}" + +# Set the gpg keys needed to be imported +galera_gpg_keys: "{{ _galera_gpg_keys | default([]) }}" + +# Set the URL for the Percona Xtrabackup repository +galera_percona_xtrabackup_repo_url: "{{ _galera_percona_xtrabackup_repo_url | default('') }}" + +# Set the rpo information for the Percona Xtrabackup repository +galera_percona_xtrabackup_repo: "{{ _galera_percona_xtrabackup_repo | default({}) }}" galera_existing_cluster: true galera_running_and_bootstrapped: false diff --git a/tasks/galera_install_zypper.yml b/tasks/galera_install_zypper.yml index a0f935e3..0bb6b4fb 100644 --- a/tasks/galera_install_zypper.yml +++ b/tasks/galera_install_zypper.yml @@ -20,7 +20,7 @@ repo: "{{ item.uri }}" auto_import_keys: yes register: zypper_repository_added - with_items: "{{ galera_server_zypper_repo }}" + with_items: "{{ galera_repo }}" tags: - galera-repos diff --git a/vars/redhat-7.yml b/vars/redhat-7.yml index 8f1826a0..1a0087c0 100644 --- a/vars/redhat-7.yml +++ b/vars/redhat-7.yml @@ -14,7 +14,7 @@ # limitations under the License. # Galera GPG Keys -galera_gpg_keys: +_galera_gpg_keys: - key_name: 'RPM-GPG-KEY-MariaDB' keyserver: 'https://yum.mariadb.org' fallback_keyserver: 'https://yum.mariadb.org' @@ -50,13 +50,13 @@ galera_server_upgrade_packages_remove: galera_mariadb_service_name: "mariadb" _galera_repo_url: "http://yum.mariadb.org/10.1/centos/7/x86_64" -galera_repo: +_galera_repo: name: MariaDB description: "MariaDB Repo" baseurl: "{{ galera_repo_url }}" gpgkey: "https://yum.mariadb.org/RPM-GPG-KEY-MariaDB" -galera_percona_xtrabackup_repo: +_galera_percona_xtrabackup_repo: repo: "http://www.percona.com/downloads/percona-release/redhat/0.1-4/percona-release-0.1-4.noarch.rpm" state: "present" diff --git a/vars/suse-42.yml b/vars/suse-42.yml index 62f67182..3759878e 100644 --- a/vars/suse-42.yml +++ b/vars/suse-42.yml @@ -13,7 +13,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -galera_server_zypper_repo: +_galera_repo: - name: "OBS:server_database" uri: "http://download.opensuse.org/repositories/server:/database/openSUSE_Leap_{{ ansible_distribution_version }}" diff --git a/vars/ubuntu-16.04.yml b/vars/ubuntu-16.04.yml index d8cec2c3..4b849591 100644 --- a/vars/ubuntu-16.04.yml +++ b/vars/ubuntu-16.04.yml @@ -19,7 +19,7 @@ cache_timeout: 600 galera_server_distro_package_pins: [{ package: "*", release: MariaDB, priority: "1001" }] # Galera GPG Keys -galera_gpg_keys: +_galera_gpg_keys: - key_name: 'mariadb' keyserver: 'hkp://keyserver.ubuntu.com:80' fallback_keyserver: 'hkp://p80.pool.sks-keyservers.net:80' @@ -101,14 +101,14 @@ qpress_arch_sha256: ppc64le: "a31d3e00dbcec9b3f98eae82b261d054d0b80a57f4a38967d0e953811cb082f3" # Repositories -galera_percona_xtrabackup_repo_url: "http://repo.percona.com/apt" -galera_percona_xtrabackup_repo: +_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: +_galera_repo: repo: "deb {{ galera_repo_url }} {{ ansible_distribution_release }} main" state: "present" filename: "MariaDB"