bab9bb6b69
Create new directories:
ceph
config
config-files
filesystem
kernel
kernel/kernel-modules
ldap
logging
strorage-drivers
tools
utilities
virt
Retire directories:
connectivity
core
devtools
support
extended
Delete two packages:
tgt
irqbalance
Relocated packages:
base/
dhcp
initscripts
libevent
lighttpd
linuxptp
memcached
net-snmp
novnc
ntp
openssh
pam
procps
sanlock
shadow
sudo
systemd
util-linux
vim
watchdog
ceph/
python-cephclient
config/
facter
puppet-4.8.2
puppet-modules
filesystem/
e2fsprogs
nfs-utils
nfscheck
kernel/
kernel-std
kernel-rt
kernel/kernel-modules/
mlnx-ofa_kernel
ldap/
nss-pam-ldapd
openldap
logging/
syslog-ng
logrotate
networking/
lldpd
iproute
mellanox
python-ryu
mlx4-config
python/
python-2.7.5
python-django
python-gunicorn
python-setuptools
python-smartpm
python-voluptuous
security/
shim-signed
shim-unsigned
tboot
strorage-drivers/
python-3parclient
python-lefthandclient
virt/
cloud-init
libvirt
libvirt-python
qemu
tools/
storage-topology
vm-topology
utilities/
tis-extensions
namespace-utils
nova-utils
update-motd
Change-Id: I37ade764d873c701b35eac5881eb40412ba64a86
Story: 2002801
Task: 22687
Signed-off-by: Scott Little <scott.little@windriver.com>
46 lines
2.3 KiB
Diff
46 lines
2.3 KiB
Diff
From b72db6b2d737e48129f06ad63e577a4489b66b77 Mon Sep 17 00:00:00 2001
|
|
From: Joseph Richard <Joseph.Richard@windriver.com>
|
|
Date: Fri, 10 Nov 2017 11:31:51 -0500
|
|
Subject: [PATCH 8/8] dvr allow base mac address to be configured
|
|
|
|
---
|
|
manifests/init.pp | 2 ++
|
|
spec/classes/neutron_init_spec.rb | 1 +
|
|
2 files changed, 3 insertions(+)
|
|
|
|
diff --git a/manifests/init.pp b/manifests/init.pp
|
|
index 4e76091..23ca45f 100644
|
|
--- a/manifests/init.pp
|
|
+++ b/manifests/init.pp
|
|
@@ -383,6 +383,7 @@ class neutron (
|
|
$service_plugins = $::os_service_default,
|
|
$auth_strategy = 'keystone',
|
|
$base_mac = $::os_service_default,
|
|
+ $dvr_base_mac = $::os_service_default,
|
|
$dhcp_lease_duration = $::os_service_default,
|
|
$host = $::os_service_default,
|
|
$dns_domain = $::os_service_default,
|
|
@@ -521,6 +522,7 @@ instead.")
|
|
'DEFAULT/auth_strategy': value => $auth_strategy;
|
|
'DEFAULT/core_plugin': value => $core_plugin;
|
|
'DEFAULT/base_mac': value => $base_mac;
|
|
+ 'DEFAULT/dvr_base_mac': value => $dvr_base_mac;
|
|
'DEFAULT/dhcp_lease_duration': value => $dhcp_lease_duration;
|
|
'DEFAULT/host': value => $host;
|
|
'DEFAULT/dns_domain': value => $dns_domain;
|
|
diff --git a/spec/classes/neutron_init_spec.rb b/spec/classes/neutron_init_spec.rb
|
|
index 3854313..b4a53fa 100644
|
|
--- a/spec/classes/neutron_init_spec.rb
|
|
+++ b/spec/classes/neutron_init_spec.rb
|
|
@@ -140,6 +140,7 @@ describe 'neutron' do
|
|
is_expected.to contain_neutron_config('DEFAULT/auth_strategy').with_value('keystone')
|
|
is_expected.to contain_neutron_config('DEFAULT/core_plugin').with_value( params[:core_plugin] )
|
|
is_expected.to contain_neutron_config('DEFAULT/base_mac').with_value('<SERVICE DEFAULT>')
|
|
+ is_expected.to contain_neutron_config('DEFAULT/dvr_base_mac').with_value('<SERVICE DEFAULT>')
|
|
is_expected.to contain_neutron_config('DEFAULT/dhcp_lease_duration').with_value('<SERVICE DEFAULT>')
|
|
is_expected.to contain_neutron_config('DEFAULT/host').with_value('<SERVICE DEFAULT>')
|
|
is_expected.to contain_neutron_config('DEFAULT/dns_domain').with_value('<SERVICE DEFAULT>')
|
|
--
|
|
1.8.3.1
|
|
|