From 7cac893f7dcf10d9f3056f168819bc8bedfd4554 Mon Sep 17 00:00:00 2001
From: Patrick Uiterwijk <patrick@puiterwijk.org>
Date: Jan 07 2019 12:12:56 +0000
Subject: [PATCH 1/2] Bump the container for tests to f28/f29


Signed-off-by: Patrick Uiterwijk <patrick@puiterwijk.org>

---

diff --git a/Makefile b/Makefile
index 22030f3..df6da65 100644
--- a/Makefile
+++ b/Makefile
@@ -141,17 +141,17 @@ container-centos7:
 	@(cat tests/containers/Dockerfile-base tests/containers/Dockerfile-centos tests/containers/Dockerfile-rpm; echo "USER testuser") | sed -e 's/BASE/centos:7/' | docker build -f - -q -t ipsilon-centos7 -
 	@echo "CentOS 7 container built"
 
-container-fedora26:
-	@echo "Building Fedora 26 container ..."
-	@(cat tests/containers/Dockerfile-base tests/containers/Dockerfile-fedora tests/containers/Dockerfile-rpm; echo "USER testuser") | sed -e 's/BASE/fedora:26/' | docker build -f - -q -t ipsilon-fedora26 -
-	@echo "Fedora 26 container built"
+container-fedora28:
+	@echo "Building Fedora 28 container ..."
+	@(cat tests/containers/Dockerfile-base tests/containers/Dockerfile-fedora tests/containers/Dockerfile-rpm; echo "USER testuser") | sed -e 's/BASE/fedora:28/' | docker build -f - -q -t ipsilon-fedora28 -
+	@echo "Fedora 28 container built"
 
-container-fedora27:
-	@echo "Building Fedora 27 container ..."
-	@(cat tests/containers/Dockerfile-base tests/containers/Dockerfile-fedora tests/containers/Dockerfile-rpm; echo "USER testuser") | sed -e 's/BASE/fedora:27/' | docker build -f - -q -t ipsilon-fedora27 -
-	@echo "Fedora 27 container built"
+container-fedora29:
+	@echo "Building Fedora 29 container ..."
+	@(cat tests/containers/Dockerfile-base tests/containers/Dockerfile-fedora tests/containers/Dockerfile-rpm; echo "USER testuser") | sed -e 's/BASE/fedora:29/' | docker build -f - -q -t ipsilon-fedora29 -
+	@echo "Fedora 29 container built"
 
-containers: container-centos6 container-centos7 container-fedora26 container-fedora27
+containers: container-centos6 container-centos7 container-fedora28 container-fedora29
 	@echo "Containers built"
 
 containertest-centos6: container-centos6
@@ -163,20 +163,20 @@ containertest-centos7: container-centos7
 	@docker run -v `pwd`:/code -t --rm ipsilon-centos7
 	@echo "CentOS 7 passed"
 
-containertest-fedora26: container-fedora26
-	@echo "Starting Fedora 26 tests ..."
-	@docker run -v `pwd`:/code -t --rm ipsilon-fedora26
-	@echo "Fedora 26 passed"
+containertest-fedora28: container-fedora28
+	@echo "Starting Fedora 28 tests ..."
+	@docker run -v `pwd`:/code -t --rm ipsilon-fedora28
+	@echo "Fedora 28 passed"
 
-containertest-fedora27: container-fedora27
-	@echo "Starting Fedora 27 tests ..."
-	@docker run -v `pwd`:/code -t --rm ipsilon-fedora27
-	@echo "Fedora 27 passed"
+containertest-fedora29: container-fedora29
+	@echo "Starting Fedora 29 tests ..."
+	@docker run -v `pwd`:/code -t --rm ipsilon-fedora29
+	@echo "Fedora 29 passed"
 
-containertest-lint: container-fedora27
+containertest-lint: container-fedora29
 	@echo "Starting code lint tests ..."
-	@docker run -v `pwd`:/code -t --rm --entrypoint /usr/bin/make ipsilon-fedora27 lint pep8
+	@docker run -v `pwd`:/code -t --rm --entrypoint /usr/bin/make ipsilon-fedora29 lint pep8
 	@echo "Code lint tests passed"
 
-containertest: containertest-lint containertest-centos6 containertest-centos7 containertest-fedora26 containertest-fedora27
+containertest: containertest-lint containertest-centos6 containertest-centos7 containertest-fedora28 containertest-fedora29
 	@echo "Container tests passed"

From 065db68e87ffacde897095f236ff8bca5cca781e Mon Sep 17 00:00:00 2001
From: Patrick Uiterwijk <patrick@puiterwijk.org>
Date: Jan 07 2019 12:15:18 +0000
Subject: [PATCH 2/2] Fix a few lint issues with IPA helper


Signed-off-by: Patrick Uiterwijk <patrick@puiterwijk.org>

---

diff --git a/ipsilon/helpers/ipa.py b/ipsilon/helpers/ipa.py
index c14a9ea..481f7fc 100644
--- a/ipsilon/helpers/ipa.py
+++ b/ipsilon/helpers/ipa.py
@@ -70,18 +70,18 @@ class Installer(EnvHelpersInstaller):
         if 'gssapi_httpd_keytab' in opts:
             msg = "Searching for keytab in: %s" % opts['gssapi_httpd_keytab']
             if os.path.exists(opts['gssapi_httpd_keytab']):
-                logger.info(msg + "... Found!")
+                logger.info("%s... Found!", msg)
                 return
             else:
-                logger.info(msg + "... Not found!")
+                logger.info("%s... Not found!", msg)
 
         msg = "Searching for keytab in: %s" % HTTPD_IPA_KEYTAB
         if os.path.exists(HTTPD_IPA_KEYTAB):
             opts['gssapi_httpd_keytab'] = HTTPD_IPA_KEYTAB
-            logger.info(msg + "... Found!")
+            logger.info("%s... Found!", msg)
             return
         else:
-            logger.info(msg + "... Not found!")
+            logger.info("%s... Not found!", msg)
 
         us = socket.gethostname()
         princ = 'HTTP/%s' % us