Merge "Make installation of epel-release optional"
This commit is contained in:
commit
96c07ac5a4
ansible
baremetal-compute-inspect.ymlbaremetal-compute-manage.ymlbaremetal-compute-provide.ymlcompute-node-flavors.ymlexternal-net.ymlseed-introspection-rules.ymltest-image-centos-cloud.ymltest-image.ymltest-keypair.yml
group_vars/all
kolla-ansible.ymlkolla-build.ymlovercloud-grafana-configure.ymlovercloud-introspection-rules-dell-lldp-workaround.ymlovercloud-introspection-rules.ymlovercloud-ipa-images.ymlroles
kolla-ansible
kolla
etc/kayobe
releasenotes/notes
@ -14,6 +14,7 @@
|
||||
roles:
|
||||
- role: stackhpc.os-shade
|
||||
os_shade_venv: "{{ venv }}"
|
||||
os_shade_install_epel: "{{ yum_install_epel }}"
|
||||
|
||||
- role: activate-virtualenv
|
||||
activate_virtualenv_path: "{{ venv }}"
|
||||
|
@ -14,6 +14,7 @@
|
||||
roles:
|
||||
- role: stackhpc.os-shade
|
||||
os_shade_venv: "{{ venv }}"
|
||||
os_shade_install_epel: "{{ yum_install_epel }}"
|
||||
|
||||
- role: activate-virtualenv
|
||||
activate_virtualenv_path: "{{ venv }}"
|
||||
|
@ -14,6 +14,7 @@
|
||||
roles:
|
||||
- role: stackhpc.os-shade
|
||||
os_shade_venv: "{{ venv }}"
|
||||
os_shade_install_epel: "{{ yum_install_epel }}"
|
||||
|
||||
- role: activate-virtualenv
|
||||
activate_virtualenv_path: "{{ venv }}"
|
||||
|
@ -12,6 +12,7 @@
|
||||
roles:
|
||||
- role: stackhpc.os-openstackclient
|
||||
os_openstackclient_venv: "{{ venv }}"
|
||||
os_openstackclient_install_epel: "{{ yum_install_epel }}"
|
||||
|
||||
tasks:
|
||||
- name: Get a list of ironic nodes
|
||||
@ -85,3 +86,4 @@
|
||||
os_flavors_venv: "{{ venv }}"
|
||||
os_flavors_auth_type: "{{ openstack_auth_type }}"
|
||||
os_flavors_auth: "{{ openstack_auth }}"
|
||||
os_shade_install_epel: "{{ yum_install_epel }}"
|
||||
|
@ -4,6 +4,7 @@
|
||||
hosts: controllers[0]
|
||||
roles:
|
||||
- role: stackhpc.os-networks
|
||||
os_shade_install_epel: "{{ yum_install_epel }}"
|
||||
os_networks_venv: "{{ virtualenv_path }}/shade"
|
||||
os_networks_openstack_auth_type: "{{ openstack_auth_type }}"
|
||||
os_networks_openstack_auth: "{{ openstack_auth }}"
|
||||
|
@ -1,3 +1,8 @@
|
||||
---
|
||||
|
||||
# Whether or not to use a local Yum mirror.
|
||||
yum_use_local_mirror: false
|
||||
|
||||
# Whether to install the epel-release package. This affects RedHat-based
|
||||
# systems only.
|
||||
yum_install_epel: true
|
||||
|
@ -222,6 +222,7 @@
|
||||
|
||||
roles:
|
||||
- role: kolla-ansible
|
||||
kolla_ansible_install_epel: "{{ yum_install_epel }}"
|
||||
kolla_external_fqdn_cert: "{{ kolla_config_path }}/certificates/haproxy.pem"
|
||||
kolla_ansible_passwords_path: "{{ kayobe_config_path }}/kolla/passwords.yml"
|
||||
# NOTE: This differs from the default SELinux mode in kolla ansible,
|
||||
|
@ -5,5 +5,6 @@
|
||||
- kolla-build
|
||||
roles:
|
||||
- role: kolla
|
||||
kolla_install_epel: "{{ yum_install_epel }}"
|
||||
- role: kolla-build
|
||||
kolla_build_extra_config_path: "{{ kayobe_config_path }}/kolla/kolla-build.conf"
|
||||
|
@ -18,6 +18,7 @@
|
||||
roles:
|
||||
- role: stackhpc.os-openstackclient
|
||||
os_openstackclient_venv: "{{ venv }}"
|
||||
os_openstackclient_install_epel: "{{ yum_install_epel }}"
|
||||
when: kolla_enable_monasca | bool
|
||||
|
||||
tasks:
|
||||
|
@ -116,6 +116,7 @@
|
||||
|
||||
roles:
|
||||
- role: ironic-inspector-rules
|
||||
os_shade_install_epel: "{{ yum_install_epel }}"
|
||||
ironic_inspector_venv: "{{ virtualenv_path }}/shade"
|
||||
ironic_inspector_auth_type: "{{ openstack_auth_type }}"
|
||||
ironic_inspector_auth: "{{ openstack_auth }}"
|
||||
|
@ -35,6 +35,7 @@
|
||||
name: stackhpc.os-openstackclient
|
||||
vars:
|
||||
os_openstackclient_venv: "{{ venv }}"
|
||||
os_openstackclient_install_epel: "{{ yum_install_epel }}"
|
||||
|
||||
- name: Retrieve the IPA kernel Glance image UUID
|
||||
shell: >
|
||||
@ -54,6 +55,7 @@
|
||||
|
||||
roles:
|
||||
- role: ironic-inspector-rules
|
||||
os_shade_install_epel: "{{ yum_install_epel }}"
|
||||
ironic_inspector_venv: "{{ venv }}"
|
||||
ironic_inspector_auth_type: "{{ openstack_auth_type }}"
|
||||
ironic_inspector_auth: "{{ openstack_auth }}"
|
||||
|
@ -95,6 +95,7 @@
|
||||
- item.src != item.dest
|
||||
roles:
|
||||
- role: ipa-images
|
||||
os_shade_install_epel: "{{ yum_install_epel }}"
|
||||
ipa_images_venv: "{{ virtualenv_path }}/shade"
|
||||
ipa_images_openstack_auth_type: "{{ openstack_auth_type }}"
|
||||
ipa_images_openstack_auth: "{{ openstack_auth }}"
|
||||
|
@ -23,6 +23,9 @@ kolla_ansible_target_venv:
|
||||
# into the kolla-ansible venv.
|
||||
kolla_upper_constraints_file:
|
||||
|
||||
# Whether to install the epel-release package.
|
||||
kolla_ansible_install_epel: true
|
||||
|
||||
# Password to use to encrypt the passwords.yml file.
|
||||
kolla_ansible_vault_password:
|
||||
|
||||
|
@ -7,7 +7,9 @@
|
||||
name: epel-release
|
||||
state: installed
|
||||
become: True
|
||||
when: ansible_os_family == 'RedHat'
|
||||
when:
|
||||
- ansible_os_family == 'RedHat'
|
||||
- kolla_ansible_install_epel | bool
|
||||
|
||||
- name: Ensure required packages are installed
|
||||
package:
|
||||
|
@ -398,6 +398,8 @@ grafana_admin_username: "{{ grafana_local_admin_user_name }}"
|
||||
selinux_state: {{ kolla_selinux_state }}
|
||||
{% endif %}
|
||||
|
||||
install_epel: {{ kolla_ansible_install_epel | bool }}
|
||||
|
||||
{% if kolla_extra_globals %}
|
||||
#######################
|
||||
# Extra configuration
|
||||
|
@ -19,6 +19,9 @@ kolla_venv: "{{ ansible_env['PWD'] }}/kolla-venv"
|
||||
# into the kolla venv.
|
||||
kolla_upper_constraints_file:
|
||||
|
||||
# Whether to install the epel-release package.
|
||||
kolla_install_epel: true
|
||||
|
||||
# Directory where Kolla config files will be installed.
|
||||
kolla_build_config_path:
|
||||
|
||||
|
@ -4,6 +4,9 @@
|
||||
name: epel-release
|
||||
state: installed
|
||||
become: True
|
||||
when:
|
||||
- ansible_os_family == 'RedHat'
|
||||
- kolla_install_epel | bool
|
||||
|
||||
- name: Ensure required packages are installed
|
||||
yum:
|
||||
|
@ -5,6 +5,7 @@
|
||||
- introspection-rules
|
||||
roles:
|
||||
- role: ironic-inspector-rules
|
||||
os_shade_install_epel: "{{ yum_install_epel }}"
|
||||
ironic_inspector_venv: "{{ virtualenv_path }}/shade"
|
||||
# No auth required for Bifrost.
|
||||
ironic_inspector_auth_type: None
|
||||
|
@ -5,6 +5,7 @@
|
||||
os_shade_venv: "{{ virtualenv_path }}/shade"
|
||||
roles:
|
||||
- role: stackhpc.os-shade
|
||||
os_shade_install_epel: "{{ yum_install_epel }}"
|
||||
tasks:
|
||||
- name: Ensure image download directory exists
|
||||
file:
|
||||
|
@ -19,6 +19,7 @@
|
||||
os_shade_venv: "{{ virtualenv_path }}/shade"
|
||||
roles:
|
||||
- role: stackhpc.os-shade
|
||||
os_shade_install_epel: "{{ yum_install_epel }}"
|
||||
tasks:
|
||||
- name: Ensure diskimage-builder package is installed
|
||||
yum:
|
||||
|
@ -6,6 +6,7 @@
|
||||
os_shade_venv: "{{ virtualenv_path }}/shade"
|
||||
roles:
|
||||
- role: stackhpc.os-shade
|
||||
os_shade_install_epel: "{{ yum_install_epel }}"
|
||||
tasks:
|
||||
# Note that setting this via a play or task variable seems to not
|
||||
# evaluate the Jinja variable reference, so we use set_fact.
|
||||
|
@ -2,8 +2,10 @@
|
||||
|
||||
# Whether or not to use a local Yum mirror.
|
||||
#yum_use_local_mirror: false
|
||||
|
||||
# Mirror FQDN for Yum repos.
|
||||
#yum_centos_mirror_host: 'mirror.centos.org'
|
||||
|
||||
# Mirror directory for Yum CentOS repos.
|
||||
#yum_centos_mirror_directory: 'centos'
|
||||
# Mirror FQDN for Yum EPEL repos.
|
||||
@ -22,6 +24,10 @@
|
||||
# gpgcheck: yes
|
||||
#yum_custom_repos:
|
||||
|
||||
# Whether to install the epel-release package. This affects RedHat-based
|
||||
# systems only.
|
||||
#yum_install_epel:
|
||||
|
||||
###############################################################################
|
||||
# Dummy variable to allow Ansible to accept this file.
|
||||
workaround_ansible_issue_8743: yes
|
||||
|
@ -0,0 +1,7 @@
|
||||
---
|
||||
features:
|
||||
- |
|
||||
Adds support for skipping installation of the ``epel-release`` package, by
|
||||
setting ``yum_install_epel`` to ``false``. In some cases this is
|
||||
desirable, such as when a local EPEL mirror is available, or access to the
|
||||
public repositories is not possible.
|
Loading…
x
Reference in New Issue
Block a user