diff --git a/fixtures/scenario003.pp b/fixtures/scenario003.pp index 5d7bbf728..f3ef6fc97 100644 --- a/fixtures/scenario003.pp +++ b/fixtures/scenario003.pp @@ -33,12 +33,16 @@ case $::osfamily { # List of workarounds for Ubuntu Xenial: # - disable SSL if ($::operatingsystem == 'Ubuntu') and (versioncmp($::operatingsystemmajrelease, '16') >= 0) { - $ssl_enabled = false + $ssl_enabled = false # linuxbridge driver is not working with latest Ubuntu packaging. - $neutron_plugin = 'openvswitch' + $neutron_plugin = 'openvswitch' + $designate_enabled = true } else { - $ssl_enabled = true - $neutron_plugin = 'linuxbridge' + $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, diff --git a/manifests/neutron.pp b/manifests/neutron.pp index f6599a89a..d789f2bb7 100644 --- a/manifests/neutron.pp +++ b/manifests/neutron.pp @@ -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': diff --git a/manifests/repos.pp b/manifests/repos.pp index d693d1b74..9555dfb4f 100644 --- a/manifests/repos.pp +++ b/manifests/repos.pp @@ -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, },