From 8d68d8de881bd57b4e164219e8dcd09dfd2c05a2 Mon Sep 17 00:00:00 2001 From: Billy O'Mahony Date: Wed, 13 Jan 2016 18:00:00 +0000 Subject: fuel_plugin: Working version on Montreal POD - change libvirt on controller to 1.2.12 - change qemu on controller to 2.2.1 - work around _set_device_mtu issue - remove existing OVS neutron plugin - fixes to puppet resource ordering - numerous other smaller changes Change-Id: I9a7c66065013a43f5e88871ef8b9f1cdd1038245 Signed-off-by: Mark D. Gray Signed-off-by: Billy O'Mahony Signed-off-by: Michal Ptacek --- .../puppet/manifests/ovs-install-ovsnfv-compute.pp | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) (limited to 'fuel-plugin-ovsnfv/deployment_scripts/puppet/manifests/ovs-install-ovsnfv-compute.pp') diff --git a/fuel-plugin-ovsnfv/deployment_scripts/puppet/manifests/ovs-install-ovsnfv-compute.pp b/fuel-plugin-ovsnfv/deployment_scripts/puppet/manifests/ovs-install-ovsnfv-compute.pp index f95cbb8..693883a 100644 --- a/fuel-plugin-ovsnfv/deployment_scripts/puppet/manifests/ovs-install-ovsnfv-compute.pp +++ b/fuel-plugin-ovsnfv/deployment_scripts/puppet/manifests/ovs-install-ovsnfv-compute.pp @@ -1,11 +1,18 @@ $fuel_settings = parseyaml(file('/etc/astute.yaml')) $master_ip = $::fuel_settings['master_ip'] +$adminrc_access = $::fuel_settings['access'] +$adminrc_user = $adminrc_access['user'] +$adminrc_password = $adminrc_access['password'] +$adminrc_tenant = $adminrc_access['tenant'] +$adminrc_public_ssl = $::fuel_settings['public_ssl'] +$adminrc_hostname = $adminrc_public_ssl['hostname'] + if $operatingsystem == 'Ubuntu' { class { '::ovsdpdk': - ovs_bridge_mappings => 'default:br-eth3', - ovs_socket_mem => '512', - ovs_num_hugepages => '256', + ovs_bridge_mappings => '0000:05:00.1#eth3', + ovs_socket_mem => '512,512', + ovs_num_hugepages => '2048', compute => 'True', } } elsif $operatingsystem == 'CentOS' { -- cgit 1.2.3-korg