diff options
Diffstat (limited to 'fuel-plugin-ovsnfv/deployment_scripts/puppet/manifests')
3 files changed, 33 insertions, 6 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 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' { 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' { 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 new file mode 100644 index 0000000..fd98120 --- /dev/null +++ b/fuel-plugin-ovsnfv/deployment_scripts/puppet/manifests/ovs-install-ovsnfv-primary-controller.pp @@ -0,0 +1,16 @@ +$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', + } +} elsif $operatingsystem == 'CentOS' { +} |