diff options
| author |   Billy O'Mahony <billy.o.mahony@intel.com> | 2016-01-13 18:00:00 +0000 |
|---|---|---|
| committer |   Mark D. Gray <mark.d.gray@intel.com> | 2016-01-18 09:01:56 +0000 |
| commit | 0e14c4cb61521bdfc3cd597342f526e1c30ff405 (patch) | |
| tree | 3ea5cc570fc639a5e489c942b115505e05e3efb7 /fuel-plugin-ovsnfv/deployment_scripts/puppet/manifests/ovs-install-ovsnfv-controller.pp | |
| parent | 9c5d3a2ab72fa9553924ecaf70ae7ef0d1d562d0 (diff) | |
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 <mark.d.gray@intel.com>
Signed-off-by: Billy O'Mahony <billy.o.mahony@intel.com>
Signed-off-by: Michal Ptacek <michalx.ptacek@intel.com>
(cherry picked from commit 8d68d8de881bd57b4e164219e8dcd09dfd2c05a2)
Diffstat (limited to 'fuel-plugin-ovsnfv/deployment_scripts/puppet/manifests/ovs-install-ovsnfv-controller.pp')
| -rw-r--r-- | fuel-plugin-ovsnfv/deployment_scripts/puppet/manifests/ovs-install-ovsnfv-controller.pp | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/fuel-plugin-ovsnfv/deployment_scripts/puppet/manifests/ovs-install-ovsnfv-controller.pp b/fuel-plugin-ovsnfv/deployment_scripts/puppet/manifests/ovs-install-ovsnfv-controller.pp index df20a85..fd98120 100644 --- a/fuel-plugin-ovsnfv/deployment_scripts/puppet/manifests/ovs-install-ovsnfv-controller.pp +++ b/fuel-plugin-ovsnfv/deployment_scripts/puppet/manifests/ovs-install-ovsnfv-controller.pp @@ -1,11 +1,15 @@ $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 => '', - ovs_socket_mem => '512', - ovs_num_hugepages => '256', controller => 'True', } } elsif $operatingsystem == 'CentOS' { |