Change and create system classes for support Mitaka Ceilometer
Aodh and Ceilometer system classes were created in this commit.
Also keystone, galera and mysql classes were changed to support
aodh installation.
https://github.com/Mirantis/mk-lab-salt-model/pull/137
diff --git a/aodh/server/cluster.yml b/aodh/server/cluster.yml
new file mode 100644
index 0000000..2be4db6
--- /dev/null
+++ b/aodh/server/cluster.yml
@@ -0,0 +1,4 @@
+classes:
+- service.aodh.server.cluster
+- system.haproxy.proxy.listen.openstack.aodh
+- service.keepalived.cluster.single
diff --git a/aodh/server/single.yml b/aodh/server/single.yml
new file mode 100644
index 0000000..eba3fc1
--- /dev/null
+++ b/aodh/server/single.yml
@@ -0,0 +1,2 @@
+classes:
+- service.aodh.server.single
diff --git a/ceilometer/agent/cluster.yml b/ceilometer/agent/cluster.yml
new file mode 100644
index 0000000..d62a433
--- /dev/null
+++ b/ceilometer/agent/cluster.yml
@@ -0,0 +1,2 @@
+classes:
+- service.ceilometer.agent.cluster
diff --git a/ceilometer/agent/single.yml b/ceilometer/agent/single.yml
new file mode 100644
index 0000000..ebb1d60
--- /dev/null
+++ b/ceilometer/agent/single.yml
@@ -0,0 +1,2 @@
+classes:
+- service.ceilometer.agent.single
diff --git a/ceilometer/compute/cluster.yml b/ceilometer/compute/cluster.yml
deleted file mode 100644
index 86b044e..0000000
--- a/ceilometer/compute/cluster.yml
+++ /dev/null
@@ -1,8 +0,0 @@
-classes:
-- service.ceilometer.agent.cluster
-- service.ceilometer.agent.publisher.graphite
-parameters:
- nova:
- compute:
- notification:
- driver: messagingv2
diff --git a/ceilometer/server/cluster.yml b/ceilometer/server/cluster.yml
new file mode 100644
index 0000000..572d571
--- /dev/null
+++ b/ceilometer/server/cluster.yml
@@ -0,0 +1,18 @@
+classes:
+- service.ceilometer.server.cluster
+- system.haproxy.proxy.listen.openstack.ceilometer
+- service.keepalived.cluster.single
+parameters:
+ ceilometer:
+ server:
+ database:
+ influxdb:
+ host: ${_param:stacklight_monitor_node01_address}
+ port: 8086
+ user: ceilometer
+ password: ${_param:stacklight_influxdb_password}
+ database: ceilometer
+ elasticsearch:
+ enabled: true
+ host: ${_param:stacklight_monitor_address}
+ port: 9200
diff --git a/ceilometer/server/single.yml b/ceilometer/server/single.yml
new file mode 100644
index 0000000..afcc5e6
--- /dev/null
+++ b/ceilometer/server/single.yml
@@ -0,0 +1,16 @@
+classes:
+- service.ceilometer.server.single
+parameters:
+ ceilometer:
+ server:
+ database:
+ influxdb:
+ host: ${_param:stacklight_monitor_node01_address}
+ port: 8086
+ user: ceilometer
+ password: ${_param:stacklight_influxdb_password}
+ database: ceilometer
+ elasticsearch:
+ enabled: true
+ host: ${_param:stacklight_monitor_address}
+ port: 9200
diff --git a/galera/server/database/aodh.yml b/galera/server/database/aodh.yml
new file mode 100644
index 0000000..f5095d2
--- /dev/null
+++ b/galera/server/database/aodh.yml
@@ -0,0 +1,15 @@
+parameters:
+ mysql:
+ server:
+ database:
+ aodh:
+ encoding: utf8
+ users:
+ - name: aodh
+ password: ${_param:mysql_aodh_password}
+ host: '%'
+ rights: all
+ - name: aodh
+ password: ${_param:mysql_aodh_password}
+ host: ${_param:cluster_vip_address}
+ rights: all
diff --git a/haproxy/proxy/listen/openstack/aodh.yml b/haproxy/proxy/listen/openstack/aodh.yml
new file mode 100644
index 0000000..6b024aa
--- /dev/null
+++ b/haproxy/proxy/listen/openstack/aodh.yml
@@ -0,0 +1,23 @@
+parameters:
+ haproxy:
+ proxy:
+ listen:
+ aodh-api:
+ type: openstack-service
+ service_name: aodh
+ binds:
+ - address: ${_param:cluster_vip_address}
+ port: 8042
+ servers:
+ - name: ctl01
+ host: ${_param:cluster_node01_address}
+ port: 8042
+ params: check inter 10s fastinter 2s downinter 3s rise 3 fall 3
+ - name: ctl02
+ host: ${_param:cluster_node02_address}
+ port: 8042
+ params: check inter 10s fastinter 2s downinter 3s rise 3 fall 3
+ - name: ctl03
+ host: ${_param:cluster_node03_address}
+ port: 8042
+ params: check inter 10s fastinter 2s downinter 3s rise 3 fall 3
\ No newline at end of file
diff --git a/haproxy/proxy/listen/openstack/ceilometer.yml b/haproxy/proxy/listen/openstack/ceilometer.yml
new file mode 100644
index 0000000..7e90073
--- /dev/null
+++ b/haproxy/proxy/listen/openstack/ceilometer.yml
@@ -0,0 +1,23 @@
+parameters:
+ haproxy:
+ proxy:
+ listen:
+ ceilometer-api:
+ type: openstack-service
+ service_name: ceilometer
+ binds:
+ - address: ${_param:cluster_vip_address}
+ port: 8777
+ servers:
+ - name: ctl01
+ host: ${_param:cluster_node01_address}
+ port: 8777
+ params: check inter 10s fastinter 2s downinter 3s rise 3 fall 3
+ - name: ctl02
+ host: ${_param:cluster_node02_address}
+ port: 8777
+ params: check inter 10s fastinter 2s downinter 3s rise 3 fall 3
+ - name: ctl03
+ host: ${_param:cluster_node03_address}
+ port: 8777
+ params: check inter 10s fastinter 2s downinter 3s rise 3 fall 3
diff --git a/heka/ceilometer_collector/single.yml b/heka/ceilometer_collector/single.yml
new file mode 100644
index 0000000..d350a69
--- /dev/null
+++ b/heka/ceilometer_collector/single.yml
@@ -0,0 +1,19 @@
+classes:
+- service.heka.ceilometer_collector.single
+- system.heka.server
+parameters:
+ heka:
+ ceilometer_collector:
+ enabled: true
+ influxdb_database: ceilometer
+ influxdb_host: ${_param:stacklight_monitor_node01_address}
+ influxdb_password: ${_param:_param:influxdb_password}
+ influxdb_port: 8086
+ influxdb_username: ceilometer
+ resource_decoding: false
+ amqp_host: ${_param:cluster_vip_address}
+ amqp_port: 5672
+ amqp_user: openstack
+ amqp_password: ${_param:rabbitmq_openstack_password}
+ amqp_vhost: '/openstack'
+ amqp_queue: metering.sample
diff --git a/keystone/client/service/aodh.yml b/keystone/client/service/aodh.yml
new file mode 100644
index 0000000..c91a354
--- /dev/null
+++ b/keystone/client/service/aodh.yml
@@ -0,0 +1,27 @@
+parameters:
+ keystone:
+ client:
+ server:
+ identity:
+ project:
+ service:
+ user:
+ aodh:
+ is_admin: true
+ password: ${_param:keystone_aodh_password}
+ email: ${_param:admin_email}
+ service:
+ aodh:
+ type: alarming
+ description: OpenStack Alarming Service
+ endpoints:
+ - region: ${_param:openstack_region}
+ public_address: ${_param:aodh_service_host}
+ public_port: 8042
+ public_path: '/'
+ internal_address: ${_param:aodh_service_host}
+ internal_port: 8042
+ internal_path: '/'
+ admin_address: ${_param:aodh_service_host}
+ admin_port: 8042
+ admin_path: '/'
\ No newline at end of file
diff --git a/salt/master/formula/git/openstack.yml b/salt/master/formula/git/openstack.yml
index 17c40e9..f34b9b1 100644
--- a/salt/master/formula/git/openstack.yml
+++ b/salt/master/formula/git/openstack.yml
@@ -4,6 +4,10 @@
environment:
dev:
formula:
+ aodh:
+ source: git
+ address: 'https://github.com/openstack/salt-formula-aodh.git'
+ revision: ${_param:salt_master_environment_revision}
ceilometer:
source: git
address: 'https://github.com/openstack/salt-formula-ceilometer.git'