- Cookstyle fixes - Refactor Berksfile to use groups so we can exclude integration testing cookbooks - Update documentation - Cleanup line wraps - Enable sensitive resources for the template[/etc/neutron/neutron.conf] and template[/etc/neutron/metadata_agent.ini] to resources improve security. - Update delivery configuration to exclude integration cookbooks - Fix ChefSpec output. - Update lbaas recipe to use v2 agent driver. - Add recommended configuration settings to neutron.conf based in Stein installation docs. - Remove any resources that define the default action. - Switch package installations to send packages as arrays instead of individual package resources. This generally speeds up chef runs. - Manage /etc/neutron/neutron_lbaas.conf so we can set service_provider properly. - Add some missing ChefSpec tests. - Configure neutron_lbaas.conf on Ubuntu in a manner that allows it to properly pull in the configuration via the --config-dir option. This is due to the fact we need to set an additional [service_providers] service_provider line and we can't do that with hashes. - Remove FWaaS as it's unmaintained upstream. Depends-On: https://review.opendev.org/701027 Depends-On: https://review.opendev.org/706151 Change-Id: Id29884766440d37fa18fd62f3f93eecc22224d51
57 lines
1.8 KiB
Ruby
57 lines
1.8 KiB
Ruby
# Encoding: utf-8
|
|
require_relative 'spec_helper'
|
|
|
|
describe 'openstack-network::_bridge_config_example' do
|
|
describe 'ubuntu' do
|
|
let(:runner) { ChefSpec::SoloRunner.new(UBUNTU_OPTS) }
|
|
let(:node) { runner.node }
|
|
cached(:chef_run) do
|
|
runner.converge(described_recipe)
|
|
end
|
|
|
|
before do
|
|
%w(eth-ext eth-vlan eth-tun).each do |eth|
|
|
stub_command("ip link show | grep #{eth}")
|
|
end
|
|
allow_any_instance_of(Chef::Recipe).to receive(:address_for)
|
|
.with('eth-tun')
|
|
.and_return('1.2.3.4')
|
|
end
|
|
|
|
describe 'create ovs external network bridge and port' do
|
|
let(:cmd_br) { 'ovs-vsctl --may-exist add-br br-ex' }
|
|
let(:cmd_port) { 'ovs-vsctl --may-exist add-port br-ex eth-ext' }
|
|
let(:name) { 'create external network bridge' }
|
|
|
|
it 'adds external network bridge' do
|
|
expect(chef_run).to run_execute(name).with(command: cmd_br)
|
|
end
|
|
it 'adds external network bridge port' do
|
|
expect(chef_run).to run_execute("#{name} port").with(command: cmd_port)
|
|
end
|
|
end
|
|
|
|
describe 'create vlan network bridge and port' do
|
|
let(:cmd_br) { 'ovs-vsctl --may-exist add-br br-vlan' }
|
|
let(:cmd_port) { 'ovs-vsctl --may-exist add-port br-vlan eth-vlan' }
|
|
let(:name) { 'create vlan network bridge' }
|
|
|
|
it 'adds vlan network bridge' do
|
|
expect(chef_run).to run_execute(name).with(command: cmd_br)
|
|
end
|
|
it 'adds vlan network bridge port' do
|
|
expect(chef_run).to run_execute("#{name} port").with(command: cmd_port)
|
|
end
|
|
end
|
|
|
|
describe 'create tunnel network bridge' do
|
|
let(:cmd_br) { 'ovs-vsctl --may-exist add-br br-tun' }
|
|
let(:name) { 'create tunnel network bridge' }
|
|
|
|
it 'adds tunnel network bridge' do
|
|
expect(chef_run).to run_execute(name).with(command: cmd_br)
|
|
end
|
|
end
|
|
end
|
|
end
|