openstack/openstack-ansible
Code Issues Proposed changes

Merge "remove conntrackd package"

Browse Source
This commit is contained in:
Jenkins
2015-07-30 12:40:25 +00:00
committed by Gerrit Code Review
parent 4e17a53952 0da48344c6
commit 98153efac1
2 changed files with 15 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
playbooks/roles/os_neutron/defaults/main.yml
View File

@@ -235,7 +235,6 @@ neutron_rpc_response_timeout: 60
# "get_subnet": "rule:admin_or_owner or rule:shared" # "get_subnet": "rule:admin_or_owner or rule:shared"
neutron_apt_packages: neutron_apt_packages:
- conntrackd
- conntrack - conntrack
- dnsmasq-base - dnsmasq-base
- dnsmasq-utils - dnsmasq-utils
@@ -244,6 +243,9 @@ neutron_apt_packages:
- keepalived - keepalived
- libpq-dev - libpq-dev
neutron_apt_remove_packages:
- conntrackd
neutron_pip_packages: neutron_pip_packages:
- configobj - configobj
- cliff - cliff

12
playbooks/roles/os_neutron/tasks/neutron_install.yml
View File

@@ -36,6 +36,18 @@
tags: tags:
- neutron-apt-packages - neutron-apt-packages
- name: remove specific apt packages
apt:
pkg: "{{ item }}"
state: absent
register: remove_packages
until: remove_packages|success
retries: 5
delay: 2
with_items: neutron_apt_remove_packages
tags:
- neutron-apt-packages
- name: Install pip packages - name: Install pip packages
pip: pip:
name: "{{ item }}" name: "{{ item }}"