From 5e5367ea4f5484007213c01cfccaf87b0d76f9b1 Mon Sep 17 00:00:00 2001 From: Jesse Pretorius Date: Fri, 5 Feb 2016 14:52:04 +0000 Subject: [PATCH] Remove dependency on python2_lxc git source The git source for python2_lxc was necessary before the package was available on pypi, which it now is: - https://pypi.python.org/pypi/lxc-python2 This patch removes the py_from_git role dependency from the lxc_hosts playbook, the role from the required roles list and the repo details from the repo_packages as none of these are required. Change-Id: Ia32665c9507b3a80096b201067f5329a1c3533fb --- ansible-role-requirements.yml | 4 ---- .../defaults/repo_packages/python2_lxc.yml | 19 ------------------- playbooks/lxc-hosts-setup.yml | 3 --- ...hon2-lxc-git-removal-5d20c07d80aaa75b.yaml | 9 +++++++++ 4 files changed, 9 insertions(+), 26 deletions(-) delete mode 100644 playbooks/defaults/repo_packages/python2_lxc.yml create mode 100644 releasenotes/notes/python2-lxc-git-removal-5d20c07d80aaa75b.yaml diff --git a/ansible-role-requirements.yml b/ansible-role-requirements.yml index 8cee89303d..6376ea057e 100644 --- a/ansible-role-requirements.yml +++ b/ansible-role-requirements.yml @@ -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 diff --git a/playbooks/defaults/repo_packages/python2_lxc.yml b/playbooks/defaults/repo_packages/python2_lxc.yml deleted file mode 100644 index bda68abe52..0000000000 --- a/playbooks/defaults/repo_packages/python2_lxc.yml +++ /dev/null @@ -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('/', '_') }}" diff --git a/playbooks/lxc-hosts-setup.yml b/playbooks/lxc-hosts-setup.yml index c1e0bde519..bec6c599db 100644 --- a/playbooks/lxc-hosts-setup.yml +++ b/playbooks/lxc-hosts-setup.yml @@ -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 diff --git a/releasenotes/notes/python2-lxc-git-removal-5d20c07d80aaa75b.yaml b/releasenotes/notes/python2-lxc-git-removal-5d20c07d80aaa75b.yaml new file mode 100644 index 0000000000..34f3a80580 --- /dev/null +++ b/releasenotes/notes/python2-lxc-git-removal-5d20c07d80aaa75b.yaml @@ -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 `_ 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.