Include pip install default repos

Install the same repos everywhere.
This allows the reduction of code in pip_install role.

Change-Id: I541287f906a143ed79553c69e1a9e39ee38dc8dc
This commit is contained in:
Jean-Philippe Evrard 2017-10-26 14:02:20 +01:00 committed by Jean-Philippe Evrard
parent f8a150cc76
commit 830a0a007e
5 changed files with 50 additions and 16 deletions

View File

@ -131,6 +131,16 @@ global_environment_variables: {}
# Set the default mode for the /etc/cron.d/sysstat file
openstack_host_sysstat_cron_mode: '0755'
## Default repositories data
# Set default mirror for CentOS repositories
# NOTE(mhayden): Ensure that the full path to the 'centos' directory is used.
#openstack_hosts_centos_mirror_url: 'http://mirror.centos.org/centos'
openstack_hosts_centos_mirror_url: 'http://mirror.centos.org/centos'
# Ubuntu cloud archive data
uca_repo: "deb {{ uca_apt_repo_url | default('http://ubuntu-cloud.archive.canonical.com/ubuntu') }} {{ ansible_lsb.codename }}-updates/pike main"
# Default opensuse mirrors URLs
opensuse_mirror: "http://download.opensuse.org"
opensuse_mirror_obs: "{{ opensuse_mirror }}"
# If mirrored to a different folder, we need to keep this as overridable.
opensuse_repo_oss_url: "{{ opensuse_mirror }}/distribution/leap/{{ ansible_distribution_version }}/repo/oss/"
opensuse_repo_update_url: "{{ opensuse_mirror }}/update/leap/{{ ansible_distribution_version }}/oss/"
opensuse_obs_cloud_repo_url: "{{ opensuse_mirror_obs }}/repositories/Cloud:/OpenStack:/Pike/openSUSE_Leap_{{ ansible_distribution_version }}"

View File

@ -46,7 +46,7 @@
repo: "{{ repo.repo }}"
state: "{{ repo.state | default('present') }}"
filename: "{{ repo.filename | default(omit) }}"
update_cache: "{{ repo == package_repos[-1] }}"
update_cache: "{{ repo == openstack_hosts_package_repos[-1] }}"
with_items: "{{ openstack_hosts_package_repos }}"
loop_control:
loop_var: repo

View File

@ -89,18 +89,26 @@ _package_list:
state: present
- name: yum-utils
state: present
- name: "centos-openstack-release-*"
state: absent
- name: centos-release-ceph-jewel
state: absent
- name: centos-release-qemu-ev
state: absent
- name: centos-release-storage-common
state: absent
_package_repos:
- file: rdo-qemu-ev
name: rdo-qemu-ev
description: "RDO CentOS-7 - QEMU EV"
baseurl: "{{ openstack_hosts_centos_mirror_url | default('http://mirror.centos.org') }}/centos/7/virt/x86_64/kvm-common/"
baseurl: "{{ openstack_hosts_centos_mirror_url }}/7/virt/x86_64/kvm-common/"
gpgcheck: yes
enabled: yes
- file: rdo-release
name: openstack-pike
description: "OpenStack Pike Repository"
baseurl: "{{ openstack_hosts_centos_mirror_url | default('http://mirror.centos.org') }}/centos/7/cloud/$basearch/openstack-pike/"
baseurl: "{{ openstack_hosts_centos_mirror_url }}/7/cloud/$basearch/openstack-pike/"
gpgcheck: yes
enabled: yes

View File

@ -85,13 +85,23 @@ _package_list:
- name: systemd-logger
state: absent # conflicts with rsyslog
_package_repos: []
## example:
# - repo:
# state:
# name:
# enabled:
# disable_gpg_check:
# description:
# autorefresh:
# auto_import_keys:
## full example:
#_package_repos:
# - repo:
# state:
# name:
# enabled:
# disable_gpg_check:
# description:
# autorefresh:
# auto_import_keys:
_package_repos:
- name: "repo-oss"
repo: "{{ opensuse_repo_oss_url }}"
auto_import_keys: yes
- name: "repo-update"
repo: "{{ opensuse_repo_update_url }}"
auto_import_keys: yes
- name: "OBS:Cloud:OpenStack:Pike"
repo: "{{ opensuse_obs_cloud_repo_url }}"
auto_import_keys: yes

View File

@ -84,5 +84,11 @@ _package_repos_keys: []
# url:
# state:
_package_list: []
_package_repos: []
_package_list:
- name: ubuntu-cloud-keyring
state: "{{ openstack_hosts_package_state }}"
_package_repos:
- repo: "{{ uca_repo }}"
state: present
filename: "{{ uca_apt_source_list_filename | default(omit) }}"