Skip to content

Commit fa08ea2

Browse files
committed
ansible: name for git package differs on centos7
When trying to ansible test-rackspace-centos7-x64-1 I found that it can't install git, because that's 1.8, and it has git216 installed. So, git can't be shared by all centos7 platforms, the name differs, move into a more specific package list. PR-URL: #2262
1 parent bec0ae2 commit fa08ea2

File tree

1 file changed

+6
-3
lines changed

1 file changed

+6
-3
lines changed

ansible/roles/baselayout/vars/main.yml

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -39,11 +39,14 @@ packages: {
3939
'ccache,git2u,gcc-c++,devtoolset-6,sudo', # even need gcc on centos6 so ccache has symlinks
4040
],
4141

42+
# centos-release-scl is required to enable SCLo but we do it manually in
43+
# partials/repo/centos7.yml for arm64
4244
centos7_arm64: ['git'], # git2u not available for aarch64 (yet)
43-
centos7_x64: ['git2u','centos-release-scl',], # centos-release-scl is required to enable SCLo
44-
# but we do it manually in partials/repo/centos7.yml for arm64
45+
centos7_x64: ['git2u,centos-release-scl'],
46+
centos7_ppc64: ['git'],
47+
4548
centos7: [
46-
'bzip2-devel,openssl-devel,ccache,gcc-c++,devtoolset-6,sudo,git,devtoolset-6-libatomic-devel,zlib-devel,libffi-devel,devtoolset-8,devtoolset-8-libatomic-devel',
49+
'bzip2-devel,openssl-devel,ccache,gcc-c++,devtoolset-6,sudo,devtoolset-6-libatomic-devel,zlib-devel,libffi-devel,devtoolset-8,devtoolset-8-libatomic-devel',
4750
],
4851

4952
aix: [

0 commit comments

Comments
 (0)