Merge "Use new ansible package module to install distro packages."
This commit is contained in:
Jenkins
Gerrit Code Review
commit
a044b2bc28
@ -1,105 +0,0 @@
|
||||
---
|
||||
# Copyright 2014, Rackspace US, Inc.
|
||||
#
|
||||
# Licensed under the Apache License, Version 2.0 (the "License");
|
||||
# you may not use this file except in compliance with the License.
|
||||
# You may obtain a copy of the License at
|
||||
#
|
||||
# http://www.apache.org/licenses/LICENSE-2.0
|
||||
#
|
||||
# Unless required by applicable law or agreed to in writing, software
|
||||
# distributed under the License is distributed on an "AS IS" BASIS,
|
||||
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
# See the License for the specific language governing permissions and
|
||||
# limitations under the License.
|
||||
|
||||
- name: Add Ubuntu Cloud Archive keyring
|
||||
apt:
|
||||
pkg: ubuntu-cloud-keyring
|
||||
state: "{{ neutron_package_state }}"
|
||||
update_cache: yes
|
||||
cache_valid_time: "{{ cache_timeout }}"
|
||||
register: add_uca_keys
|
||||
when: neutron_uca_enable | bool
|
||||
|
||||
- name: Add Ubuntu Cloud Archive Repository
|
||||
apt_repository:
|
||||
repo: "{{ uca_repo }}"
|
||||
state: present
|
||||
update_cache: yes
|
||||
register: add_uca_repo
|
||||
when: neutron_uca_enable | bool
|
||||
|
||||
- name: Install neutron apt dependencies
|
||||
apt:
|
||||
pkg: "{{ item }}"
|
||||
state: "{{ neutron_package_state }}"
|
||||
update_cache: yes
|
||||
cache_valid_time: "{{ cache_timeout }}"
|
||||
register: install_packages
|
||||
until: install_packages|success
|
||||
retries: 5
|
||||
delay: 2
|
||||
with_items: "{{ neutron_distro_packages }}"
|
||||
|
||||
- name: Install apt packages for LXB
|
||||
apt:
|
||||
pkg: "{{ item }}"
|
||||
state: "{{ neutron_package_state }}"
|
||||
register: install_packages
|
||||
until: install_packages|success
|
||||
retries: 5
|
||||
delay: 2
|
||||
with_items: "{{ neutron_lxb_distro_packages }}"
|
||||
when:
|
||||
- neutron_services['neutron-linuxbridge-agent']['group'] in group_names
|
||||
- neutron_services['neutron-linuxbridge-agent'].service_en | bool
|
||||
|
||||
- name: Install apt packages for OVS
|
||||
apt:
|
||||
pkg: "{{ item }}"
|
||||
state: "{{ neutron_package_state }}"
|
||||
register: install_packages
|
||||
until: install_packages|success
|
||||
retries: 5
|
||||
delay: 2
|
||||
with_items: "{{ neutron_ovs_distro_packages }}"
|
||||
when:
|
||||
- neutron_services['neutron-openvswitch-agent']['group'] in group_names
|
||||
- neutron_services['neutron-openvswitch-agent'].service_en | bool
|
||||
|
||||
- name: Install apt packages for LBaaS
|
||||
apt:
|
||||
pkg: "{{ item }}"
|
||||
state: "{{ neutron_package_state }}"
|
||||
register: install_packages
|
||||
until: install_packages|success
|
||||
retries: 5
|
||||
delay: 2
|
||||
with_items: "{{ neutron_lbaas_distro_packages }}"
|
||||
when:
|
||||
- neutron_services['neutron-lbaasv2-agent']['group'] in group_names
|
||||
- neutron_lbaasv2 | bool
|
||||
|
||||
- name: Install apt packages for VPNaaS
|
||||
apt:
|
||||
pkg: "{{ item }}"
|
||||
state: "{{ neutron_package_state }}"
|
||||
register: install_packages
|
||||
until: install_packages|success
|
||||
retries: 5
|
||||
delay: 2
|
||||
with_items: "{{ neutron_vpnaas_distro_packages }}"
|
||||
when:
|
||||
- neutron_services['neutron-vpnaas-agent']['group'] in group_names
|
||||
- neutron_vpnaas | bool
|
||||
|
||||
- name: Remove known problem packages
|
||||
apt:
|
||||
pkg: "{{ item }}"
|
||||
state: absent
|
||||
register: remove_packages
|
||||
until: remove_packages|success
|
||||
retries: 5
|
||||
delay: 2
|
||||
with_items: "{{ neutron_remove_distro_packages }}"
|
||||
@ -1,95 +0,0 @@
|
||||
---
|
||||
# Copyright 2014, Rackspace US, Inc.
|
||||
#
|
||||
# Licensed under the Apache License, Version 2.0 (the "License");
|
||||
# you may not use this file except in compliance with the License.
|
||||
# You may obtain a copy of the License at
|
||||
#
|
||||
# http://www.apache.org/licenses/LICENSE-2.0
|
||||
#
|
||||
# Unless required by applicable law or agreed to in writing, software
|
||||
# distributed under the License is distributed on an "AS IS" BASIS,
|
||||
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
# See the License for the specific language governing permissions and
|
||||
# limitations under the License.
|
||||
|
||||
- name: Install RDO package
|
||||
yum:
|
||||
pkg: "{{ rdo_package }}"
|
||||
state: "present"
|
||||
register: install_cloud_rdo_package
|
||||
until: install_cloud_rdo_package | success
|
||||
retries: 5
|
||||
delay: 2
|
||||
|
||||
- name: Install neutron yum dependencies
|
||||
yum:
|
||||
pkg: "{{ item }}"
|
||||
state: "{{ neutron_package_state }}"
|
||||
register: install_packages
|
||||
until: install_packages|success
|
||||
retries: 5
|
||||
delay: 2
|
||||
with_items: "{{ neutron_distro_packages }}"
|
||||
|
||||
- name: Install yum packages for LXB
|
||||
yum:
|
||||
pkg: "{{ item }}"
|
||||
state: "{{ neutron_package_state }}"
|
||||
register: install_packages
|
||||
until: install_packages|success
|
||||
retries: 5
|
||||
delay: 2
|
||||
with_items: "{{ neutron_lxb_distro_packages }}"
|
||||
when:
|
||||
- neutron_services['neutron-linuxbridge-agent']['group'] in group_names
|
||||
- neutron_services['neutron-linuxbridge-agent'].service_en | bool
|
||||
|
||||
- name: Install yum packages for OVS
|
||||
yum:
|
||||
pkg: "{{ item }}"
|
||||
state: "{{ neutron_package_state }}"
|
||||
register: install_packages
|
||||
until: install_packages|success
|
||||
retries: 5
|
||||
delay: 2
|
||||
with_items: "{{ neutron_ovs_distro_packages }}"
|
||||
when:
|
||||
- neutron_services['neutron-openvswitch-agent']['group'] in group_names
|
||||
- neutron_services['neutron-openvswitch-agent'].service_en | bool
|
||||
|
||||
- name: Install yum packages for LBaaS
|
||||
yum:
|
||||
pkg: "{{ item }}"
|
||||
state: "{{ neutron_package_state }}"
|
||||
register: install_packages
|
||||
until: install_packages|success
|
||||
retries: 5
|
||||
delay: 2
|
||||
with_items: "{{ neutron_lbaas_distro_packages }}"
|
||||
when:
|
||||
- neutron_services['neutron-lbaasv2-agent']['group'] in group_names
|
||||
- neutron_lbaasv2 | bool
|
||||
|
||||
- name: Install yum packages for VPNaaS
|
||||
yum:
|
||||
pkg: "{{ item }}"
|
||||
state: "{{ neutron_package_state }}"
|
||||
register: install_packages
|
||||
until: install_packages|success
|
||||
retries: 5
|
||||
delay: 2
|
||||
with_items: "{{ neutron_vpnaas_distro_packages }}"
|
||||
when:
|
||||
- neutron_services['neutron-vpnaas-agent']['group'] in group_names
|
||||
- neutron_vpnaas | bool
|
||||
|
||||
- name: Remove known problem packages
|
||||
yum:
|
||||
pkg: "{{ item }}"
|
||||
state: absent
|
||||
register: remove_packages
|
||||
until: remove_packages|success
|
||||
retries: 5
|
||||
delay: 2
|
||||
with_items: "{{ neutron_remove_distro_packages }}"
|
||||
@ -13,11 +13,121 @@
|
||||
# See the License for the specific language governing permissions and
|
||||
# limitations under the License.
|
||||
|
||||
- include: neutron_install-apt.yml
|
||||
when: ansible_pkg_mgr == 'apt'
|
||||
- name: Ensure apt cache is up to date
|
||||
apt:
|
||||
update_cache: yes
|
||||
cache_valid_time: "{{ cache_timeout }}"
|
||||
when:
|
||||
- ansible_pkg_mgr == 'apt'
|
||||
|
||||
- include: neutron_install-yum.yml
|
||||
when: ansible_pkg_mgr == 'yum'
|
||||
- name: Add Ubuntu Cloud Archive key package
|
||||
package:
|
||||
name: ubuntu-cloud-keyring
|
||||
state: "{{ neutron_package_state }}"
|
||||
when:
|
||||
- neutron_uca_enable
|
||||
- ansible_pkg_mgr == 'apt'
|
||||
register: neutron_uca_add_keys
|
||||
tags:
|
||||
- add-apt-keys
|
||||
|
||||
- name: Add Ubuntu Cloud Archive apt repository
|
||||
apt_repository:
|
||||
repo: "{{ uca_repo }}"
|
||||
state: present
|
||||
update_cache: yes
|
||||
register: neutron_uca_add_repo
|
||||
when:
|
||||
- neutron_uca_enable
|
||||
- ansible_pkg_mgr == 'apt'
|
||||
until: add_repo|success
|
||||
retries: 5
|
||||
delay: 2
|
||||
tags:
|
||||
- add-uca-repo
|
||||
|
||||
- name: Install RDO package
|
||||
package:
|
||||
name: "{{ rdo_package }}"
|
||||
state: "present"
|
||||
register: install_cloud_rdo_package
|
||||
until: install_cloud_rdo_package | success
|
||||
retries: 5
|
||||
delay: 2
|
||||
when:
|
||||
- ansible_pkg_mgr == 'yum'
|
||||
|
||||
- name: Install neutron distro packages
|
||||
package:
|
||||
name: "{{ item }}"
|
||||
state: "{{ neutron_package_state }}"
|
||||
register: install_packages
|
||||
until: install_packages|success
|
||||
retries: 5
|
||||
delay: 2
|
||||
with_items: "{{ neutron_distro_packages }}"
|
||||
|
||||
- name: Install distro packages for LXB
|
||||
package:
|
||||
name: "{{ item }}"
|
||||
state: "{{ neutron_package_state }}"
|
||||
register: install_packages
|
||||
until: install_packages|success
|
||||
retries: 5
|
||||
delay: 2
|
||||
with_items: "{{ neutron_lxb_distro_packages }}"
|
||||
when:
|
||||
- neutron_services['neutron-linuxbridge-agent']['group'] in group_names
|
||||
- neutron_services['neutron-linuxbridge-agent'].service_en | bool
|
||||
|
||||
- name: Install distro packages for OVS
|
||||
package:
|
||||
name: "{{ item }}"
|
||||
state: "{{ neutron_package_state }}"
|
||||
register: install_packages
|
||||
until: install_packages|success
|
||||
retries: 5
|
||||
delay: 2
|
||||
with_items: "{{ neutron_ovs_distro_packages }}"
|
||||
when:
|
||||
- neutron_services['neutron-openvswitch-agent']['group'] in group_names
|
||||
- neutron_services['neutron-openvswitch-agent'].service_en | bool
|
||||
|
||||
- name: Install distro packages for LBaaS
|
||||
package:
|
||||
name: "{{ item }}"
|
||||
state: "{{ neutron_package_state }}"
|
||||
register: install_packages
|
||||
until: install_packages|success
|
||||
retries: 5
|
||||
delay: 2
|
||||
with_items: "{{ neutron_lbaas_distro_packages }}"
|
||||
when:
|
||||
- neutron_services['neutron-lbaasv2-agent']['group'] in group_names
|
||||
- neutron_lbaasv2 | bool
|
||||
|
||||
- name: Install distro packages for VPNaaS
|
||||
package:
|
||||
name: "{{ item }}"
|
||||
state: "{{ neutron_package_state }}"
|
||||
register: install_packages
|
||||
until: install_packages|success
|
||||
retries: 5
|
||||
delay: 2
|
||||
with_items: "{{ neutron_vpnaas_distro_packages }}"
|
||||
when:
|
||||
- neutron_services['neutron-vpnaas-agent']['group'] in group_names
|
||||
- neutron_vpnaas | bool
|
||||
|
||||
- name: Remove known problem packages
|
||||
package:
|
||||
name: "{{ item }}"
|
||||
state: absent
|
||||
register: remove_packages
|
||||
until: remove_packages|success
|
||||
retries: 5
|
||||
delay: 2
|
||||
with_items: "{{ neutron_remove_distro_packages }}"
|
||||
|
||||
- name: Create developer mode constraint file
|
||||
copy:
|
||||
|
||||
Loading…
Reference in New Issue
Block a user