From d24fd0acf3fa31ea559ba89df371a9379cbdb1b0 Mon Sep 17 00:00:00 2001
From: yatinkarel <ykarel@redhat.com>
Date: Mon, 1 Mar 2021 19:06:11 +0530
Subject: [PATCH] Remove usage of deprecated params for nova::network::neutron

neutron_* parameters were deprecated earlier and are
now removed with [1], let's use recommended params
now.

Also upgrade pip as latest cryptography needs rust[1] to build,
to use published wheel binaries for cryptography atleast 19.1.1 pip
is needed, so let's update pip to latest.

Also pin puppet-systemd to working commit as master puppet-systemd
is not compatible with puppet-rabbitmq, until it's fixed let's
pin like it's done in rdoinfo[3].

[1] https://review.opendev.org/c/openstack/puppet-nova/+/772175
[2] https://github.com/pyca/cryptography/issues/5771
[3] https://review.rdoproject.org/r/#/c/32088

Change-Id: I45a6585b24ed8ae694b21fb0b9617d843e95cdd9
---
 Puppetfile                                             |  2 +-
 .../puppet/modules/packstack/manifests/nova/neutron.pp | 10 +++++-----
 run_tests.sh                                           |  1 +
 3 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/Puppetfile b/Puppetfile
index 039f71b37..fa502ba4f 100755
--- a/Puppetfile
+++ b/Puppetfile
@@ -162,7 +162,7 @@ mod 'sysctl',
 
 mod 'systemd',
   :git => 'https://github.com/camptocamp/puppet-systemd',
-  :ref => 'master'
+  :ref => '8f68b0dcf3bbbafc60c025879a28004fc9815aab'
 
 mod 'vcsrepo',
   :git => 'https://github.com/puppetlabs/puppetlabs-vcsrepo',
diff --git a/packstack/puppet/modules/packstack/manifests/nova/neutron.pp b/packstack/puppet/modules/packstack/manifests/nova/neutron.pp
index 7507ee261..3013f6dfc 100644
--- a/packstack/puppet/modules/packstack/manifests/nova/neutron.pp
+++ b/packstack/puppet/modules/packstack/manifests/nova/neutron.pp
@@ -5,10 +5,10 @@ class packstack::nova::neutron ()
 
     class { '::nova::network::neutron':
       default_floating_pool => 'public',
-      neutron_password      => hiera('CONFIG_NEUTRON_KS_PW'),
-      neutron_auth_type     => 'v3password',
-      neutron_project_name  => 'services',
-      neutron_auth_url      => "${neutron_auth_url}/v3",
-      neutron_region_name   => hiera('CONFIG_KEYSTONE_REGION'),
+      password              => hiera('CONFIG_NEUTRON_KS_PW'),
+      auth_type             => 'v3password',
+      project_name          => 'services',
+      auth_url              => "${neutron_auth_url}/v3",
+      region_name           => hiera('CONFIG_KEYSTONE_REGION'),
     }
 }
diff --git a/run_tests.sh b/run_tests.sh
index b6c3623af..ff7672acf 100755
--- a/run_tests.sh
+++ b/run_tests.sh
@@ -265,6 +265,7 @@ fi
 
 # Setup packstack
 if [ "${INSTALL_FROM_SOURCE}" = true ]; then
+  $SUDO $PIP install -U pip
   $SUDO $PIP install --ignore-installed -c https://opendev.org/openstack/requirements/raw/branch/$BRANCH/upper-constraints.txt --prefix=/usr .
   # In Fedora when running with sudo gems are installed at /usr/local/bin/ even when GEM_HOME/GEM_BIN_DIR are set
   if [ "${PKG_MGR}" = "dnf" ]; then