Merge "Enables tenant_name parameter for midonet_host_registry type"

lib/puppet/provider/midonet_host_registry/midonet_api_caller.rb

@@ -124,6 +124,7 @@ Puppet::Type.type(:midonet_host_registry).provide(:midonet_api_caller) do
 
   def call_get_token()
     res = @connection.get do |req|
+      req.headers['X-Auth-Project'] = resource[:tenant_name]
       req.url "/midonet-api/login"
     end
     return JSON.parse(res.body)['key']

lib/puppet/type/midonet_host_registry.rb

@@ -29,7 +29,7 @@ Puppet::Type.newtype(:midonet_host_registry) do
 
   newparam(:tunnelzone_name) do
     desc 'Name of the tunnelzone. If it does not exist, it creates one'
-    defaultto :'tzone0'
+    defaultto 'tzone0'
     validate do |value|
       unless value =~ /\w+/
         raise ArgumentError, "'%s' is not a valid tunnelzone name" % value
@@ -72,7 +72,7 @@ Puppet::Type.newtype(:midonet_host_registry) do
 
   newparam(:tenant_name) do
     desc 'Tenant name of the admin user'
-    defaultto :'admin'
+    defaultto 'admin'
     validate do |value|
       unless value =~ /\w+/
         raise ArgumentError, "'%s' is not a tenant name" % value

manifests/init.pp

@@ -66,23 +66,12 @@ class midonet {
     # Add midonet-cli
     class {'midonet::cli':}
 
-    # Register the host (and make sure dependencies are installed)
-    if $::osfamily == 'RedHat' {
-      $rubygems_pkg_name = 'rubygems'
-    }
-    elsif $::osfamily == 'Debian' {
-      $rubygems_pkg_name = 'ruby'
-    }
-    else {
-      fail("OS ${::operatingsystem} not supported")
-    }
-    package { $rubygems_pkg_name: ensure => installed, } ->
-    exec { "${midonet::params::gem_bin_path} install faraday multipart-post": } ->
     midonet_host_registry { $::hostname:
       ensure          => present,
       midonet_api_url => 'http://127.0.0.1:8181/midonet-api',
       username        => 'midogod',
       password        => 'midogod',
+      tenant_name     => 'midokura',
       require         => Class['midonet::agent']
     }
 

spec/unit/puppet/type/midonet_host_registry_spec.rb

@@ -15,9 +15,9 @@ describe Puppet::Type::type(:midonet_host_registry) do
     end
 
     it 'assign the default values' do
-      expect(resource[:tenant_name]).to eq :'admin'
+      expect(resource[:tenant_name]).to eq 'admin'
       expect(resource[:underlay_ip_address]).to eq Facter['ipaddress'].value
-      expect(resource[:tunnelzone_name]).to eq :'tzone0'
+      expect(resource[:tunnelzone_name]).to eq 'tzone0'
       expect(resource[:tunnelzone_type]).to eq :'gre'
     end
   end