From a8432173a964281d70656fbad6c6c6f1f71610ad Mon Sep 17 00:00:00 2001
From: Javier Pena <jpena@redhat.com>
Date: Wed, 30 Nov 2016 10:27:58 +0100
Subject: [PATCH] Use centos-master for tests and fix Puppet4 compatibility

We were still using the Newton repos to test, because we had no
CI-passed repo for Ocata. This changed long time ago.

Also, certain late changes to Puppet modules have broken Puppet 4
compatibility for Packstack, such as
https://github.com/puppetlabs/puppetlabs-firewall/commit/e86ac7fb4b98dde45ed7fd1ac66124cec4444376

We need to fix Puppet 4 support for Packstack at the same time
we enable centos-master.

Change-Id: Iaf28404b9ac1b3e0ab16962b28c5b6be758a551f
---
 packstack/puppet/modules/packstack/manifests/ceilometer.pp | 3 ++-
 packstack/puppet/modules/packstack/manifests/keystone.pp   | 2 +-
 packstack/puppet/modules/packstack/manifests/prereqs.pp    | 2 --
 packstack/puppet/templates/compute.pp                      | 2 ++
 packstack/puppet/templates/controller.pp                   | 2 ++
 packstack/puppet/templates/network.pp                      | 2 ++
 run_tests.sh                                               | 4 ++--
 7 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/packstack/puppet/modules/packstack/manifests/ceilometer.pp b/packstack/puppet/modules/packstack/manifests/ceilometer.pp
index db0927dd0..70e09492a 100644
--- a/packstack/puppet/modules/packstack/manifests/ceilometer.pp
+++ b/packstack/puppet/modules/packstack/manifests/ceilometer.pp
@@ -68,7 +68,8 @@ class packstack::ceilometer ()
       auth_uri => hiera('CONFIG_KEYSTONE_PUBLIC_URL'),
       auth_url => hiera('CONFIG_KEYSTONE_ADMIN_URL'),
       password => hiera('CONFIG_CEILOMETER_KS_PW'),
-    } ->
+    }
+
     class { '::ceilometer::api':
       host         => $bind_host,
       api_workers  => hiera('CONFIG_SERVICE_WORKERS'),
diff --git a/packstack/puppet/modules/packstack/manifests/keystone.pp b/packstack/puppet/modules/packstack/manifests/keystone.pp
index ae4ced5ed..156d31c37 100644
--- a/packstack/puppet/modules/packstack/manifests/keystone.pp
+++ b/packstack/puppet/modules/packstack/manifests/keystone.pp
@@ -37,7 +37,7 @@ class packstack::keystone ()
     class { '::keystone':
       admin_token         => hiera('CONFIG_KEYSTONE_ADMIN_TOKEN'),
       database_connection => "mysql+pymysql://keystone_admin:${keystone_cfg_ks_db_pw}@${keystone_cfg_mariadb_host}/keystone",
-      token_provider      => "keystone.token.providers.${keystone_token_provider_str}.Provider",
+      token_provider      => "${keystone_token_provider_str}",
       enable_fernet_setup => $enable_fernet_setup,
       debug               => hiera('CONFIG_DEBUG_MODE'),
       service_name        => 'httpd',
diff --git a/packstack/puppet/modules/packstack/manifests/prereqs.pp b/packstack/puppet/modules/packstack/manifests/prereqs.pp
index b0e3046f1..7efc4d08d 100644
--- a/packstack/puppet/modules/packstack/manifests/prereqs.pp
+++ b/packstack/puppet/modules/packstack/manifests/prereqs.pp
@@ -1,7 +1,5 @@
 class packstack::prereqs ()
 {
-    include ::firewall
-
     # We don't have openstack-selinux package for Fedora
     if $::operatingsystem != 'Fedora' {
       package{ 'openstack-selinux':
diff --git a/packstack/puppet/templates/compute.pp b/packstack/puppet/templates/compute.pp
index 4658037e1..000f8f23b 100644
--- a/packstack/puppet/templates/compute.pp
+++ b/packstack/puppet/templates/compute.pp
@@ -7,6 +7,8 @@ class {'::packstack::prereqs':
   stage => init,
 }
 
+include ::firewall
+
 create_resources(sshkey, hiera('SSH_KEYS', {}))
 
 if hiera('CONFIG_NTP_SERVERS', '') != '' {
diff --git a/packstack/puppet/templates/controller.pp b/packstack/puppet/templates/controller.pp
index 3698e166a..c2476fcda 100755
--- a/packstack/puppet/templates/controller.pp
+++ b/packstack/puppet/templates/controller.pp
@@ -7,6 +7,8 @@ class {'::packstack::prereqs':
   stage => init,
 }
 
+include ::firewall
+
 if hiera('CONFIG_NTP_SERVERS', '') != '' {
   include '::packstack::chrony'
 }
diff --git a/packstack/puppet/templates/network.pp b/packstack/puppet/templates/network.pp
index b49be5bcc..4485f0875 100644
--- a/packstack/puppet/templates/network.pp
+++ b/packstack/puppet/templates/network.pp
@@ -7,6 +7,8 @@ class {'::packstack::prereqs':
   stage => init,
 }
 
+include ::firewall
+
 if hiera('CONFIG_NTP_SERVERS', '') != '' {
   include '::packstack::chrony'
 }
diff --git a/run_tests.sh b/run_tests.sh
index bc9332cbc..ee1bb9227 100755
--- a/run_tests.sh
+++ b/run_tests.sh
@@ -20,8 +20,8 @@ SCENARIO=${SCENARIO:-scenario001}
 # We could want to override the default repositories or install behavior
 INSTALL_FROM_SOURCE=${INSTALL_FROM_SOURCE:-true}
 MANAGE_REPOS=${MANAGE_REPOS:-true}
-DELOREAN=${DELOREAN:-http://trunk.rdoproject.org/centos7-newton/current-passed-ci/delorean.repo}
-DELOREAN_DEPS=${DELOREAN_DEPS:-http://trunk.rdoproject.org/centos7-newton/delorean-deps.repo}
+DELOREAN=${DELOREAN:-http://trunk.rdoproject.org/centos7-master/current-passed-ci/delorean.repo}
+DELOREAN_DEPS=${DELOREAN_DEPS:-http://trunk.rdoproject.org/centos7-master/delorean-deps.repo}
 GIT_BASE_URL=${GIT_BASE_URL:-git://git.openstack.org}
 ADDITIONAL_ARGS=${ADDITIONAL_ARGS:-}
 # If logs should be retrieved automatically