Remove unnecessary package install duplication

Currently the devel packages are installed everywhere,
but they only need to be where the wheels are built.

Also, there is already a task to install the packages
needed on the target hosts when installing - so we do
not need to give the same list to the venv install role
because they will already have been installed.

We remove the unnecessary installation of the compiling
packages because the python venv build role already does
it. We also remove the curl and which packages as they
appear to be unused. The git package is moved to the
devel package list as it's only used there.

We also re-order the package lists alphabetically to
make them easier to follow.

Depends-On: https://review.openstack.org/613585
Change-Id: I6d037c45aee8b54502a2e3f3add56b23be34109d
This commit is contained in:
Jesse Pretorius 2018-10-30 19:46:03 +00:00 committed by Jonathan Rosser
parent ea72d83a9e
commit 430932f274
5 changed files with 13 additions and 24 deletions

View File

@ -40,8 +40,8 @@
name: "python_venv_build"
private: yes
vars:
venv_build_distro_package_list: "{{ swift_devel_distro_packages }}"
venv_install_destination_path: "{{ swift_bin | dirname }}"
venv_install_distro_package_list: "{{ swift_distro_packages }}"
venv_pip_install_args: "{{ swift_pip_install_args }}"
venv_pip_packages: "{{ swift_pip_packages }}"
venv_facts_when_changed:

View File

@ -16,18 +16,15 @@
cache_timeout: 600
swift_distro_packages:
- curl
- git-core
- liberasurecode1
- openssh-server
- openssh-client
- rsync
swift_devel_distro_packages:
- gcc
- liberasurecode1
- git-core
- liberasurecode-dev
- libffi-dev
- python-dev
- libssl-dev
swift_service_distro_packages:

View File

@ -14,21 +14,17 @@
# limitations under the License.
swift_distro_packages:
- curl
- git
- cronie
- cronie-anacron
- liberasurecode
- openssh-server
- openssh-clients
- rsync
- cronie
- cronie-anacron
- which
swift_devel_distro_packages:
- gcc
- liberasurecode
- git
- liberasurecode-devel
- libffi-devel
- python-devel
- openssl-devel
swift_service_distro_packages:
@ -39,4 +35,4 @@ swift_service_distro_packages:
swift_rsync_service_name: rsyncd
swift_sshd: sshd
swift_sshd: sshd

View File

@ -13,5 +13,5 @@
# See the License for the specific language governing permissions and
# limitations under the License.
swift_package_list: "{{ swift_distro_packages + swift_devel_distro_packages }}"
swift_package_list: "{{ swift_distro_packages }}"
_swift_bin: "/openstack/venvs/swift-{{ swift_venv_tag }}/bin"

View File

@ -15,20 +15,16 @@
# limitations under the License.
swift_distro_packages:
- curl
- git-core
- openssh
- rsync
- cronie
- cronie-anacron
- which
- liberasurecode1
- openssh
- rsync
swift_devel_distro_packages:
- gcc
- liberasurecode1
- git-core
- liberasurecode-devel
- libffi-devel
- python-devel
- libopenssl-devel
swift_service_distro_packages: