PR#6: Bump Nodepool to 3.9.0 for master - rpms/nodepool

		`@@ -0,0 +1,223 @@`
		`+ From 6311454aa4e49f32c1b4515e5804259aa52b1a9a Mon Sep 17 00:00:00 2001`
		`+ From: Fabien Boucher <fboucher@redhat.com>`
		`+ Date: Wed, 30 Oct 2019 11:26:47 +0100`
		`+ Subject: [PATCH] Remove uneeded shebang and exec bit on some files`
		`+`
		`+ Having python files with exec bit and shebang defined in`
		`+ /usr/lib/python-*/site-package/ is not fine in a RPM package.`
		`+`
		`+ Instead of carrying a patch in nodepool RPM packaging better`
		`+ to fix this directly upstream.`
		`+`
		`+ Change-Id: I5a01e21243f175d28c67376941149e357cdacd26`
		`+ ---`
		`+ nodepool/builder.py \| 1 -`
		`+ nodepool/cmd/__init__.py \| 1 -`
		`+ nodepool/cmd/builder.py \| 6 ------`
		`+ nodepool/cmd/launcher.py \| 5 -----`
		`+ nodepool/cmd/nodepoolcmd.py \| 7 -------`
		`+ nodepool/config.py \| 2 --`
		`+ nodepool/exceptions.py \| 2 --`
		`+ nodepool/launcher.py \| 2 --`
		`+ nodepool/nodeutils.py \| 2 --`
		`+ nodepool/provider_manager.py \| 2 --`
		`+ nodepool/stats.py \| 2 --`
		`+ nodepool/status.py \| 2 --`
		`+ nodepool/zk.py \| 2 --`
		`+ 13 files changed, 36 deletions(-)`
		`+ mode change 100755 => 100644 nodepool/builder.py`
		`+ mode change 100755 => 100644 nodepool/cmd/launcher.py`
		`+ mode change 100755 => 100644 nodepool/cmd/nodepoolcmd.py`
		`+ mode change 100755 => 100644 nodepool/config.py`
		`+ mode change 100755 => 100644 nodepool/exceptions.py`
		`+ mode change 100755 => 100644 nodepool/launcher.py`
		`+ mode change 100755 => 100644 nodepool/nodeutils.py`
		`+ mode change 100755 => 100644 nodepool/provider_manager.py`
		`+ mode change 100755 => 100644 nodepool/stats.py`
		`+ mode change 100755 => 100644 nodepool/status.py`
		`+ mode change 100755 => 100644 nodepool/zk.py`
		`+`
		`+ diff --git a/nodepool/builder.py b/nodepool/builder.py`
		`+ old mode 100755`
		`+ new mode 100644`
		`+ index 85ac6b7..f05fdd5`
		`+ --- a/nodepool/builder.py`
		`+ +++ b/nodepool/builder.py`
		`+ @@ -1,4 +1,3 @@`
		`+ -#!/usr/bin/env python`
		`+ # Copyright 2015 Hewlett-Packard Development Company, L.P.`
		`+ #`
		`+ # Licensed under the Apache License, Version 2.0 (the "License"); you may`
		`+ diff --git a/nodepool/cmd/__init__.py b/nodepool/cmd/__init__.py`
		`+ index 2e37adf..528a324 100644`
		`+ --- a/nodepool/cmd/__init__.py`
		`+ +++ b/nodepool/cmd/__init__.py`
		`+ @@ -1,4 +1,3 @@`
		`+ -#!/usr/bin/env python`
		`+ # Copyright 2012 Hewlett-Packard Development Company, L.P.`
		`+ # Copyright 2013 OpenStack Foundation`
		`+ #`
		`+ diff --git a/nodepool/cmd/builder.py b/nodepool/cmd/builder.py`
		`+ index 1057992..46f304a 100644`
		`+ --- a/nodepool/cmd/builder.py`
		`+ +++ b/nodepool/cmd/builder.py`
		`+ @@ -1,5 +1,3 @@`
		`+ -#!/usr/bin/env python`
		`+ -#`
		`+ # Licensed under the Apache License, Version 2.0 (the "License"); you may`
		`+ # not use this file except in compliance with the License. You may obtain`
		`+ # a copy of the License at`
		`+ @@ -66,7 +64,3 @@ class NodePoolBuilderApp(nodepool.cmd.NodepoolDaemonApp):`
		`+`
		`+ def main():`
		`+ return NodePoolBuilderApp.main()`
		`+ -`
		`+ -`
		`+ -if __name__ == "__main__":`
		`+ - sys.exit(main())`
		`+ diff --git a/nodepool/cmd/launcher.py b/nodepool/cmd/launcher.py`
		`+ old mode 100755`
		`+ new mode 100644`
		`+ index a812cf0..23c2677`
		`+ --- a/nodepool/cmd/launcher.py`
		`+ +++ b/nodepool/cmd/launcher.py`
		`+ @@ -1,4 +1,3 @@`
		`+ -#!/usr/bin/env python`
		`+ # Copyright 2012 Hewlett-Packard Development Company, L.P.`
		`+ # Copyright 2013 OpenStack Foundation`
		`+ #`
		`+ @@ -80,7 +79,3 @@ class NodePoolLauncherApp(nodepool.cmd.NodepoolDaemonApp):`
		`+`
		`+ def main():`
		`+ return NodePoolLauncherApp.main()`
		`+ -`
		`+ -`
		`+ -if __name__ == "__main__":`
		`+ - sys.exit(main())`
		`+ diff --git a/nodepool/cmd/nodepoolcmd.py b/nodepool/cmd/nodepoolcmd.py`
		`+ old mode 100755`
		`+ new mode 100644`
		`+ index fdfeab4..1bba30f`
		`+ --- a/nodepool/cmd/nodepoolcmd.py`
		`+ +++ b/nodepool/cmd/nodepoolcmd.py`
		`+ @@ -1,5 +1,3 @@`
		`+ -#!/usr/bin/env python`
		`+ -#`
		`+ # Copyright 2013 OpenStack Foundation`
		`+ #`
		`+ # Licensed under the Apache License, Version 2.0 (the "License"); you may`
		`+ @@ -15,7 +13,6 @@`
		`+ # under the License.`
		`+`
		`+ import logging.config`
		`+ -import sys`
		`+`
		`+ from prettytable import PrettyTable`
		`+`
		`+ @@ -384,7 +381,3 @@ class NodePoolCmd(NodepoolApp):`
		`+`
		`+ def main():`
		`+ return NodePoolCmd.main()`
		`+ -`
		`+ -`
		`+ -if __name__ == "__main__":`
		`+ - sys.exit(main())`
		`+ diff --git a/nodepool/config.py b/nodepool/config.py`
		`+ old mode 100755`
		`+ new mode 100644`
		`+ index 0f1eeff..2dfafd9`
		`+ --- a/nodepool/config.py`
		`+ +++ b/nodepool/config.py`
		`+ @@ -1,5 +1,3 @@`
		`+ -#!/usr/bin/env python`
		`+ -`
		`+ # Copyright (C) 2011-2013 OpenStack Foundation`
		`+ #`
		`+ # Licensed under the Apache License, Version 2.0 (the "License");`
		`+ diff --git a/nodepool/exceptions.py b/nodepool/exceptions.py`
		`+ old mode 100755`
		`+ new mode 100644`
		`+ index f811a4e..e556bd3`
		`+ --- a/nodepool/exceptions.py`
		`+ +++ b/nodepool/exceptions.py`
		`+ @@ -1,5 +1,3 @@`
		`+ -#!/usr/bin/env python`
		`+ -#`
		`+ # Licensed under the Apache License, Version 2.0 (the "License"); you may`
		`+ # not use this file except in compliance with the License. You may obtain`
		`+ # a copy of the License at`
		`+ diff --git a/nodepool/launcher.py b/nodepool/launcher.py`
		`+ old mode 100755`
		`+ new mode 100644`
		`+ index 8f52037..a8d84e3`
		`+ --- a/nodepool/launcher.py`
		`+ +++ b/nodepool/launcher.py`
		`+ @@ -1,5 +1,3 @@`
		`+ -#!/usr/bin/env python`
		`+ -`
		`+ # Copyright (C) 2011-2014 OpenStack Foundation`
		`+ #`
		`+ # Licensed under the Apache License, Version 2.0 (the "License");`
		`+ diff --git a/nodepool/nodeutils.py b/nodepool/nodeutils.py`
		`+ old mode 100755`
		`+ new mode 100644`
		`+ index 482dde6..b2c4180`
		`+ --- a/nodepool/nodeutils.py`
		`+ +++ b/nodepool/nodeutils.py`
		`+ @@ -1,5 +1,3 @@`
		`+ -#!/usr/bin/env python`
		`+ -`
		`+ # Copyright (C) 2011-2013 OpenStack Foundation`
		`+ #`
		`+ # Licensed under the Apache License, Version 2.0 (the "License");`
		`+ diff --git a/nodepool/provider_manager.py b/nodepool/provider_manager.py`
		`+ old mode 100755`
		`+ new mode 100644`
		`+ index 28ed176..72a7bec`
		`+ --- a/nodepool/provider_manager.py`
		`+ +++ b/nodepool/provider_manager.py`
		`+ @@ -1,5 +1,3 @@`
		`+ -#!/usr/bin/env python`
		`+ -`
		`+ # Copyright (C) 2011-2013 OpenStack Foundation`
		`+ #`
		`+ # Licensed under the Apache License, Version 2.0 (the "License");`
		`+ diff --git a/nodepool/stats.py b/nodepool/stats.py`
		`+ old mode 100755`
		`+ new mode 100644`
		`+ index c218633..6331e09`
		`+ --- a/nodepool/stats.py`
		`+ +++ b/nodepool/stats.py`
		`+ @@ -1,5 +1,3 @@`
		`+ -#!/usr/bin/env python`
		`+ -#`
		`+ # Licensed under the Apache License, Version 2.0 (the "License"); you may`
		`+ # not use this file except in compliance with the License. You may obtain`
		`+ # a copy of the License at`
		`+ diff --git a/nodepool/status.py b/nodepool/status.py`
		`+ old mode 100755`
		`+ new mode 100644`
		`+ index 3ee7ddd..1eb3ff3`
		`+ --- a/nodepool/status.py`
		`+ +++ b/nodepool/status.py`
		`+ @@ -1,5 +1,3 @@`
		`+ -#!/usr/bin/env python`
		`+ -#`
		`+ # Copyright 2013 OpenStack Foundation`
		`+ #`
		`+ # Licensed under the Apache License, Version 2.0 (the "License"); you may`
		`+ diff --git a/nodepool/zk.py b/nodepool/zk.py`
		`+ old mode 100755`
		`+ new mode 100644`
		`+ index 748e015..97f8a96`
		`+ --- a/nodepool/zk.py`
		`+ +++ b/nodepool/zk.py`
		`+ @@ -1,5 +1,3 @@`
		`+ -#!/usr/bin/env python`
		`+ -#`
		`+ # Licensed under the Apache License, Version 2.0 (the "License"); you may`
		`+ # not use this file except in compliance with the License. You may obtain`
		`+ # a copy of the License at`
		`+ --`
		`+ 2.20.1`
		`+`

README.md

file modified

+1 -1

		`@@ -1,3 +1,3 @@`
		`# nodepool`

		`- The nodepool package`
		`\ No newline at end of file`
		`+ The nodepool package`

builder-logging.yaml

file modified

+4 -1

		`@@ -11,10 +11,13 @@`
		`level: INFO`
		`stream: ext://sys.stdout`
		`normal:`
		`- class: logging.handlers.WatchedFileHandler`
		`+ class: logging.handlers.TimedRotatingFileHandler`
		`formatter: normal`
		`level: DEBUG`
		`filename: '/var/log/nodepool/builder.log'`
		`+ when: 'midnight'`
		`+ interval: 1`
		`+ backupCount: 30`
		`loggers:`
		`nodepool:`
		`handlers:`

launcher-logging.yaml

file modified

+4 -1

		`@@ -11,10 +11,13 @@`
		`level: INFO`
		`stream: ext://sys.stdout`
		`normal:`
		`- class: logging.handlers.WatchedFileHandler`
		`+ class: logging.handlers.TimedRotatingFileHandler`
		`formatter: normal`
		`level: DEBUG`
		`filename: '/var/log/nodepool/launcher.log'`
		`+ when: 'midnight'`
		`+ interval: 1`
		`+ backupCount: 30`
		`loggers:`
		`nodepool:`
		`handlers:`

logging.conf

file removed

-65

		`@@ -1,65 +0,0 @@`
		`- [loggers]`
		`- keys=root,nodepool,shade,kazoo,keystoneauth,novaclient`
		`-`
		`- [handlers]`
		`- keys=console,normal`
		`-`
		`- [formatters]`
		`- keys=console,normal`
		`-`
		`-`
		`- [logger_root]`
		`- handlers=console,normal`
		`- level=WARNING`
		`-`
		`- [logger_nodepool]`
		`- handlers=console,normal`
		`- propagate=0`
		`- qualname=nodepool`
		`- level=INFO`
		`-`
		`- [logger_shade]`
		`- level=WARNING`
		`- handlers=console`
		`- qualname=shade`
		`- propagate=0`
		`-`
		`- [logger_keystoneauth]`
		`- level=WARNING`
		`- handlers=console`
		`- qualname=keystoneauth`
		`- propagate=0`
		`-`
		`- [logger_novaclient]`
		`- level=WARNING`
		`- handlers=console`
		`- qualname=novaclient`
		`- propagate=0`
		`-`
		`- [logger_kazoo]`
		`- level=WARNING`
		`- handlers=console`
		`- qualname=kazoo`
		`- propagate=0`
		`-`
		`-`
		`- [handler_console]`
		`- level=INFO`
		`- class=StreamHandler`
		`- formatter=console`
		`- args=(sys.stdout,)`
		`-`
		`- [handler_normal]`
		`- level=DEBUG`
		`- class=logging.handlers.WatchedFileHandler`
		`- formatter=normal`
		`- args=('/var/log/nodepool/nodepool.log',)`
		`-`
		`-`
		`- [formatter_normal]`
		`- format=%(asctime)s %(levelname)s %(name)s: %(message)s`
		`- datefmt=`
		`-`
		`- [formatter_console]`
		`- format=%(levelname)7s %(name)s: %(message)s`
		`- datefmt=`

nodepool-builder.service

file modified

+5 -1

		`@@ -6,8 +6,12 @@`
		`Type=simple`
		`User=nodepool`
		`Group=nodepool`
		`+ EnvironmentFile=-/etc/sysconfig/nodepool`
		`SyslogIdentifier=nodepool-builder`
		`- ExecStart=/usr/bin/nodepool-builder -d -l /etc/nodepool/builder-logging.yaml`
		`+ ExecStart=/usr/bin/nodepool-builder -d \`
		`+ -c /etc/nodepool/nodepool.yaml \`
		`+ -s /etc/nodepool/secure.conf \`
		`+ -l /etc/nodepool/builder-logging.yaml`

		`[Install]`
		`WantedBy=multi-user.target`

nodepool-launcher.service

file modified

+5 -1

		`@@ -7,7 +7,11 @@`
		`User=nodepool`
		`Group=nodepool`
		`SyslogIdentifier=nodepool-launcher`
		`- ExecStart=/usr/bin/nodepool-launcher -d -l /etc/nodepool/launcher-logging.yaml`
		`+ EnvironmentFile=-/etc/sysconfig/nodepool`
		`+ ExecStart=/usr/bin/nodepool-launcher -d \`
		`+ -c /etc/nodepool/nodepool.yaml \`
		`+ -s /etc/nodepool/secure.conf \`
		`+ -l /etc/nodepool/launcher-logging.yaml`

		`[Install]`
		`WantedBy=multi-user.target`

nodepool.logrotate

file removed

-7

		`@@ -1,7 +0,0 @@`
		`- /var/log/nodepool/*.log {`
		`- missingok`
		`- notifempty`
		`- compress`
		`- delaycompress`
		`- copytruncate`
		`- }`

nodepool.spec

file modified

+80 -131

		`@@ -1,169 +1,132 @@`
		`+ %global srcname nodepool`
		`+`
		`+ %global nfsmountable 1`
		`+`
		`Name: nodepool`
		`- Version: 3.0.0`
		`- Release: 7%{?dist}`
		`- Summary: Node pool management for a distributed test infrastructure`
		`+ Version: 3.9.0`
		`+ Release: 1%{?dist}`
		`+ Summary: Nodepool management for a distributed test infrastructure`

		`License: ASL 2.0`
		`URL: https://zuul-ci.org`
		`- Source0: http://tarballs.openstack.org/nodepool/nodepool-%{version}.tar.gz`
		`+ # Use gitea because tarball published by openstack doesn't have symlinks.`
		`+ # It's also smaller as it doesn't contain built html bundles.`
		`+ Source0: https://opendev.org/zuul/nodepool/archive/%{version}.tar.gz`
		`Source1: nodepool-launcher.service`
		`Source2: nodepool-builder.service`
		`- Source3: nodepool.yaml`
		`- Source4: logging.conf`
		`- Source5: launcher-logging.yaml`
		`- Source6: builder-logging.yaml`
		`- Source7: nodepool.logrotate`
		`+ Source10: nodepool.yaml`
		`+ Source11: secure.conf`
		`+ Source12: launcher-logging.yaml`
		`+ Source13: builder-logging.yaml`
		`+ Source14: sudoer`
		`+`
		`+ Patch0: 0001-Remove-uneeded-shebang-and-exec-bit-on-some-files.patch`

		`BuildArch: noarch`

		`- Requires: python3`
		`+ Requires: ansible`
		`Requires: python3-pbr`
		`- Requires: python3-PyYAML`
		`+ Requires: python3-pyyaml`
		`+ Requires: python3-paramiko`
		`Requires: python3-daemon`
		`Requires: python3-extras`
		`Requires: python3-statsd`
		`- Requires: python3-sqlalchemy`
		`Requires: python3-prettytable`
		`Requires: python3-six`
		`+ Requires: python3-os-client-config`
		`+ Requires: python3-openstacksdk`
		`+ Requires: diskimage-builder`
		`Requires: python3-voluptuous`
		`Requires: python3-kazoo`
		`Requires: python3-paste`
		`Requires: python3-webob`
		`+ Requires: python3-kubernetes`
		`+ Requires: python3-openshift`
		`+ Requires: python3-boto3`

		`BuildRequires: python3-devel`
		`BuildRequires: python3-pbr`
		`BuildRequires: python3-setuptools`
		`-`
		`- # Doc building requirements`
		`- BuildRequires: python3-sphinxcontrib-programoutput`
		`- BuildRequires: python3-sphinxcontrib-httpdomain`
		`- BuildRequires: python3-kazoo`
		`- BuildRequires: python3-daemon`
		`- BuildRequires: python3-extras`
		`- BuildRequires: python3-PyYAML`
		`- BuildRequires: python3-statsd`
		`- BuildRequires: python3-paste`
		`- BuildRequires: python3-webob`
		`- BuildRequires: python3-prettytable`
		`- BuildRequires: python3-voluptuous`
		`- BuildRequires: help2man`
		`-`
		`- %{?systemd_requires}`
		`BuildRequires: systemd`

		`+`
		`%description`
		`Nodepool is a service used by the OpenStack CI team to deploy and manage a pool`
		`of devstack images on a cloud server for use in OpenStack project testing.`


		`- %package driver-openstack`
		`- Summary: Nodepool OpenStack driver`
		`- Requires: nodepool-launcher`
		`- Requires: python3-os-client-config`
		`- Requires: python3-shade`
		`- Requires: python3-paramiko`
		`-`
		`- %description driver-openstack`
		`- Nodepool OpenStack driver`
		`-`
		`-`
		`- %package driver-static`
		`- Summary: Nodepool OpenStack driver`
		`- Requires: nodepool-launcher`
		`-`
		`- %description driver-static`
		`- Nodepool Static driver`
		`-`
		`-`
		`%package launcher`
		`Summary: Nodepool launcher service`
		`Requires: nodepool`

		`%description launcher`
		`- Nodepool launcher service`
		`+ Nodepool launcher service.`


		`%package builder`
		`Summary: Nodepool builder service`
		`Requires: nodepool`
		`- Requires: dnf-utils`
		`+ Requires: yum-utils`
		`Requires: sudo`
		`Requires: qemu-img`

		`%description builder`
		`- Nodepool builder service`
		`+ Nodepool builder service.`


		`%package doc`
		`- Summary: The Nodepool documentation`
		`-`
		`+ Summary: Nodepool documentation`
		`+ BuildRequires: python3-zuul-sphinx`
		`+ BuildRequires: python3-sphinx`
		`+ BuildRequires: python3-voluptuous`
		`+ BuildRequires: python3-kazoo`
		`+ BuildRequires: python3-zuul-sphinx`
		`+ BuildRequires: python3-snowballstemmer`
		`+ BuildRequires: python3-sphinxcontrib-programoutput`
		`+ BuildRequires: python3-sphinxcontrib-httpdomain`
		`+ BuildRequires: python3-reno`
		`+ #`
		`%description doc`
		`- The Nodepool documentation`
		`+ Nodepool documentation.`


		`%prep`
		`- %autosetup -n nodepool-%{version}`
		`- rm -Rf requirements.txt .egg-info`
		`-`
		`- # Remove test files`
		`- rm -Rf nodepool/tests nodepool/driver/fake`
		`-`
		`- # Remove interpreter`
		`- find nodepool/ -type f -exec sed -i -e '/#!\/usr\/bin\/.python./{1D}' {} \;`
		`+ %autosetup -n nodepool -p1`
		`+ rm requirements.txt test-requirements.txt`
		`+ rm -Rf nodepool/tests`


		`%build`
		`- PBR_VERSION=%{version} %py3_build`
		`- PBR_VERSION=%{version} SPHINX_DEBUG=1 sphinx-build -b html doc/source build/html`
		`-`
		`- rm -Rf build/html/.buildinfo`
		`-`
		`- # Generate man pages`
		`- mkdir man`
		`- pushd man`
		`- echo -e "#!/usr/bin/python3\nimport sys\nfrom nodepool.cmd.nodepoolcmd import main\nmain()" > nodepool`
		`- echo -e "#!/usr/bin/python3\nimport sys\nfrom nodepool.cmd.launcher import main\nmain()" > nodepool-launcher`
		`- echo -e "#!/usr/bin/python3\nimport sys\nfrom nodepool.cmd.builder import main\nmain()" > nodepool-builder`
		`- chmod +x nodepool*`
		`- # Test the command first to output missing BuildRequirements`
		`- PYTHONPATH=../ ./nodepool-builder --help`
		`- PYTHONPATH=../ ./nodepool-launcher --help`
		`- PYTHONPATH=../ ./nodepool --help`
		`- PYTHONPATH=../ help2man --no-info -o nodepool-builder.man ./nodepool-builder`
		`- PYTHONPATH=../ help2man --no-info -o nodepool-launcher.man ./nodepool-launcher`
		`- PYTHONPATH=../ help2man --no-info -o nodepool.man ./nodepool`
		`+ PBR_VERSION=%{version} %{__python3} setup.py build`
		`+ # Make the Nodepool directory a repo to satisfy python-reno`
		`+ git init /builddir/build/BUILD/nodepool`
		`+ pushd /builddir/build/BUILD/nodepool`
		`+ git config user.email "you@example.com"`
		`+ git config user.name "Your Name"`
		`+ git add -A .`
		`+ git commit -m"Initial commit"`
		`popd`
		`+ PBR_VERSION=%{version} SPHINX_DEBUG=1 sphinx-build-3 -b html doc/source build/html`
		`+ rm -Rf /builddir/build/BUILD/nodepool/.git`


		`%install`
		`- PBR_VERSION=%{version} %py3_install`
		`+ PBR_VERSION=%{version} %{__python3} setup.py install --skip-build --root %{buildroot}`

		`- # Remove executable bit from libraries`
		`- find %{buildroot}%{python3_sitelib}/nodepool -type f -exec chmod -x {} \;`
		`-`
		`- # Man pages`
		`- install -p -D -m 0644 man/nodepool-builder.man %{buildroot}%{_mandir}/man1/nodepool-builder.1`
		`- install -p -D -m 0644 man/nodepool-launcher.man %{buildroot}%{_mandir}/man1/nodepool-launcher.1`
		`- install -p -D -m 0644 man/nodepool.man %{buildroot}%{_mandir}/man1/nodepool.1`
		`-`
		`- # Service unit`
		`+ # Copy non python modules over`
		`install -p -D -m 0644 %{SOURCE1} %{buildroot}%{_unitdir}/nodepool-launcher.service`
		`install -p -D -m 0644 %{SOURCE2} %{buildroot}%{_unitdir}/nodepool-builder.service`
		`-`
		`- # Basic configuration`
		`- install -p -D -m 0644 %{SOURCE3} %{buildroot}%{_sysconfdir}/nodepool/nodepool.yaml`
		`+ install -p -D -m 0644 %{SOURCE10} %{buildroot}%{_sysconfdir}/nodepool/nodepool.yaml`
		`+ install -p -D -m 0640 %{SOURCE11} %{buildroot}%{_sysconfdir}/nodepool/secure.conf`
		`+ install -p -D -m 0644 %{SOURCE12} %{buildroot}%{_sysconfdir}/nodepool/launcher-logging.yaml`
		`+ install -p -D -m 0644 %{SOURCE13} %{buildroot}%{_sysconfdir}/nodepool/builder-logging.yaml`
		`+ install -p -D -m 0644 %{SOURCE14} %{buildroot}%{_sysconfdir}/sudoers.d/nodepool`
		`+ install -p -d -m 0755 %{buildroot}%{_sysconfdir}/nodepool/scripts`
		`install -p -d -m 0755 %{buildroot}%{_sysconfdir}/nodepool/elements`
		`- touch %{buildroot}%{_sysconfdir}/nodepool/secure.conf`
		`- install -p -D -m 0644 %{SOURCE4} %{buildroot}%{_sysconfdir}/nodepool/logging.conf`
		`- install -p -D -m 0644 %{SOURCE5} %{buildroot}%{_sysconfdir}/nodepool/launcher-logging.yaml`
		`- install -p -D -m 0644 %{SOURCE6} %{buildroot}%{_sysconfdir}/nodepool/builder-logging.yaml`
		`- install -p -D -m 0644 %{SOURCE7} %{buildroot}%{_sysconfdir}/logrotate.d/nodepool`
		`-`
		`- # Service base directories`
		`- install -p -d -m 0700 %{buildroot}%{_sharedstatedir}/nodepool`
		`- install -p -d -m 0700 %{buildroot}%{_sharedstatedir}/nodepool/dib`
		`- install -p -d -m 0700 %{buildroot}%{_sharedstatedir}/nodepool/.config/openstack`
		`- install -p -d -m 0700 %{buildroot}%{_localstatedir}/log/nodepool`
		`+ install -p -d -m 0750 %{buildroot}%{_sharedstatedir}/nodepool`
		`+ install -p -d -m 0750 %{buildroot}%{_sharedstatedir}/nodepool/dib`
		`+ install -p -d -m 0750 %{buildroot}%{_sharedstatedir}/nodepool/.config/openstack`
		`+ install -p -d -m 0750 %{buildroot}%{_localstatedir}/log/nodepool`
		`install -p -d -m 0755 %{buildroot}%{_localstatedir}/cache/nodepool/dib_cache`
		`install -p -d -m 0755 %{buildroot}%{_localstatedir}/cache/nodepool/dib_tmp`

		`@@ -193,50 +156,36 @@`


		`%files`
		`- %license LICENSE`
		`- %{_mandir}/man1/nodepool.1*`
		`%{_bindir}/nodepool`
		`- %exclude %{python3_sitelib}/nodepool/driver/openstack`
		`+ %config(noreplace) %attr(0644, root, root) %{_sysconfdir}/nodepool/nodepool.yaml`
		`+ %config(noreplace) %attr(0644, root, nodepool) %{_sysconfdir}/nodepool/secure.conf`
		`+ %dir %{_sysconfdir}/nodepool/scripts`
		`+ %dir %{_sysconfdir}/nodepool/elements`
		`+ %dir %attr(0755, nodepool, nodepool) %{_localstatedir}/log/nodepool`
		`+ %attr(0755, nodepool, nodepool) %{_sharedstatedir}/nodepool`
		`%{python3_sitelib}/nodepool`
		`%{python3_sitelib}/nodepool-*.egg-info`
		`- %dir %{_sysconfdir}/nodepool/elements`
		`- %dir %{_sysconfdir}/nodepool/`
		`- %config(noreplace) %{_sysconfdir}/nodepool/nodepool.yaml`
		`- %config(noreplace) %{_sysconfdir}/nodepool/logging.conf`
		`- %config(noreplace) %{_sysconfdir}/logrotate.d/nodepool`
		`- %config(noreplace) %attr(0640, root, nodepool) %{_sysconfdir}/nodepool/secure.conf`
		`- %attr(0750, nodepool, nodepool) %{_sharedstatedir}/nodepool`
		`- %dir %attr(0750, nodepool, nodepool) %{_localstatedir}/log/nodepool`
		`-`
		`- %files driver-openstack`
		`- %license LICENSE`
		`- %{python3_sitelib}/nodepool/driver/openstack`
		`-`
		`- %files driver-static`
		`- %license LICENSE`
		`- %{python3_sitelib}/nodepool/driver/static`

		`%files launcher`
		`- %license LICENSE`
		`- %{_mandir}/man1/nodepool-launcher.1*`
		`%{_bindir}/nodepool-launcher`
		`- %config(noreplace) %attr(0644, root, root) %{_sysconfdir}/nodepool/launcher-logging.yaml`
		`%{_unitdir}/nodepool-launcher.service`
		`+ %config(noreplace) %attr(0644, root, root) %{_sysconfdir}/nodepool/launcher-logging.yaml`

		`%files builder`
		`- %license LICENSE`
		`- %{_mandir}/man1/nodepool-builder.1*`
		`%{_bindir}/nodepool-builder`
		`- %config(noreplace) %{_sysconfdir}/nodepool/builder-logging.yaml`
		`%{_unitdir}/nodepool-builder.service`
		`+ %{_sysconfdir}/sudoers.d/nodepool`
		`+ %config(noreplace) %attr(0644, root, root) %{_sysconfdir}/nodepool/builder-logging.yaml`
		`%attr(0755, nodepool, nodepool) %{_localstatedir}/cache/nodepool`

		`%files doc`
		`- %license LICENSE`
		`- %doc build/html`
		`+ %doc LICENSE build/html`


		`%changelog`
		`+ * Fri Oct 11 2019 Fabien Boucher <fboucher@redhat.com> - 3.9.0-1`
		`+ - Import 3.9.0 packaging from Software Factory`
		`+`
		`* Thu Oct 03 2019 Miro Hrončok <mhroncok@redhat.com> - 3.0.0-7`
		`- Rebuilt for Python 3.8.0rc1 (#1748018)`

nodepool.yaml

file modified

+10 -4

		`@@ -1,17 +1,23 @@`
		`elements-dir: /etc/nodepool/elements`
		`images-dir: /var/lib/nodepool/dib`

		`- webapp:`
		`- port: 8005`
		`- listen_address: '0.0.0.0'`
		`+ cron:`
		`+ cleanup: '/30 * * *'`
		`+ check: '/15 * * *'`
		`+`
		`+ zmq-publishers: []`
		`+`
		`+ gearman-servers:`
		`+ - host: localhost`

		`zookeeper-servers:`
		`- host: localhost`
		`- port: 2181`
		`chroot: /nodepool`

		`labels: []`

		`providers: []`

		`+ targets: []`
		`+`
		`diskimages: []`

secure.conf

file added

		`@@ -0,0 +1,4 @@`
		`+ # diskimages:`
		`+ # - name: rhel-7`
		`+ # env-vars:`
		`+ # REG_PASSWORD: reg_password`

sources

file modified

+1 -1

		`@@ -1,1 +1,1 @@`
		`- SHA512 (nodepool-3.0.0.tar.gz) = 88e7c2f9435fa68cb0d603ceb45f94023a9340282aa1a77aa1bf9de5a316fa16516fb9313ef99566d5a9e328b70f547eaa02351f9bc9ed699694b7167ea9a957`
		`+ SHA512 (3.9.0.tar.gz) = 28e92f1abed3e42ddeb8f21da31c47b7e88bf45466bfdd8093f451aeebef7a3a9800fe462f138b9712cae4409a0741f0b9188d4b0c114890228daf63460d4f5d`

sudoer

file added

		`@@ -0,0 +1,3 @@`
		`+ Defaults !requiretty`
		`+`
		`+ nodepool ALL = NOPASSWD:ALL`

tests/tests.yml

file added

+58

		`@@ -0,0 +1,58 @@`
		`+ - hosts: localhost`
		`+ tasks:`
		`+ - name: Install JDK`
		`+ package:`
		`+ name: java-latest-openjdk`
		`+ state: present`
		`+ become: true`
		`+`
		`+ - name: Create /tmp/zookeeper`
		`+ file:`
		`+ path: /tmp/zookeeper`
		`+ state: directory`
		`+`
		`+ - name: Get and extract Zookeeper`
		`+ unarchive:`
		`+ src: https://www-us.apache.org/dist/zookeeper/stable/apache-zookeeper-3.5.6-bin.tar.gz`
		`+ dest: /tmp/zookeeper`
		`+ remote_src: yes`
		`+`
		`+ - name: Setup Zookeeper config file`
		`+ copy:`
		`+ src: /tmp/zookeeper/apache-zookeeper-3.5.6-bin/conf/zoo_sample.cfg`
		`+ dest: /tmp/zookeeper/apache-zookeeper-3.5.6-bin/conf/zoo.cfg`
		`+ remote_src: true`
		`+`
		`+ - name: Start Zookeeper`
		`+ shell: /tmp/zookeeper/apache-zookeeper-3.5.6-bin/bin/zkServer.sh start`
		`+`
		`+ - name: Install Nodepool packages`
		`+ package:`
		`+ name:`
		`+ - nodepool-builder`
		`+ - nodepool-launcher`
		`+ - nodepool-doc`
		`+ state: present`
		`+ become: true`
		`+`
		`+ - name: Start Nodepool services`
		`+ service:`
		`+ name: "{{ item }}"`
		`+ state: started`
		`+ loop:`
		`+ - nodepool-builder`
		`+ - nodepool-launcher`
		`+ become: true`
		`+`
		`+ - name: Pause 10 seconds to give time for services to start`
		`+ pause:`
		`+ seconds: 10`
		`+`
		`+ - name: Check Nodepool services`
		`+ shell: systemctl is-active {{ item }}`
		`+ loop:`
		`+ - nodepool-builder`
		`+ - nodepool-launcher`
		`+`
		`+ - name: Run a nodepool list`
		`+ shell: nodepool list`

fbo commented 3 years ago

Here are the changes I'm proposing to bump Nodepool on master. This PR also adds functional tests that should valid the packaging by testing if the service start and run as expected. I'll appreciate your review. Thanks.