vhostuser socket dir shall be created for vhostuserclient mode

In order to support vhostuser client mode, a vhostuser_socket_dir
needs to be created with qemu:qemu g+w permissions.

Closes-Bug: #1675690

Co-Authored-By: Sanjay Upadhyay <supadhya@redhat.com>

Change-Id: I255f98c40869e7508ed01a03a96294284ecdc6a8
Signed-off-by: Karthik S <ksundara@redhat.com>
This commit is contained in:
Karthik S 2017-03-24 05:33:41 -04:00 committed by Sanjay Upadhyay
parent 749acc8df6
commit 2556c56b5b
4 changed files with 92 additions and 1 deletions

1
.gitignore vendored
View File

@ -4,6 +4,7 @@ vendor/
spec/fixtures/
.vagrant/
.bundle/
.bundle*/
coverage/
.idea/
*.swp

View File

@ -23,12 +23,27 @@
# for more details.
# Defaults to hiera('step')
#
# [*vhostuser_socket_dir*]
# (Optional) vhostuser socket dir, The directory where $vhostuser_socket_dir
# will be created with correct permissions, inorder to support vhostuser
# client mode.
class tripleo::profile::base::neutron::ovs(
$step = hiera('step'),
$step = hiera('step'),
$vhostuser_socket_dir = hiera('neutron::agents::ml2::ovs::vhostuser_socket_dir', undef)
) {
include ::tripleo::profile::base::neutron
if $step >= 5 {
if $vhostuser_socket_dir {
file { $vhostuser_socket_dir:
ensure => directory,
owner => 'qemu',
group => 'qemu',
mode => '0775',
}
}
include ::neutron::agents::ml2::ovs
# Optional since manage_service may be false and neutron server may not be colocated.

View File

@ -0,0 +1,73 @@
#
# Copyright (C) 2017 Red Hat, Inc.
#
# Licensed under the Apache License, Version 2.0 (the "License"); you may
# not use this file except in compliance with the License. You may obtain
# a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
# License for the specific language governing permissions and limitations
# under the License.
#
require 'spec_helper'
describe 'tripleo::profile::base::neutron::ovs' do
shared_examples_for 'tripleo::profile::base::neutron::ovs with default params' do
before :each do
facts.merge!({ :step => params[:step] })
end
context 'with defaults for all parameters' do
let(:params) { { :step => 5 } }
it 'should do nothing' do
is_expected.to contain_class('tripleo::profile::base::neutron')
is_expected.to contain_class('neutron::agents::ml2::ovs')
is_expected.not_to contain_file('/var/lib/vhostuser_sockets')
end
end
end
shared_examples_for 'tripleo::profile::base::neutron::ovs with vhostuser_socketdir' do
before :each do
facts.merge!({ :step => params[:step], :vhostuser_socket_dir => params[:vhostuser_socket_dir] })
end
context 'with vhostuser_socketdir configured' do
let :params do
{
:step => 5,
:vhostuser_socket_dir => '/var/lib/vhostuser_sockets'
}
end
it { is_expected.to contain_class('tripleo::profile::base::neutron') }
it { is_expected.to contain_class('neutron::agents::ml2::ovs') }
it { is_expected.to contain_file('/var/lib/vhostuser_sockets').with(
:ensure => 'directory',
:owner => 'qemu',
:group => 'qemu',
:mode => '0775',
) }
end
end
on_supported_os.each do |os, facts|
context "on #{os}" do
let(:facts) do
facts.merge({ :hostname => 'node.example.com' })
end
it_behaves_like 'tripleo::profile::base::neutron::ovs with default params'
it_behaves_like 'tripleo::profile::base::neutron::ovs with vhostuser_socketdir'
end
end
end

View File

@ -45,3 +45,5 @@ memcached_node_ips:
octavia::rabbit_password: 'password'
horizon::secret_key: 'secrete'
service_names: ['sshd']
#Neutron related
neutron::rabbit_password: 'password'