commit b35c2707a0c2ff724d1e3c519f52a11aaeb7842a
author Jakub Pavlik <pavlk.jakub@gmail.com> Wed Jun 21 12:42:53 2017 +0000
committer Gerrit Code Review <gerrit2@32a4cf582fa9> Wed Jun 21 12:42:56 2017 +0000
tree d7c7333ff566f36737e4aded9d74cb0f2982dc07
parent 95ca02c6c74ff16255ac7ca81a49829116b2449e
parent 6a342b4b807318a17b43eed63f104fed72ddbb43

Merge changes I1de87d4c,I04c3405c

* changes:
  Add solidfire storage
  Add include to enable monitoring

cinder/control/backend/solidfire.yml

diff --git a/cinder/control/backend/solidfire.yml b/cinder/control/backend/solidfire.yml
new file mode 100644
index 0000000..20d708c
--- /dev/null
+++ b/cinder/control/backend/solidfire.yml
@@ -0,0 +1,14 @@
+parameters:
+  cinder:
+    controller:
+      defaul_volume_type: normal-storage
+      backend: 
+        solidfire:
+          engine: solidfire
+          type_name: normal-storage
+          engine: solidfire
+          san_ip: ${_param:san_ip_address}
+          san_login: ${_param:san_login}
+          san_password: ${_param:san_password}
+          clustername: ${_param:san_cluster_name}
+          sf_emulate_512: true
\ No newline at end of file

cinder/volume/backend/solidfire.yml

diff --git a/cinder/volume/backend/solidfire.yml b/cinder/volume/backend/solidfire.yml
new file mode 100644
index 0000000..3a38e03
--- /dev/null
+++ b/cinder/volume/backend/solidfire.yml
@@ -0,0 +1,15 @@
+parameters:
+  cinder:
+    volume:
+      enabled: true
+      default_volume_type: normal_storage
+      backend:
+        solidfire:
+          engine: solidfire
+          type_name: normal-storage
+          engine: solidfire
+          san_ip: ${_param:san_ip_address}
+          san_login: ${_param:san_login}
+          san_password: ${_param:san_password}
+          clustername: ${_param:san_cluster_name}
+          sf_emulate_512: true

opencontrail/compute/cluster.yml

diff --git a/opencontrail/compute/cluster.yml b/opencontrail/compute/cluster.yml
index d10b361..5e92709 100644
--- a/opencontrail/compute/cluster.yml
+++ b/opencontrail/compute/cluster.yml
@@ -1,3 +1,5 @@
+classes:
+  - service.opencontrail.compute.cluster
 applications:
 - opencontrail
 parameters: