Merge "Implements: liquidio-containerization"

lib/puppet/provider/liquidio_config/ini_setting.rb

@@ -0,0 +1,10 @@
+Puppet::Type.type(:liquidio_config).provide(
+  :ini_setting,
+  :parent => Puppet::Type.type(:openstack_config).provider(:ini_setting)
+) do
+
+  def self.file_path
+    '/etc/liquidio/liquidio.conf'
+  end
+
+end

lib/puppet/type/liquidio_config.rb

@@ -0,0 +1,49 @@
+Puppet::Type.newtype(:liquidio_config) do
+
+  ensurable
+
+  newparam(:name, :namevar => true) do
+    desc 'Section/setting name to manage from liquidio.conf'
+    newvalues(/\S+\/\S+/)
+  end
+
+  newproperty(:value) do
+    desc 'The value of the setting to be defined.'
+    munge do |value|
+      value = value.to_s.strip
+      value.capitalize! if value =~ /^(true|false)$/i
+      value
+    end
+    newvalues(/^[\S ]*$/)
+
+    def is_to_s( currentvalue )
+      if resource.secret?
+        return '[old secret redacted]'
+      else
+        return currentvalue
+      end
+    end
+
+    def should_to_s( newvalue )
+      if resource.secret?
+        return '[new secret redacted]'
+      else
+        return newvalue
+      end
+    end
+  end
+
+  newparam(:secret, :boolean => true) do
+    desc 'Whether to hide the value from Puppet logs. Defaults to `false`.'
+
+    newvalues(:true, :false)
+
+    defaultto false
+  end
+
+  newparam(:ensure_absent_val) do
+    desc 'A value that is specified as the value property will behave as if ensure => absent was specified'
+    defaultto('<SERVICE DEFAULT>')
+  end
+
+end

manifests/host/liquidio/compute.pp

@@ -1,4 +1,4 @@
-# == Class: tripleo::network::cavium::liquidio
+# == Class: tripleo::host::liquidio::compute
 #
 # LiquidioCompute node Configuration
 #
@@ -16,6 +16,10 @@
 #   (required) Tenant network's ip of the compute node
 #   Defaults to  hiera('tenant')
 #
+# [*tenant_network_type*]
+#   (required) Type of tenant networks to be configured
+#   Defaults to hiera('neutron::plugins::ml2::tenant_network_types')
+#
 # [*vf_nums*]
 #   (required) Number of VFs to be created on the node
 #
@@ -44,56 +48,53 @@
 # [*controller_virtual_ip*]
 #   (required) used by Liquidio service to communicate with Controller
 #   Defaults to hiera('controller_virtual_ip')
+#
+# [*pci_passthrough*]
+#   (required) used by Liquidio service 
+#   Defaults to hiera('nova::compute::pci::passthrough')
 
-class tripleo::network::cavium::liquidio (
+class tripleo::host::liquidio::compute (
   $vf_nums,
   $configure_mode,
   $bonding_options,
   $enable_bonding,
   $provider_mappings,
-  $step                  = Integer(hiera('step')),
   $tenant_subnet         = hiera('tenant_subnet'),
+  $step                  = Integer(hiera('step')),
   $opendaylight_api_vip  = hiera('opendaylight_api_vip', undef),
   $ovn_dbs_vip           = hiera('ovn_dbs_vip', undef),
   $controller_virtual_ip = hiera('controller_virtual_ip', undef),
+  $pci_passthrough       = hiera('nova::compute::pci::passthrough', undef),
 ) {
 
-  if $step >= 5 {
+    if $step >= 5 {
+        case $configure_mode {
 
-    $controller_node_ip = $configure_mode ? {
-      'ml2-odl' => $opendaylight_api_vip,
-      'ml2-ovn' => $ovn_dbs_vip,
-      Default   => $controller_virtual_ip,
-    }
+          'ml2-odl': { $controller_node_ip = $opendaylight_api_vip }
+          'ml2-ovn': { $controller_node_ip = $ovn_dbs_vip }
+          default  : { $controller_node_ip = $controller_virtual_ip }
 
-    if !$controller_node_ip {
-      fail("No controller node ip set for mode '${configure_mode}'")
-    }
+        }
 
-    $lioconfig = @("LIOCONFIG"/L)
-    [main]
-    controller_node=${controller_node_ip}
-    tenant_ip=${tenant_subnet}
-    vf_num=${vf_nums}
-    configure_mode=${configure_mode}
-    enable_bonding=${enable_bonding}
-    bonding_options=${bonding_options}
-    provider_mappings=${provider_mappings}
-    status=install-completed
-    | LIOCONFIG
+        if !$controller_node_ip {
+            fail("No controller node ip set for mode '${configure_mode}'")
+        }
 
-    file{ '/etc/liquidio.conf':
-      ensure  => 'present',
-      owner   => 'root',
-      group   => 'root',
-      mode    => '0664',
-      content => $lioconfig
-    }
-
-    service { 'liquidio-compute-service':
-      ensure => running,
-      name   => 'liquidio-compute-service',
-      enable => true,
+        liquidio_config {
+            'main/controller_node':   value => $controller_node_ip;
+            'main/tenant_ip':         value => $tenant_subnet;
+            'main/vf_num':            value => $vf_nums;
+            'main/configure_mode':    value => $configure_mode;
+            'main/enable_bonding':    value => $enable_bonding;
+            'main/bonding_options':   value => $bonding_options;
+            'main/provider_mappings': value => $provider_mappings;
+            'main/pci_passthrough':   value => $pci_passthrough;
+            'main/status':            value => 'install-completed';
+        }
+        service { 'liquidio-compute-service':
+          ensure => running,
+          name   => 'liquidio-compute-service',
+          enable => true,
+        }
     }
   }
-}

manifests/host/liquidio/config.pp

@@ -0,0 +1,34 @@
+# == Class: tripleo::host::liquidio::config
+#
+# This class is used to manage Liquidio configurations.
+#
+# === Parameters
+#
+# [*xxx_config*]
+#   (optional) Allow configuration of arbitrary Neutron xxx specific configurations.
+#   The value is a hash of neutron_config resources. Example:
+#   server_config =>
+#   { 'DEFAULT/foo' => { value => 'fooValue'},
+#     'DEFAULT/bar' => { value => 'barValue'}
+#   }
+#
+#   NOTE: { 'DEFAULT/foo': value => 'fooValue'; 'DEFAULT/bar': value => 'barValue'} is invalid.
+#
+#   In yaml format, Example:
+#   server_config:
+#     DEFAULT/foo:
+#       value: fooValue
+#     DEFAULT/bar:
+#       value: barValue
+#
+# [*liquidio_config*]
+#   (optional) Allow configuration of liquidio.conf configurations.
+#
+class tripleo::host::liquidio::config (
+  $liquidio_config = {}
+) {
+
+    validate_hash($liquidio_config)
+
+    create_resources('liquidio_config', $liquidio_config)
+}

spec/classes/tripleo_host_liquidio_compute_spec.rb

@@ -0,0 +1,24 @@
+describe 'tripleo::host::liquidio::compute' do
+
+  shared_examples_for 'tripleo::host::liquidio::compute' do
+
+    let :params do
+      {
+        :vf_nums      => '4',
+        :configure_mode => 'ml2-odl',
+        :bonding_options => 'active-backup',
+        :enable_bonding => true,
+        :provider_mappings => 'datacentre:eth1',
+      }
+    end
+
+    it 'configures parameters' do
+      is_expected.to contain_liquidio_config('main/vf_nums').with_value('4')
+      is_expected.to contain_liquidio_config('main/configure_mode').with_value('ml2-odl')
+      is_expected.to contain_liquidio_config('main/bonding_options').with_value('')
+      is_expected.to contain_liquidio_config('main/enable_bonding').with_value(true)
+      is_expected.to contain_liquidio_config('main/provider_mappings').with_value('datacentre:eth1')
+    end
+  end
+end
+   

spec/classes/tripleo_host_liquidio_config_spec.rb

@@ -0,0 +1,20 @@
+require 'spec_helper'
+
+describe 'tripleo::host::liquidio::config' do
+
+  let :params do
+    { :liquidio_config => {
+        'DEFAULT/foo' => { 'value'  => 'fooValue' },
+        'DEFAULT/bar' => { 'value'  => 'barValue' },
+        'DEFAULT/baz' => { 'ensure' => 'absent' }
+      },
+    }
+  end
+
+  it 'configures arbitrary liquidio configurations' do
+    is_expected.to contain_liquidio_config('DEFAULT/foo').with_value('fooValue')
+    is_expected.to contain_liquidio_config('DEFAULT/bar').with_value('barValue')
+    is_expected.to contain_liquidio_config('DEFAULT/baz').with_ensure('absent')
+  end
+
+end

spec/unit/provider/liquidio_config/ini_setting.rb

@@ -0,0 +1,53 @@
+require 'puppet'
+require 'spec_helper'
+require 'puppet/provider/liquidio/ini_setting'
+
+provider_class = Puppet::Type.type(:liquidio_config).
+  provider(:ini_setting)
+
+describe provider_class do
+  
+  it 'should default to the default setting when no other one is specified' do
+    resource = Puppet::Type::Liquidio_config.new(
+      {
+        :name => 'DEFAULT/foo',
+        :value => 'bar'
+      }
+    )
+    provider = provider_class.new(resource)
+    expect(provider.section).to eq('DEFAULT')
+    expect(provider.setting).to eq('foo')
+    expect(provider.file_path).to eq('/etc/liquidio/liquidio.conf')
+  end
+
+  it 'should allow setting to be set explicitly' do
+    resource = Puppet::Type::Liquidio_config.new(
+      {
+        :name => 'dude/foo',
+        :value => 'bar'
+      }
+    )
+    provider = provider_class.new(resource)
+    expect(provider.section).to eq('dude')
+    expect(provider.setting).to eq('foo')
+    expect(provider.file_path).to eq('/etc/liquidio/liquidio.conf')
+  end
+
+  it 'should ensure absent when <SERVICE DEFAULT> is specified as a value' do
+    resource = Puppet::Type::Liquidio_config.new(
+      {:name => 'dude/foo', :value => '<SERVICE DEFAULT>'}
+    )
+    provider = provider_class.new(resource)
+    provider.exists?
+    expect(resource[:ensure]).to eq :absent
+  end
+
+  it 'should ensure absent when value matches ensure_absent_val' do
+    resource = Puppet::Type::Liquidio_config.new(
+      {:name => 'dude/foo', :value => 'foo', :ensure_absent_val => 'foo' }
+    )
+    provider = provider_class.new(resource)
+    provider.exists?
+    expect(resource[:ensure]).to eq :absent
+  end
+end

spec/unit/type/liquidio_config_sepc.rb

@@ -0,0 +1,52 @@
+require 'puppet'
+require 'puppet/type/liquidio_config'
+describe 'Puppet::Type.type(:liquidio_config)' do
+  before :each do
+    @liquidio_config = Puppet::Type.type(:liquidio_config).new(:name => 'DEFAULT/foo', :value => 'bar')
+  end
+
+  it 'should require a name' do
+    expect {
+      Puppet::Type.type(:liquidio_config).new({})
+    }.to raise_error(Puppet::Error, 'Title or name must be provided')
+  end
+
+  it 'should not expect a name with whitespace' do
+    expect {
+      Puppet::Type.type(:liquidio_config).new(:name => 'f oo')
+    }.to raise_error(Puppet::Error, /Parameter name failed/)
+  end
+
+  it 'should fail when there is no section' do
+    expect {
+      Puppet::Type.type(:liquidio_config).new(:name => 'foo')
+    }.to raise_error(Puppet::Error, /Parameter name failed/)
+  end
+
+  it 'should not require a value when ensure is absent' do
+    Puppet::Type.type(:liquidio_config).new(:name => 'DEFAULT/foo', :ensure => :absent)
+  end
+
+  it 'should accept a valid value' do
+    @liquidio_config[:value] = 'bar'
+    expect(@liquidio_config[:value]).to eq(['bar'])
+  end
+
+  it 'should not accept a value with whitespace' do
+    @liquidio_config[:value] = 'b ar'
+    expect(@liquidio_config[:value]).to eq(['b ar'])
+  end
+
+  it 'should accept valid ensure values' do
+    @liquidio_config[:ensure] = :present
+    expect(@liquidio_config[:ensure]).to eq(:present)
+    @liquidio_config[:ensure] = :absent
+    expect(@liquidio_config[:ensure]).to eq(:absent)
+  end
+
+  it 'should not accept invalid ensure values' do
+    expect {
+      @liquidio_config[:ensure] = :latest
+    }.to raise_error(Puppet::Error, /Invalid value/)
+  end
+end