diff --git a/lib/puppet/provider/nova_flavor/openstack.rb b/lib/puppet/provider/nova_flavor/openstack.rb index 8a51d0c27..d8b642156 100644 --- a/lib/puppet/provider/nova_flavor/openstack.rb +++ b/lib/puppet/provider/nova_flavor/openstack.rb @@ -118,7 +118,7 @@ Puppet::Type.type(:nova_flavor).provide( :disk => attrs[:disk], :ephemeral => attrs[:ephemeral], :vcpus => attrs[:vcpus], - :is_public => attrs[:is_public].downcase.chomp == 'true'? true : false, + :is_public => attrs[:is_public].downcase.chomp == 'true'? :true : :false, :swap => attrs[:swap], :rxtx_factor => attrs[:rxtx_factor], :properties => properties, diff --git a/lib/puppet/type/nova_flavor.rb b/lib/puppet/type/nova_flavor.rb index 5155d5bac..42bfb5592 100644 --- a/lib/puppet/type/nova_flavor.rb +++ b/lib/puppet/type/nova_flavor.rb @@ -82,35 +82,35 @@ Puppet::Type.newtype(:nova_flavor) do end end - newparam(:id) do + newproperty(:id) do desc 'Unique ID (integer or UUID) for the flavor.' end - newparam(:ram) do + newproperty(:ram) do desc 'Amount of RAM to use (in megabytes).' end - newparam(:disk) do + newproperty(:disk) do desc 'Amount of disk space (in gigabytes) to use for the root (/) partition.' end - newparam(:vcpus) do + newproperty(:vcpus) do desc 'Number of virtual CPUs to use.' end - newparam(:ephemeral) do + newproperty(:ephemeral) do desc 'Amount of disk space (in gigabytes) to use for the ephemeral partition.' end - newparam(:swap) do + newproperty(:swap) do desc 'Amount of swap space (in megabytes) to use.' end - newparam(:rxtx_factor) do + newproperty(:rxtx_factor) do desc 'The slice of bandwidth that the instances with this flavor can use (through the Virtual Interface (vif) creation in the hypervisor)' end - newparam(:is_public) do + newproperty(:is_public) do desc "Whether the flavor is public or not. Default true" newvalues(/(y|Y)es/, /(n|N)o/, /(t|T)rue/, /(f|F)alse/, true, false) defaultto(true) diff --git a/spec/unit/provider/nova_flavor/openstack_spec.rb b/spec/unit/provider/nova_flavor/openstack_spec.rb index 243bc77b0..413e69763 100644 --- a/spec/unit/provider/nova_flavor/openstack_spec.rb +++ b/spec/unit/provider/nova_flavor/openstack_spec.rb @@ -164,7 +164,7 @@ domain_id="domain_one_id" expect(instances[0].disk).to eq('2') expect(instances[0].ephemeral).to eq('0') expect(instances[0].vcpus).to eq('1') - expect(instances[0].is_public).to eq(true) + expect(instances[0].is_public).to eq(:true) expect(instances[0].swap).to eq('0') expect(instances[0].rxtx_factor).to eq('1.0') expect(instances[0].properties).to eq({}) @@ -176,7 +176,7 @@ domain_id="domain_one_id" expect(instances[1].disk).to eq('2') expect(instances[1].ephemeral).to eq('0') expect(instances[1].vcpus).to eq('1') - expect(instances[1].is_public).to eq(false) + expect(instances[1].is_public).to eq(:false) expect(instances[1].swap).to eq('0') expect(instances[1].rxtx_factor).to eq('1.0') expect(instances[1].properties).to eq({'key1' => 'val1', 'key2' => 'val2'})