Skip to content

Commit f67d580

Browse files
authored
removed ansible pinned version, will now install latest ansible (#3242)
[sc-14721]
1 parent 724c8d1 commit f67d580

File tree

3 files changed

+5
-8
lines changed

3 files changed

+5
-8
lines changed

Makefile

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11

22
# Default values if not already set
3-
ANSIBLE_VERSION ?= 2.12.*
43
PGOROOT ?= $(CURDIR)
54
PGO_BASEOS ?= ubi8
65
PGO_IMAGE_PREFIX ?= crunchydata
@@ -161,7 +160,6 @@ $(PGOROOT)/build/%/Dockerfile:
161160
--build-arg PREFIX=$(PGO_IMAGE_PREFIX) \
162161
--build-arg PGVERSION=$(PGO_PG_VERSION) \
163162
--build-arg BACKREST_VERSION=$(PGO_BACKREST_VERSION) \
164-
--build-arg ANSIBLE_VERSION=$(ANSIBLE_VERSION) \
165163
--build-arg DFSET=$(DFSET) \
166164
--build-arg PACKAGER=$(PACKAGER) \
167165
$(PGOROOT)

build/pgo-deployer/Dockerfile

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@ ARG PREFIX
44
FROM ${PREFIX}/pgo-base:${BASEOS}-${BASEVER}
55

66
ARG BASEOS
7-
ARG ANSIBLE_VERSION
87
ARG PACKAGER
98
ARG DFSET
109

@@ -19,7 +18,7 @@ RUN if [ "$DFSET" = "centos" ] ; then \
1918
&& ${PACKAGER} -y install \
2019
--setopt=skip_missing_names_on_install=False \
2120
kubectl \
22-
ansible-core-${ANSIBLE_VERSION} \
21+
ansible \
2322
which \
2423
gettext \
2524
&& ${PACKAGER} -y clean all ; \
@@ -32,7 +31,7 @@ RUN if [ "$BASEOS" = "rhel7" ] ; then \
3231
--setopt=skip_missing_names_on_install=False \
3332
--enablerepo='rhel-7-server-ose-4.4-rpms' \
3433
openshift-clients \
35-
ansible-core-${ANSIBLE_VERSION} \
34+
ansible \
3635
which \
3736
gettext \
3837
&& ${PACKAGER} -y clean all --enablerepo='rhel-7-server-ose-4.4-rpms' ; \
@@ -45,7 +44,7 @@ RUN if [ "$BASEOS" = "ubi7" ] ; then \
4544
--setopt=skip_missing_names_on_install=False \
4645
--enablerepo='rhel-7-server-ose-4.4-rpms' \
4746
openshift-clients \
48-
ansible-core-${ANSIBLE_VERSION} \
47+
ansible \
4948
which \
5049
gettext \
5150
&& ${PACKAGER} -y clean all --enablerepo='rhel-7-server-ose-4.4-rpms' ; \
@@ -58,7 +57,7 @@ RUN if [ "$BASEOS" = "ubi8" ] ; then \
5857
--setopt=skip_missing_names_on_install=False \
5958
--enablerepo='rhocp-4.5-for-rhel-8-x86_64-rpms' \
6059
openshift-clients \
61-
ansible-core-${ANSIBLE_VERSION} \
60+
ansible \
6261
which \
6362
gettext \
6463
&& ${PACKAGER} -y clean all --enablerepo='rhocp-4.5-for-rhel-8-x86_64-rpms' ; \

installers/image/conf/kubernetes.repo

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,5 +3,5 @@ name=Kubernetes
33
baseurl=https://packages.cloud.google.com/yum/repos/kubernetes-el7-x86_64
44
enabled=1
55
gpgcheck=1
6-
repo_gpgcheck=1
6+
repo_gpgcheck=0
77
gpgkey=https://packages.cloud.google.com/yum/doc/yum-key.gpg https://packages.cloud.google.com/yum/doc/rpm-package-key.gpg

0 commit comments

Comments
 (0)