Merge pull request #50 from smolaon/master
Updated gateway, fix ceilometer
diff --git a/ceilometer/agent/cluster.yml b/ceilometer/agent/cluster.yml
index 283e9d9..d4ec5da 100644
--- a/ceilometer/agent/cluster.yml
+++ b/ceilometer/agent/cluster.yml
@@ -1,6 +1,27 @@
classes:
- service.ceilometer.agent.cluster
parameters:
+ ceilometer:
+ agent:
+ enabled: true
+ version: ${_param:ceilometer_version}
+ secret: ${_param:ceilometer_secret_key}
+ identity:
+ engine: keystone
+ host: ${_param:keystone_service_host}
+ port: 35357
+ tenant: service
+ user: ceilometer
+ password: ${_param:keystone_ceilometer_password}
+ message_queue:
+ engine: rabbitmq
+ host: ${_param:openstack_message_queue_address}
+ port: 5672
+ user: openstack
+ password: ${_param:rabbitmq_openstack_password}
+ virtual_host: '/openstack'
+ ha_queues: true
+ rpc_thread_pool_size: 5
nova:
compute:
notification:
diff --git a/reclass/storage/system/openstack_gateway_cluster.yml b/reclass/storage/system/openstack_gateway_cluster.yml
index 30e04ab..72e31c5 100644
--- a/reclass/storage/system/openstack_gateway_cluster.yml
+++ b/reclass/storage/system/openstack_gateway_cluster.yml
@@ -2,6 +2,11 @@
_param:
openstack_gateway_node01_hostname: gtw01
openstack_gateway_node02_hostname: gtw02
+ openstack_gateway_node03_hostname: gtw03
+
+ openstack_gateway_node01_tenant_address: ${_param:single_address}
+ openstack_gateway_node02_tenant_address: ${_param:single_address}
+ openstack_gateway_node03_tenant_address: ${_param:single_address}
reclass:
storage:
node:
@@ -14,6 +19,7 @@
salt_master_host: ${_param:reclass_config_master}
linux_system_codename: trusty
single_address: ${_param:openstack_gateway_node01_address}
+ tenant_address: ${_param:openstack_gateway_node01_tenant_address}
openstack_gateway_node02:
name: ${_param:openstack_gateway_node02_hostname}
domain: ${_param:cluster_domain}
@@ -23,4 +29,16 @@
salt_master_host: ${_param:reclass_config_master}
linux_system_codename: trusty
single_address: ${_param:openstack_gateway_node02_address}
+ tenant_address: ${_param:openstack_gateway_node02_tenant_address}
+ openstack_gateway_node03:
+ name: ${_param:openstack_gateway_node03_hostname}
+ domain: ${_param:cluster_domain}
+ classes:
+ - cluster.${_param:cluster_name}.openstack.gateway
+ params:
+ salt_master_host: ${_param:reclass_config_master}
+ linux_system_codename: trusty
+ single_address: ${_param:openstack_gateway_node03_address}
+ tenant_address: ${_param:openstack_gateway_node03_tenant_address}
+