added billometer to salt formulas
diff --git a/collectd/client/output/carbon.yml b/collectd/client/output/carbon.yml
index e69de29..47e8c73 100644
--- a/collectd/client/output/carbon.yml
+++ b/collectd/client/output/carbon.yml
@@ -0,0 +1,14 @@
+classes:
+- service.collectd.client
+parameters:
+ _param:
+ collectd_backend_carbon_host: localhost
+ collectd_backend_carbon_port: 2003
+ collectd:
+ client:
+ enabled: true
+ backend:
+ carbon:
+ engine: carbon
+ host: ${_param:collectd_backend_carbon_host}
+ port: ${_param:collectd_backend_carbon_port}
\ No newline at end of file
diff --git a/salt/master/formula/git/openstack.yml b/salt/master/formula/git/openstack.yml
index f34b9b1..0f3e72f 100644
--- a/salt/master/formula/git/openstack.yml
+++ b/salt/master/formula/git/openstack.yml
@@ -6,7 +6,11 @@
formula:
aodh:
source: git
- address: 'https://github.com/openstack/salt-formula-aodh.git'
+ address: 'https://github.com/tcpcloud/salt-formula-aodh.git'
+ revision: ${_param:salt_master_environment_revision}
+ billometer:
+ source: git
+ address: 'https://github.com/tcpcloud/salt-formula-billometer.git'
revision: ${_param:salt_master_environment_revision}
ceilometer:
source: git
diff --git a/salt/master/formula/pkg/openstack.yml b/salt/master/formula/pkg/openstack.yml
index 8da9507..bc9555d 100644
--- a/salt/master/formula/pkg/openstack.yml
+++ b/salt/master/formula/pkg/openstack.yml
@@ -7,6 +7,9 @@
aodh:
source: pkg
name: salt-formula-aodh
+ billometer:
+ source: pkg
+ name: salt-formula-billometer
ceilometer:
source: pkg
name: salt-formula-ceilometer