Merge "Add ability to change apt/yum package state"

This commit is contained in:
Jenkins 2016-08-02 17:47:44 +00:00 committed by Gerrit Code Review
commit e120f1f97c
3 changed files with 26 additions and 9 deletions

View File

@ -16,6 +16,10 @@
## Verbosity Options ## Verbosity Options
debug: False debug: False
# Set the package install state for distribution packages
# Options are 'present' and 'latest'
neutron_package_state: "latest"
neutron_git_repo: https://git.openstack.org/openstack/neutron neutron_git_repo: https://git.openstack.org/openstack/neutron
neutron_git_install_branch: master neutron_git_install_branch: master

View File

@ -0,0 +1,13 @@
---
features:
- The os_neutron role now supports the ability to configure whether
apt/yum tasks install the latest available package, or just ensure
that the package is present. The default action is to ensure that
the latest package is present. The action taken may be changed to
only ensure that the package is present by setting
``neutron_package_state`` to ``present``.
upgrade:
- The os_neutron role always checks whether the latest package is
installed when executed. If a deployer wishes to change the check to
only validate the presence of the package, the option
``neutron_package_state`` should be set to ``present``.

View File

@ -16,7 +16,7 @@
- name: Add Ubuntu Cloud Archive keyring - name: Add Ubuntu Cloud Archive keyring
apt: apt:
pkg: ubuntu-cloud-keyring pkg: ubuntu-cloud-keyring
state: latest state: "{{ neutron_package_state }}"
register: add_uca_keys register: add_uca_keys
when: neutron_uca_enable | bool when: neutron_uca_enable | bool
@ -44,17 +44,17 @@
- name: Install neutron apt dependencies - name: Install neutron apt dependencies
apt: apt:
pkg: "{{ item }}" pkg: "{{ item }}"
state: latest state: "{{ neutron_package_state }}"
register: install_packages register: install_packages
until: install_packages|success until: install_packages|success
retries: 5 retries: 5
delay: 2 delay: 2
with_items: "{{ neutron_apt_packages }}" with_items: "{{ neutron_apt_packages }}"
- name: Install apt packages for lxb - name: Install apt packages for LXB
apt: apt:
pkg: "{{ item }}" pkg: "{{ item }}"
state: latest state: "{{ neutron_package_state }}"
register: install_packages register: install_packages
until: install_packages|success until: install_packages|success
retries: 5 retries: 5
@ -64,10 +64,10 @@
- neutron_services['neutron-linuxbridge-agent']['group'] in group_names - neutron_services['neutron-linuxbridge-agent']['group'] in group_names
- neutron_services['neutron-linuxbridge-agent'].service_en | bool - neutron_services['neutron-linuxbridge-agent'].service_en | bool
- name: Install apt packages for ovs - name: Install apt packages for OVS
apt: apt:
pkg: "{{ item }}" pkg: "{{ item }}"
state: latest state: "{{ neutron_package_state }}"
register: install_packages register: install_packages
until: install_packages|success until: install_packages|success
retries: 5 retries: 5
@ -80,7 +80,7 @@
- name: Install apt packages for LBaaS - name: Install apt packages for LBaaS
apt: apt:
pkg: "{{ item }}" pkg: "{{ item }}"
state: latest state: "{{ neutron_package_state }}"
register: install_packages register: install_packages
until: install_packages|success until: install_packages|success
retries: 5 retries: 5
@ -93,7 +93,7 @@
- name: Install apt packages for VPNaaS - name: Install apt packages for VPNaaS
apt: apt:
pkg: "{{ item }}" pkg: "{{ item }}"
state: latest state: "{{ neutron_package_state }}"
register: install_packages register: install_packages
until: install_packages|success until: install_packages|success
retries: 5 retries: 5
@ -103,7 +103,7 @@
- neutron_services['neutron-vpnaas-agent']['group'] in group_names - neutron_services['neutron-vpnaas-agent']['group'] in group_names
- neutron_vpnaas | bool - neutron_vpnaas | bool
- name: remove specific apt packages - name: Remove known problem packages
apt: apt:
pkg: "{{ item }}" pkg: "{{ item }}"
state: absent state: absent