From c676f9930910a579e27f010e25e49ae017563f86 Mon Sep 17 00:00:00 2001 From: Paul Belanger Date: Fri, 9 Feb 2018 15:43:49 -0500 Subject: [PATCH] Switch from fedora-26 to fedora-27 testing Now that we have fedora-27 images online, start testing against that. It also seems that pip3 will use /usr/local so we can remove override from systemd for fedora. https://fedoraproject.org/wiki/Changes/Making_sudo_pip_safe Change-Id: Ic47121b0d13936795980c433ee52cc1c6e11b2cd Depends-On: https://review.openstack.org/543013/ Depends-On: https://review.openstack.org/543019/ Signed-off-by: Paul Belanger --- .zuul.yaml | 10 +++++----- .../system/nodepool-builder.service.d/redhat.conf | 2 -- .../system/nodepool-launcher.service.d/redhat.conf | 2 -- 3 files changed, 5 insertions(+), 9 deletions(-) diff --git a/.zuul.yaml b/.zuul.yaml index d8f95f7..42b3ba6 100644 --- a/.zuul.yaml +++ b/.zuul.yaml @@ -8,9 +8,9 @@ - zuul: openstack/ansible-role-nodepool - job: - name: ansible-role-nodepool-fedora-26 + name: ansible-role-nodepool-fedora-27 parent: ansible-role-nodepool - nodeset: fedora-26 + nodeset: fedora-27 - job: name: ansible-role-nodepool-ubuntu-xenial @@ -20,15 +20,15 @@ - project: name: openstack/ansible-role-nodepool templates: - - windmill-jobs-fedora-26 + - windmill-jobs-fedora-27 - windmill-jobs-xenial check: jobs: - - ansible-role-nodepool-fedora-26 + - ansible-role-nodepool-fedora-27 - ansible-role-nodepool-ubuntu-xenial - tox-linters gate: jobs: - - ansible-role-nodepool-fedora-26 + - ansible-role-nodepool-fedora-27 - ansible-role-nodepool-ubuntu-xenial - tox-linters diff --git a/templates/etc/systemd/system/nodepool-builder.service.d/redhat.conf b/templates/etc/systemd/system/nodepool-builder.service.d/redhat.conf index ce86bc9..602ac8e 100644 --- a/templates/etc/systemd/system/nodepool-builder.service.d/redhat.conf +++ b/templates/etc/systemd/system/nodepool-builder.service.d/redhat.conf @@ -1,5 +1,3 @@ # This file is generated by Ansible # DO NOT EDIT THIS FILE BY HAND -- YOUR CHANGES WILL BE OVERWRITTEN # -[Service] -Environment="PREFIX=/usr" diff --git a/templates/etc/systemd/system/nodepool-launcher.service.d/redhat.conf b/templates/etc/systemd/system/nodepool-launcher.service.d/redhat.conf index ce86bc9..602ac8e 100644 --- a/templates/etc/systemd/system/nodepool-launcher.service.d/redhat.conf +++ b/templates/etc/systemd/system/nodepool-launcher.service.d/redhat.conf @@ -1,5 +1,3 @@ # This file is generated by Ansible # DO NOT EDIT THIS FILE BY HAND -- YOUR CHANGES WILL BE OVERWRITTEN # -[Service] -Environment="PREFIX=/usr"