Merge pull request #168 from Mirantis/designate
add designate
diff --git a/ceilometer/server/cluster.yml b/ceilometer/server/cluster.yml
index 005379d..2b2030c 100644
--- a/ceilometer/server/cluster.yml
+++ b/ceilometer/server/cluster.yml
@@ -8,6 +8,7 @@
server:
enabled: true
version: ${_param:ceilometer_version}
+ region: ${_param: openstack_region}
cluster: true
secret: ${_param:ceilometer_secret_key}
ttl: 86400
diff --git a/grafana/server/plugin/piechart.yml b/grafana/server/plugin/piechart.yml
new file mode 100644
index 0000000..090872c
--- /dev/null
+++ b/grafana/server/plugin/piechart.yml
@@ -0,0 +1,6 @@
+parameters:
+ grafana:
+ server:
+ plugins:
+ grafana-piechart-panel:
+ enabled: true
diff --git a/heka/ceilometer_collector/output/sensu.yml b/heka/ceilometer_collector/output/sensu.yml
new file mode 100644
index 0000000..56dee92
--- /dev/null
+++ b/heka/ceilometer_collector/output/sensu.yml
@@ -0,0 +1,3 @@
+classes:
+- service.heka.ceilometer_collector.output.sensu
+
diff --git a/heka/log_collector/output/sensu.yml b/heka/log_collector/output/sensu.yml
new file mode 100644
index 0000000..e7bf79d
--- /dev/null
+++ b/heka/log_collector/output/sensu.yml
@@ -0,0 +1,3 @@
+classes:
+- service.heka.log_collector.output.sensu
+
diff --git a/heka/metric_collector/output/sensu.yml b/heka/metric_collector/output/sensu.yml
new file mode 100644
index 0000000..3143fd9
--- /dev/null
+++ b/heka/metric_collector/output/sensu.yml
@@ -0,0 +1,3 @@
+classes:
+- service.heka.metric_collector.output.sensu
+
diff --git a/heka/remote_collector/output/sensu.yml b/heka/remote_collector/output/sensu.yml
new file mode 100644
index 0000000..c7c66e9
--- /dev/null
+++ b/heka/remote_collector/output/sensu.yml
@@ -0,0 +1,3 @@
+classes:
+- service.heka.remote_collector.output.sensu
+
diff --git a/opencontrail/client/resource/analytics_node.yml b/opencontrail/client/resource/analytics_node.yml
new file mode 100644
index 0000000..424c88a
--- /dev/null
+++ b/opencontrail/client/resource/analytics_node.yml
@@ -0,0 +1,17 @@
+parameters:
+ _param:
+ opencontrail_analytics_node01_hostname: nal01
+ opencontrail_analytics_node02_hostname: nal02
+ opencontrail_analytics_node03_hostname: nal03
+ opencontrail:
+ client:
+ analytics_node:
+ member01:
+ name: ${_param:opencontrail_analytics_node01_hostname}
+ ip_address: ${_param:cluster_node01_address}
+ member02:
+ name: ${_param:opencontrail_analytics_node02_hostname}
+ ip_address: ${_param:cluster_node02_address}
+ member03:
+ name: ${_param:opencontrail_analytics_node03_hostname}
+ ip_address: ${_param:cluster_node03_address}
diff --git a/opencontrail/client/resource/config_node.yml b/opencontrail/client/resource/config_node.yml
new file mode 100644
index 0000000..2e6802c
--- /dev/null
+++ b/opencontrail/client/resource/config_node.yml
@@ -0,0 +1,17 @@
+parameters:
+ _param:
+ opencontrail_control_node01_hostname: ntw01
+ opencontrail_control_node02_hostname: ntw02
+ opencontrail_control_node03_hostname: ntw03
+ opencontrail:
+ client:
+ config_node:
+ member01:
+ name: ${_param:opencontrail_control_node01_hostname}
+ ip_address: ${_param:cluster_node01_address}
+ member02:
+ name: ${_param:opencontrail_control_node02_hostname}
+ ip_address: ${_param:cluster_node02_address}
+ member03:
+ name: ${_param:opencontrail_control_node03_hostname}
+ ip_address: ${_param:cluster_node03_address}
diff --git a/opencontrail/client/resource/database_node.yml b/opencontrail/client/resource/database_node.yml
new file mode 100644
index 0000000..508dff0
--- /dev/null
+++ b/opencontrail/client/resource/database_node.yml
@@ -0,0 +1,17 @@
+parameters:
+ _param:
+ opencontrail_control_node01_hostname: ntw01
+ opencontrail_control_node02_hostname: ntw02
+ opencontrail_control_node03_hostname: ntw03
+ opencontrail:
+ client:
+ database_node:
+ member01:
+ name: ${_param:opencontrail_control_node01_hostname}
+ ip_address: ${_param:cluster_node01_address}
+ member02:
+ name: ${_param:opencontrail_control_node02_hostname}
+ ip_address: ${_param:cluster_node02_address}
+ member03:
+ name: ${_param:opencontrail_control_node03_hostname}
+ ip_address: ${_param:cluster_node03_address}
diff --git a/opencontrail/client/resource/virtual_router.yml b/opencontrail/client/resource/virtual_router.yml
new file mode 100644
index 0000000..0333c8f
--- /dev/null
+++ b/opencontrail/client/resource/virtual_router.yml
@@ -0,0 +1,10 @@
+parameters:
+ _param:
+ contrail_compute_dpdk_enabled: False
+ opencontrail:
+ client:
+ virtual_router:
+ local_compute:
+ name: ${linux:system:name}
+ ip_address: ${_param:single_address}
+ dpdk_enabled: ${_param:contrail_compute_dpdk_enabled}
\ No newline at end of file
diff --git a/opencontrail/client/single.yml b/opencontrail/client/single.yml
new file mode 100644
index 0000000..4f92c86
--- /dev/null
+++ b/opencontrail/client/single.yml
@@ -0,0 +1,11 @@
+parameters:
+ opencontrail:
+ client:
+ identity:
+ user: admin
+ project: admin
+ password: ${_param:keystone_admin_password}
+ host: ${_param:openstack_control_address}
+ config:
+ host: ${_param:opencontrail_control_address}
+ port: 8082
diff --git a/opencontrail/compute/dpdk.yml b/opencontrail/compute/dpdk.yml
index 47464b6..b0d8e0c 100644
--- a/opencontrail/compute/dpdk.yml
+++ b/opencontrail/compute/dpdk.yml
@@ -1,11 +1,13 @@
parameters:
+ _param:
+ contrail_compute_dpdk_enabled: True
nova:
compute:
libvirt_service: libvirt-bin
opencontrail:
compute:
dpdk:
- enabled: true
+ enabled: ${_param:contrail_compute_dpdk_enabled}
taskset: "${_param:compute_vrouter_taskset}"
socket_mem: "${_param:compute_vrouter_socket_mem}"
interface: