diff options
| author |   Billy O'Mahony <billy.o.mahony@intel.com> | 2016-01-27 15:55:55 +0000 |
|---|---|---|
| committer | Billy O'Mahony <billy.o.mahony@intel.com> | 2016-01-27 16:49:22 +0000 |
| commit | e525200dcf33b91f65790451f01aa92d455ebcea (patch) | |
| tree | 62eb1dceee3ac6ffad33ae367298aba043a935dd /fuel-plugin-ovsnfv/deployment_scripts/puppet/manifests/ovs-install-ovsnfv-compute.pp | |
| parent | 3d6fc2c1932375d30d5176e3fdbd347b287f8c17 (diff) | |
fuel-plugins: Fuel8 Liberty rebase
Change-Id: I9c0e3ab4c8fde13765ec286d4c7c717070230983
Signed-off-by: Michal Ptacek <michalx.ptacek@intel.com>
Reviewed-by: Mark D. Gray <mark.d.gray@intel.com>
Reviewed-by: Billy O'Mahony <billy.o.mahony@intel.com>
(cherry picked from commit 7ce21aebcdabafaa24601104643cbd1c0b4bc8e4)
Change-Id: I5bb3dd48f5104606b4b024f99517b0b059003bea
Diffstat (limited to 'fuel-plugin-ovsnfv/deployment_scripts/puppet/manifests/ovs-install-ovsnfv-compute.pp')
| -rw-r--r-- | fuel-plugin-ovsnfv/deployment_scripts/puppet/manifests/ovs-install-ovsnfv-compute.pp | 9 |
1 files changed, 1 insertions, 8 deletions
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 693883a..62c5766 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,16 +1,9 @@ $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 => '0000:05:00.1#eth3', + ovs_bridge_mappings => 'default:ens1f1', ovs_socket_mem => '512,512', ovs_num_hugepages => '2048', compute => 'True', |