openstack/puppet-openstack-integration
Code Issues Proposed changes

Align the stars to bump RDO to Ocata

Browse Source 
1) Bump RDO repository to the first consistent Ocata repository.
2) Adding lbaasv2 service plugin into Neutron, required to execute
   LBaaS tests.
3) Disabling Designate on RDO, it miss a new Monasca dependency.

Change-Id: Ib1c6144bd248c482f9dfe6d4ef6eab5c1a0a986d
This commit is contained in:
Emilien Macchi 2016-10-05 07:53:46 -04:00
parent 3d00c95018
commit 73815acf48
3 changed files with 18 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
fixtures/scenario003.pp
View File

@ -36,9 +36,13 @@ if ($::operatingsystem == 'Ubuntu') and (versioncmp($::operatingsystemmajrelease
$ssl_enabled = false
# linuxbridge driver is not working with latest Ubuntu packaging.
$neutron_plugin = 'openvswitch'
$designate_enabled = true
} else {
$ssl_enabled = true
$neutron_plugin = 'linuxbridge'
# Designate packaging in Ocata is missing monasca dependencies.
# Until it's fixed, let's disable it.
$designate_enabled = false
}
include ::openstack_integration
@ -64,11 +68,13 @@ include ::openstack_integration::heat
# enable when we figure why mistral tempest tests are so unstable
# include ::openstack_integration::mistral
include ::openstack_integration::sahara
include ::openstack_integration::designate
if $designate_enabled {
include ::openstack_integration::designate
}
include ::openstack_integration::provision
class { '::openstack_integration::tempest':
designate => true,
designate => $designate_enabled,
trove => true,
mistral => $mistral_enabled,
sahara => true,

4
manifests/neutron.pp
View File

@ -112,7 +112,7 @@ class openstack_integration::neutron (
rabbit_use_ssl => $::openstack_integration::config::ssl,
allow_overlapping_ips => true,
core_plugin => 'ml2',
service_plugins => ['router', 'metering', 'firewall'],
service_plugins => ['router', 'metering', 'firewall', 'neutron_lbaas.services.loadbalancer.plugin.LoadBalancerPluginv2'],
debug => true,
bind_host => $::openstack_integration::config::host,
use_ssl => $::openstack_integration::config::ssl,
@ -134,7 +134,7 @@ class openstack_integration::neutron (
api_workers => 2,
rpc_workers => 2,
service_providers => ['LOADBALANCER:Haproxy:neutron_lbaas.services.loadbalancer.drivers.haproxy.plugin_driver.HaproxyOnHostPluginDriver:default',
'LOADBALANCERV2:Haproxy:neutron_lbaas.drivers.haproxy.plugin_driver.HaproxyOnHostPluginDriver'],
'LOADBALANCERV2:Haproxy:neutron_lbaas.drivers.haproxy.plugin_driver.HaproxyOnHostPluginDriver:default'],
}
class { '::neutron::services::lbaas': }
class { '::neutron::plugins::ml2':

8
manifests/repos.pp
View File

@ -22,14 +22,14 @@ class openstack_integration::repos {
manage_epel => false,
repo_hash => {
'newton-current' => {
'baseurl' => 'https://trunk.rdoproject.org/centos7-master/ba/fa/bafa9e9bc3e683cd3ceb2650eb174cf707a2837e_4a791cab/',
'descr' => 'Newton current',
'baseurl' => 'https://trunk.rdoproject.org/centos7-ocata/26/f7/26f7d62bbf95e4bff00110ee6a66e41d1d923108_a6b8186a/',
'descr' => 'Ocata current',
'gpgcheck' => 'no',
'priority' => 1,
},
'newton-delorean-deps' => {
'baseurl' => 'http://buildlogs.centos.org/centos/7/cloud/x86_64/openstack-newton',
'descr' => 'Newton delorean-deps',
'baseurl' => 'http://buildlogs.centos.org/centos/7/cloud/x86_64/openstack-ocata',
'descr' => 'Ocata delorean-deps',
'gpgcheck' => 'no',
'priority' => 1,
},