From b57e071f30e576c2a125f9635a6b39ca3cdc1c83 Mon Sep 17 00:00:00 2001
From: Dan Bode <dan@puppetlabs.com>
Date: Fri, 26 Oct 2012 12:22:17 -0700
Subject: [PATCH] fix spec test failures.

This commit resolves spec test failures.

- adds create_resources to fixtures for 2.6 tests
- updates endpoints for new format
---
 .fixtures.yml                               |  1 +
 spec/classes/nova_keystone_endpoint_spec.rb | 18 ++++++------------
 2 files changed, 7 insertions(+), 12 deletions(-)

diff --git a/.fixtures.yml b/.fixtures.yml
index 517e8a05..5956b90c 100644
--- a/.fixtures.yml
+++ b/.fixtures.yml
@@ -7,5 +7,6 @@ fixtures:
     "sysctl": "git://github.com/duritong/puppet-sysctl.git"
     "rabbitmq": "git://github.com/puppetlabs/puppetlabs-rabbitmq.git"
     'inifile':  'git://github.com/cprice-puppet/puppetlabs-inifile'
+    "create_resources": 'git://github.com/puppetlabs/puppetlabs-create_resources'
   symlinks:
     "nova": "#{source_dir}"
diff --git a/spec/classes/nova_keystone_endpoint_spec.rb b/spec/classes/nova_keystone_endpoint_spec.rb
index 341f0d5a..70e3d73b 100644
--- a/spec/classes/nova_keystone_endpoint_spec.rb
+++ b/spec/classes/nova_keystone_endpoint_spec.rb
@@ -36,25 +36,22 @@
       :description => 'EC2 Service'
     )}
 
-    it { should contain_keystone_endpoint('nova').with(
+    it { should contain_keystone_endpoint('RegionOne/nova').with(
       :ensure       => 'present',
-      :region       => 'RegionOne',
       :public_url   => 'http://127.0.0.1:8774/v2/%(tenant_id)s',
       :admin_url    => 'http://127.0.0.1:8774/v2/%(tenant_id)s',
       :internal_url => 'http://127.0.0.1:8774/v2/%(tenant_id)s'
     )}
 
-    it { should contain_keystone_endpoint('nova_volume').with(
+    it { should contain_keystone_endpoint('RegionOne/nova_volume').with(
       :ensure       => 'present',
-      :region       => 'RegionOne',
       :public_url   => 'http://127.0.0.1:8776/v1/%(tenant_id)s',
       :admin_url    => 'http://127.0.0.1:8776/v1/%(tenant_id)s',
       :internal_url => 'http://127.0.0.1:8776/v1/%(tenant_id)s'
     )}
 
-    it { should contain_keystone_endpoint('nova_ec2').with(
+    it { should contain_keystone_endpoint('RegionOne/nova_ec2').with(
       :ensure       => 'present',
-      :region       => 'RegionOne',
       :public_url   => 'http://127.0.0.1:8773/services/Cloud',
       :admin_url    => 'http://127.0.0.1:8773/services/Admin',
       :internal_url => 'http://127.0.0.1:8773/services/Cloud'
@@ -129,25 +126,22 @@
       }
     end
 
-    it { should contain_keystone_endpoint('nova').with(
+    it { should contain_keystone_endpoint('RegionTwo/nova').with(
       :ensure       => 'present',
-      :region       => 'RegionTwo',
       :public_url   => 'http://10.0.0.1:9774/v2.2/%(tenant_id)s',
       :admin_url    => 'http://10.0.0.2:9774/v2.2/%(tenant_id)s',
       :internal_url => 'http://10.0.0.3:9774/v2.2/%(tenant_id)s'
     )}
 
-    it { should contain_keystone_endpoint('nova_volume').with(
+    it { should contain_keystone_endpoint('RegionTwo/nova_volume').with(
       :ensure       => 'present',
-      :region       => 'RegionTwo',
       :public_url   => 'http://10.0.0.1:9776/v2.1/%(tenant_id)s',
       :admin_url    => 'http://10.0.0.2:9776/v2.1/%(tenant_id)s',
       :internal_url => 'http://10.0.0.3:9776/v2.1/%(tenant_id)s'
     )}
 
-    it { should contain_keystone_endpoint('nova_ec2').with(
+    it { should contain_keystone_endpoint('RegionTwo/nova_ec2').with(
       :ensure       => 'present',
-      :region       => 'RegionTwo',
       :public_url   => 'http://10.0.0.1:9773/services/Cloud',
       :admin_url    => 'http://10.0.0.2:9773/services/Admin',
       :internal_url => 'http://10.0.0.3:9773/services/Cloud'