Updated role using the Multi-Distro framework
* The default apt packages have been moved into a var file that is only loaded when the detected OS is matched. * The Install task file has had the apt specific tasks moved into a named install task file. Change-Id: I5fa925c546affbd27f70f1d483ac78a23f2e6e62
This commit is contained in:
parent
2ee7a0bbe5
commit
e2e0d0d0c2
|
@ -103,21 +103,6 @@ barbican_ssl_self_signed_subject: "/C=US/ST=Texas/L=San Antonio/O=IT/CN={{ inter
|
|||
#barbican_user_ssl_key: <path to cert on ansible deployment host>
|
||||
#barbican_user_ssl_ca_cert: <path to cert on ansible deployment host>
|
||||
|
||||
barbican_apt_packages:
|
||||
- apache2
|
||||
- apache2-utils
|
||||
- libapache2-mod-wsgi
|
||||
- python-dev
|
||||
- libssl-dev
|
||||
# - libxml2-dev
|
||||
# - libmysqlclient-dev
|
||||
# - libxslt-dev
|
||||
- libpq-dev
|
||||
- git
|
||||
- libffi-dev
|
||||
- gettext
|
||||
- build-essential
|
||||
|
||||
barbican_pip_packages:
|
||||
- alembic
|
||||
- Babel
|
||||
|
|
|
@ -21,5 +21,7 @@ dependencies:
|
|||
- role: pip_install
|
||||
when:
|
||||
- barbican_developer_mode | bool
|
||||
- apt_package_pinning
|
||||
- role: apt_package_pinning
|
||||
when:
|
||||
- ansible_pkg_mgr == 'apt'
|
||||
- galera_client
|
||||
|
|
|
@ -0,0 +1,32 @@
|
|||
# Copyright 2016, Intel Corporation.
|
||||
#
|
||||
# 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: Update apt sources
|
||||
apt:
|
||||
update_cache: "yes"
|
||||
cache_valid_time: "600"
|
||||
register: apt_update
|
||||
until: apt_update |success
|
||||
retries: 5
|
||||
delay: 2
|
||||
|
||||
- name: Install apt packages for Barbican
|
||||
apt:
|
||||
pkg: "{{ item }}"
|
||||
state: "latest"
|
||||
register: install_barbican_apt_packages
|
||||
until: install_barbican_apt_packages |success
|
||||
retries: 5
|
||||
delay: 2
|
||||
with_items: barbican_apt_packages
|
|
@ -13,14 +13,9 @@
|
|||
# See the License for the specific language governing permissions and
|
||||
# limitations under the License.
|
||||
|
||||
- name: Update apt sources
|
||||
apt:
|
||||
update_cache: "yes"
|
||||
cache_valid_time: "600"
|
||||
register: apt_update
|
||||
until: apt_update |success
|
||||
retries: 5
|
||||
delay: 2
|
||||
- include: barbican_install_apt.yml
|
||||
when:
|
||||
- ansible_pkg_mgr == 'apt'
|
||||
tags:
|
||||
- barbican-apt-packages
|
||||
- barbican-apt-sources
|
||||
|
|
|
@ -15,6 +15,15 @@
|
|||
|
||||
# Main tasks file for openstack-ansible-barbican
|
||||
|
||||
- name: Gather variables for each operating system
|
||||
include_vars: "{{ item }}"
|
||||
with_first_found:
|
||||
- "{{ ansible_distribution | lower }}-{{ ansible_distribution_version | lower }}.yml"
|
||||
- "{{ ansible_distribution | lower }}.yml"
|
||||
- "{{ ansible_os_family | lower }}.yml"
|
||||
tags:
|
||||
- always
|
||||
|
||||
- include: pre-install.yml
|
||||
|
||||
- include: install.yml
|
||||
|
|
|
@ -0,0 +1,28 @@
|
|||
# Copyright 2016, Intel Corporation.
|
||||
#
|
||||
# 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.
|
||||
|
||||
barbican_apt_packages:
|
||||
- apache2
|
||||
- apache2-utils
|
||||
- libapache2-mod-wsgi
|
||||
- python-dev
|
||||
- libssl-dev
|
||||
# - libxml2-dev
|
||||
# - libmysqlclient-dev
|
||||
# - libxslt-dev
|
||||
- libpq-dev
|
||||
- git
|
||||
- libffi-dev
|
||||
- gettext
|
||||
- build-essential
|
Loading…
Reference in New Issue