From f418c79632a7f21ff6ab11ef1715cd4a5b361789 Mon Sep 17 00:00:00 2001
From: Alex Schultz <aschultz@redhat.com>
Date: Fri, 7 Oct 2016 15:43:37 -0600
Subject: Add cinder profile spec tests

This change adds rspec testing for the cinder profiles with in
puppet-tripleo. Additionally while testing, it was found that the
backends may incorrectly have an extra , included in the settings
for cinder volume when running puppet 3.  This change includes a fix
the cinder volume backends to make sure we are not improperly
configuring it with a trailing comma.

Change-Id: Ibdfee330413b6f9aecdf42a5508c21126fc05973
---
 spec/fixtures/hiera.yaml             | 1 +
 spec/fixtures/hieradata/default.yaml | 3 +++
 spec/fixtures/hieradata/step1.yaml   | 2 ++
 spec/fixtures/hieradata/step2.yaml   | 2 ++
 spec/fixtures/hieradata/step3.yaml   | 2 ++
 spec/fixtures/hieradata/step4.yaml   | 9 +++++++++
 spec/fixtures/hieradata/step5.yaml   | 2 ++
 spec/fixtures/hieradata/step6.yaml   | 2 ++
 8 files changed, 23 insertions(+)
 create mode 100644 spec/fixtures/hieradata/step1.yaml
 create mode 100644 spec/fixtures/hieradata/step2.yaml
 create mode 100644 spec/fixtures/hieradata/step3.yaml
 create mode 100644 spec/fixtures/hieradata/step4.yaml
 create mode 100644 spec/fixtures/hieradata/step5.yaml
 create mode 100644 spec/fixtures/hieradata/step6.yaml

(limited to 'spec/fixtures')

diff --git a/spec/fixtures/hiera.yaml b/spec/fixtures/hiera.yaml
index d5368e9..07bc836 100644
--- a/spec/fixtures/hiera.yaml
+++ b/spec/fixtures/hiera.yaml
@@ -4,4 +4,5 @@
 :yaml:
   :datadir: './spec/fixtures/hieradata'
 :hierarchy:
+  - 'step%{::step}'
   - 'default'
diff --git a/spec/fixtures/hieradata/default.yaml b/spec/fixtures/hieradata/default.yaml
index 87ae28c..d63fc76 100644
--- a/spec/fixtures/hieradata/default.yaml
+++ b/spec/fixtures/hieradata/default.yaml
@@ -14,3 +14,6 @@ barbican::keystone::authtoken::password: 'password'
 ceilometer::keystone::authtoken::password: 'password'
 # ceph related items
 ceph::profile::params::mon_key: 'password'
+# cinder related items
+cinder::rabbit_password: 'password'
+cinder::keystone::authtoken::password: 'password'
diff --git a/spec/fixtures/hieradata/step1.yaml b/spec/fixtures/hieradata/step1.yaml
new file mode 100644
index 0000000..795a4a7
--- /dev/null
+++ b/spec/fixtures/hieradata/step1.yaml
@@ -0,0 +1,2 @@
+---
+step: 1
diff --git a/spec/fixtures/hieradata/step2.yaml b/spec/fixtures/hieradata/step2.yaml
new file mode 100644
index 0000000..4bd5851
--- /dev/null
+++ b/spec/fixtures/hieradata/step2.yaml
@@ -0,0 +1,2 @@
+---
+step: 2
diff --git a/spec/fixtures/hieradata/step3.yaml b/spec/fixtures/hieradata/step3.yaml
new file mode 100644
index 0000000..1526e81
--- /dev/null
+++ b/spec/fixtures/hieradata/step3.yaml
@@ -0,0 +1,2 @@
+---
+step: 3
diff --git a/spec/fixtures/hieradata/step4.yaml b/spec/fixtures/hieradata/step4.yaml
new file mode 100644
index 0000000..0b53225
--- /dev/null
+++ b/spec/fixtures/hieradata/step4.yaml
@@ -0,0 +1,9 @@
+---
+step: 4
+# items needed for tripleo::profile::base::cinder::volume
+tripleo::profile::base::cinder::volume::iscsi::cinder_iscsi_address: '127.0.0.1'
+tripleo::profile::base::cinder::volume::nfs::cinder_nfs_servers:
+ - '127.0.0.1'
+cinder::backend::eqlx::eqlx_chap_login: 'user'
+cinder::backend::eqlx::eqlx_chap_password: 'user'
+
diff --git a/spec/fixtures/hieradata/step5.yaml b/spec/fixtures/hieradata/step5.yaml
new file mode 100644
index 0000000..442420f
--- /dev/null
+++ b/spec/fixtures/hieradata/step5.yaml
@@ -0,0 +1,2 @@
+---
+step: 5
diff --git a/spec/fixtures/hieradata/step6.yaml b/spec/fixtures/hieradata/step6.yaml
new file mode 100644
index 0000000..08ba54d
--- /dev/null
+++ b/spec/fixtures/hieradata/step6.yaml
@@ -0,0 +1,2 @@
+---
+step: 6
-- 
cgit 1.2.3-korg