Merge "Remove dependency on python2_lxc git source"

This commit is contained in:
Jenkins 2016-02-24 01:40:01 +00:00 committed by Gerrit Code Review
commit 3fdd67d715
4 changed files with 9 additions and 26 deletions

View File

@ -36,10 +36,6 @@
src: https://git.openstack.org/openstack/openstack-ansible-pip_lock_down
scm: git
version: master
- name: py_from_git
src: https://git.openstack.org/openstack/openstack-ansible-py_from_git
scm: git
version: master
- name: rsyslog_client
src: https://git.openstack.org/openstack/openstack-ansible-rsyslog_client
scm: git

View File

@ -1,19 +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.
## Git Source for python2-lxc library
git_repo: https://github.com/lxc/python2-lxc
git_install_branch: 0553f05d23b56b59bf3015fa5e45bfbfab9021ef # HEAD of "master" as of 17.01.2016
git_dest: "/opt/lxc_python2_{{ git_install_branch|replace('/', '_') }}"

View File

@ -19,7 +19,6 @@
user: root
roles:
- { role: "lxc_hosts", tags: [ "lxc-host", "host-setup" ] }
- { role: "py_from_git", tags: [ "lxc-libs" ] }
- role: "rsyslog_client"
rsyslog_client_log_rotate_file: lxc_log_rotate
rsyslog_client_log_dir: "/var/log/lxc"
@ -27,5 +26,3 @@
tags:
- "lxc-rsyslog-client"
- "rsyslog-client"
vars_files:
- defaults/repo_packages/python2_lxc.yml

View File

@ -0,0 +1,9 @@
---
upgrade:
- The git source for python2_lxc was used in the past as the package was not
available on pypi. Now that the package
`has been published <https://pypi.python.org/pypi/lxc-python2>`_ the
`py_from_git` role dependency has been removed from the `lxc_hosts`
playbook, the role has been removed from the required roles list and the
repo details have been removed from the repo_packages files as none of
these details are required any more.