ncm-openstack: add gnocchi ceph storage setup

quattor · Jul 15, 2019 · d8fe176 · d8fe176
1 parent 45669bb
commit d8fe176
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 4 deletions.
diff --git a/ncm-openstack/src/main/pan/components/openstack/metric/ceilometer.pan b/ncm-openstack/src/main/pan/components/openstack/metric/ceilometer.pan
@@ -29,8 +29,16 @@ type openstack_ceilometer_gnocchi_indexer = {
     list of Gnocchi storage section
 }
 type openstack_ceilometer_gnocchi_storage = {
-    'file_basepath' : absolute_file_path = '/var/lib/gnocchi'
-    'driver' : string = 'file'
+    'file_basepath' ? absolute_file_path = '/var/lib/gnocchi'
+    'driver' : choice ('file', 'ceph') = 'file'
+    @{Ceph pool name to use}
+    'ceph_pool' ? string
+    @{Ceph username (ie: admin without "client." prefix)}
+    'ceph_username' ? string
+    @{Ceph keyring path}
+    'ceph_keyring' ? absolute_file_path
+    @{Ceph configuration file}
+    'ceph_conffile' ? absolute_file_path
 } = dict();
 
 

diff --git a/ncm-openstack/src/main/resources/tests/profiles/ceilometer.pan b/ncm-openstack/src/main/resources/tests/profiles/ceilometer.pan
@@ -14,7 +14,6 @@ prefix "/metaconfig/contents";
     "transport_url", format("rabbit://openstack:rabbit_pass@%s", OPENSTACK_HOST_SERVER),
 );
 "service_credentials" = dict(
-    #"auth_uri", format('http://%s:5000', OPENSTACK_HOST_SERVER),
     "auth_url", format('http://%s:5000/v3', OPENSTACK_HOST_SERVER),
     "username", "ceilometer",
     "password", "ceilometer_good_password",

diff --git a/ncm-openstack/src/main/resources/tests/profiles/ceilometer_gnocchi.pan b/ncm-openstack/src/main/resources/tests/profiles/ceilometer_gnocchi.pan
@@ -20,4 +20,6 @@ prefix "/metaconfig/contents";
 "indexer" = dict(
     "url", format("mysql+pymysql://gnocchi:gnocchi_db_pass@%s/gnocchi", OPENSTACK_HOST_SERVER),
 );
-
+"storage" = dict(
+    "file_basepath", "/var/lib/gnocchi",
+);
diff --git a/ncm-openstack/src/test/resources/os_resources.pan b/ncm-openstack/src/test/resources/os_resources.pan
@@ -397,4 +397,7 @@ prefix "/software/components/openstack/metric/ceilometer/gnocchi";
 "indexer" = dict(
     "url", format("mysql+pymysql://gnocchi:gnocchi_db_pass@%s/gnocchi", OPENSTACK_HOST_SERVER),
 );
+"storage" = dict(
+    "file_basepath", "/var/lib/gnocchi",
+);