Align stars to fix CI

Currently we are suffering from a flakey cinder test due to an issue
with the RDO provided PyMySQL package and a recent change
I4e5440b8450558add372214fd1a0373ab4ad2434.  To unblock the Puppet
OpenStack modules, this change adds a pending repo to the tests.  This
change should be reverted after a newer version of PyMySQL is included
in the RDO packages.

Additionally, we were improperly enabling ipv6 on ubuntu for scenario004
despite the fact the README said it should not be enabled. This change
also disables ipv6 on ubuntu so scenario004 will pass.

Change-Id: I752592a37786b17c5aeb409a048b98f97ca0fc31
Related-Bug: #1641312
This commit is contained in:
Alex Schultz 2016-11-15 17:42:37 -07:00
parent e7bd64b108
commit 5e4701a4f2
3 changed files with 11 additions and 3 deletions

View File

@ -34,7 +34,7 @@ scenario](#all-in-one).
| - | scenario001 | scenario002 | scenario003 | scenario004 | scenario-aio |
|:----------:|:-----------:|:-----------:|:-----------:|:-----------:|:------------:|
| ssl | yes | yes | yes | yes | no |
| ipv6 | centos7 | centos7 | centos7 | no | no |
| ipv6 | centos7 | centos7 | centos7 | centos7 | no |
| keystone | X | X | X | X | X |
| tokens | uuid | uuid | fernet | fernet | uuid |
| glance | rbd | swift | file | swift+rgw | file |

View File

@ -17,14 +17,16 @@
# Disable SSL (workaround for Xenial)
if $::operatingsystem == 'Ubuntu' {
$ssl_enabled = false
$ipv6 = false
} else {
$ssl_enabled = true
$ipv6 = false
}
include ::openstack_integration
class { '::openstack_integration::config':
ssl => $ssl_enabled,
ipv6 => true,
ipv6 => $ipv6,
}
include ::openstack_integration::cacert

View File

@ -33,7 +33,13 @@ class openstack_integration::repos {
'gpgcheck' => 'no',
'priority' => 1,
},
}
'rdo-pending' => {
'baseurl' => 'http://cbs.centos.org/repos/cloud7-openstack-common-pending/x86_64/os/',
'descr' => 'RDO pending LP1641312',
'gpgcheck' => 'no',
'priority' => '1',
},
},
}
}
default: {