x
/
packstack
Code Issues Proposed changes

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
e86ac7fb4b

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

Change-Id: Iaf28404b9ac1b3e0ab16962b28c5b6be758a551f
This commit is contained in:
Javier Pena 2016-11-30 10:27:58 +01:00
parent 6997e18066
commit a8432173a9
7 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
packstack/puppet/modules/packstack/manifests/ceilometer.pp
View File

@ -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'),

2
packstack/puppet/modules/packstack/manifests/keystone.pp
View File

@ -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',

2
packstack/puppet/modules/packstack/manifests/prereqs.pp
View File

@ -1,7 +1,5 @@
class packstack::prereqs ()
{
include ::firewall
# We don't have openstack-selinux package for Fedora
if $::operatingsystem != 'Fedora' {
package{ 'openstack-selinux':

2
packstack/puppet/templates/compute.pp
View File

@ -7,6 +7,8 @@ class {'::packstack::prereqs':
stage => init,
}
include ::firewall
create_resources(sshkey, hiera('SSH_KEYS', {}))
if hiera('CONFIG_NTP_SERVERS', '') != '' {

2
packstack/puppet/templates/controller.pp
View File

@ -7,6 +7,8 @@ class {'::packstack::prereqs':
stage => init,
}
include ::firewall
if hiera('CONFIG_NTP_SERVERS', '') != '' {
include '::packstack::chrony'
}

2
packstack/puppet/templates/network.pp
View File

@ -7,6 +7,8 @@ class {'::packstack::prereqs':
stage => init,
}
include ::firewall
if hiera('CONFIG_NTP_SERVERS', '') != '' {
include '::packstack::chrony'
}

4
run_tests.sh
View File

@ -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