Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

CB-28369: Bump saltboot version to 0.14.2 which includes fallback to HTTP #1117

Draft
wants to merge 1 commit into
base: master
Choose a base branch
from
Draft

CB-28369: Bump saltboot version to 0.14.2 which includes fallback to HTTP #1117

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 5 additions & 3 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -166,12 +166,14 @@ ifeq ($(SALT_NEWER_PYZMQ),1)
else
PYZMQ_VERSION ?= 19.0
endif
SALTBOOT_VERSION ?= "0.14.0"
SALTBOOT_VERSION ?= "0.14.2"
ifneq ($(CLOUD_PROVIDER),YARN)
ifneq ($(OS),centos7)
SALTBOOT_MINOR_VERSION = $(shell echo $(SALTBOOT_VERSION) | cut -d. -f2)
ifeq ($(shell [[ $(SALTBOOT_MINOR_VERSION) -ge 14 ]] && echo true),true)
SALTBOOT_HTTPS_ENABLED ?= false
SALTBOOT_PATCH_VERSION = $(shell echo $(SALTBOOT_VERSION) | cut -d. -f3)
# Version 0.14.1 introduced saltboot HTTPS including fallback to HTTP
ifeq ($(shell [[ ($(SALTBOOT_MINOR_VERSION) -eq 14 && $(SALTBOOT_PATCH_VERSION) -ge 1) || $(SALTBOOT_MINOR_VERSION) -ge 15 ]] && echo true),true)
SALTBOOT_HTTPS_ENABLED ?= true
else
SALTBOOT_HTTPS_ENABLED ?= false
endif
Expand Down