summaryrefslogtreecommitdiffstats
path: root/environments/services
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2017-04-06 16:35:30 +0000
committerGerrit Code Review <review@openstack.org>2017-04-06 16:35:30 +0000
commit799359847de4a241eccbb738f8235de74073d185 (patch)
tree8aba8bb53d39c89bd09b57722c2a8e8ca9edd772 /environments/services
parent07ebc0224a52b779bf18c8f98d9b887786c666a4 (diff)
parent0e8e8a920dec478453293740669101d62c6c740a (diff)
Merge "Disable ceilometer API"
Diffstat (limited to 'environments/services')
-rw-r--r--environments/services/ceilometer-api.yaml6
-rw-r--r--environments/services/disable-ceilometer-api.yaml5
2 files changed, 6 insertions, 5 deletions
diff --git a/environments/services/ceilometer-api.yaml b/environments/services/ceilometer-api.yaml
new file mode 100644
index 00000000..1e37e73b
--- /dev/null
+++ b/environments/services/ceilometer-api.yaml
@@ -0,0 +1,6 @@
+resource_registry:
+ OS::TripleO::Services::CeilometerApi: ../../puppet/services/ceilometer-api.yaml
+
+parameter_defaults:
+ CeilometerApiEndpoint: true
+
diff --git a/environments/services/disable-ceilometer-api.yaml b/environments/services/disable-ceilometer-api.yaml
deleted file mode 100644
index fb1ea6a7..00000000
--- a/environments/services/disable-ceilometer-api.yaml
+++ /dev/null
@@ -1,5 +0,0 @@
-resource_registry:
- OS::TripleO::Services::CeilometerApi: OS::Heat::None
-
-parameter_defaults:
- CeilometerApiEndpoint: false