Skip to content

Commit cdb461b

Browse files
ValClarksonandrewlecuyer
authored andcommitted
updated ansible in makefile and docker file
[sc-14721]
1 parent 5d3ca35 commit cdb461b

File tree

2 files changed

+5
-5
lines changed

2 files changed

+5
-5
lines changed

Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ GOPATH ?= $(HOME)/odev/go
22
GOBIN ?= $(GOPATH)/bin
33

44
# Default values if not already set
5-
ANSIBLE_VERSION ?= 2.9.*
5+
ANSIBLE_VERSION ?= 2.12.*
66
PGOROOT ?= $(GOPATH)/src/github.com/crunchydata/postgres-operator
77
PGO_BASEOS ?= ubi8
88
PGO_CMD ?= kubectl

build/pgo-deployer/Dockerfile

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ RUN if [ "$DFSET" = "centos" ] ; then \
1919
&& ${PACKAGER} -y install \
2020
--setopt=skip_missing_names_on_install=False \
2121
kubectl \
22-
ansible-${ANSIBLE_VERSION} \
22+
ansible-core-${ANSIBLE_VERSION} \
2323
which \
2424
gettext \
2525
&& ${PACKAGER} -y clean all ; \
@@ -32,7 +32,7 @@ RUN if [ "$BASEOS" = "rhel7" ] ; then \
3232
--setopt=skip_missing_names_on_install=False \
3333
--enablerepo='rhel-7-server-ose-4.4-rpms' \
3434
openshift-clients \
35-
ansible-${ANSIBLE_VERSION} \
35+
ansible-core-${ANSIBLE_VERSION} \
3636
which \
3737
gettext \
3838
&& ${PACKAGER} -y clean all --enablerepo='rhel-7-server-ose-4.4-rpms' ; \
@@ -45,7 +45,7 @@ RUN if [ "$BASEOS" = "ubi7" ] ; then \
4545
--setopt=skip_missing_names_on_install=False \
4646
--enablerepo='rhel-7-server-ose-4.4-rpms' \
4747
openshift-clients \
48-
ansible-${ANSIBLE_VERSION} \
48+
ansible-core-${ANSIBLE_VERSION} \
4949
which \
5050
gettext \
5151
&& ${PACKAGER} -y clean all --enablerepo='rhel-7-server-ose-4.4-rpms' ; \
@@ -58,7 +58,7 @@ RUN if [ "$BASEOS" = "ubi8" ] ; then \
5858
--setopt=skip_missing_names_on_install=False \
5959
--enablerepo='rhocp-4.5-for-rhel-8-x86_64-rpms' \
6060
openshift-clients \
61-
ansible-${ANSIBLE_VERSION} \
61+
ansible-core-${ANSIBLE_VERSION} \
6262
which \
6363
gettext \
6464
&& ${PACKAGER} -y clean all --enablerepo='rhocp-4.5-for-rhel-8-x86_64-rpms' ; \

0 commit comments

Comments
 (0)