summaryrefslogtreecommitdiffstats
path: root/fuel-plugin-ovsnfv/deployment_scripts/puppet/manifests
diff options
context:
space:
mode:
Diffstat (limited to 'fuel-plugin-ovsnfv/deployment_scripts/puppet/manifests')
-rw-r--r--fuel-plugin-ovsnfv/deployment_scripts/puppet/manifests/ovs-install-ovsnfv-compute.pp9
-rw-r--r--fuel-plugin-ovsnfv/deployment_scripts/puppet/manifests/ovs-install-ovsnfv-controller.pp7
-rw-r--r--fuel-plugin-ovsnfv/deployment_scripts/puppet/manifests/ovs-install-ovsnfv-primary-controller.pp7
3 files changed, 1 insertions, 22 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',
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 fd98120..6583e27 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,13 +1,6 @@
$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':
controller => 'True',
diff --git a/fuel-plugin-ovsnfv/deployment_scripts/puppet/manifests/ovs-install-ovsnfv-primary-controller.pp b/fuel-plugin-ovsnfv/deployment_scripts/puppet/manifests/ovs-install-ovsnfv-primary-controller.pp
index fd98120..6583e27 100644
--- a/fuel-plugin-ovsnfv/deployment_scripts/puppet/manifests/ovs-install-ovsnfv-primary-controller.pp
+++ b/fuel-plugin-ovsnfv/deployment_scripts/puppet/manifests/ovs-install-ovsnfv-primary-controller.pp
@@ -1,13 +1,6 @@
$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':
controller => 'True',