aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Polenchuk <mpolenchuk@mirantis.com>2017-09-05 17:35:51 +0400
committerMichael Polenchuk <mpolenchuk@mirantis.com>2017-09-05 18:20:56 +0400
commit5199ba88afc4f115b947a51080fc89ea70e5a1e8 (patch)
treee86320c57df2180b13eedfb37192e622e9f3e34d
parenta1a413ad65c31ebf5dc42924f7ed04ab02a04872 (diff)
[baremetal] Enable ceilometer/aodh services
Change-Id: I34706afbdbcbdaace0b0ae6c2c2e8cb932812d4e Signed-off-by: Michael Polenchuk <mpolenchuk@mirantis.com>
-rwxr-xr-xmcp/config/states/openstack_ha5
-rw-r--r--mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/infra/config.yml20
-rw-r--r--mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/infra/kvm.yml24
-rw-r--r--mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/openstack/proxy.yml2
-rw-r--r--mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/openstack/telemetry.yml8
-rw-r--r--mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-dpdk-ha/infra/config.yml20
-rw-r--r--mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-dpdk-ha/infra/kvm.yml24
-rw-r--r--mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-dpdk-ha/openstack/proxy.yml2
-rw-r--r--mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-dpdk-ha/openstack/telemetry.yml8
-rw-r--r--mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/infra/kvm.yml2
-rw-r--r--mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/openstack/proxy.yml2
-rw-r--r--mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/openstack/telemetry.yml8
12 files changed, 77 insertions, 48 deletions
diff --git a/mcp/config/states/openstack_ha b/mcp/config/states/openstack_ha
index fc1fed7e5..e507ec990 100755
--- a/mcp/config/states/openstack_ha
+++ b/mcp/config/states/openstack_ha
@@ -42,6 +42,11 @@ salt -I 'neutron:gateway' state.sls neutron.gateway
salt -I 'nova:compute' state.sls nova
+salt -I 'mongodb:server' state.sls mongodb -b 1
+salt -I 'aodh:server' state.sls aodh
+salt -I 'ceilometer:server' state.sls ceilometer
+salt -I 'ceilometer:agent' state.sls ceilometer
+
salt -I 'horizon:server' state.sls horizon
salt -I 'nginx:server' state.sls nginx
diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/infra/config.yml b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/infra/config.yml
index a7b08f8df..3f72e182f 100644
--- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/infra/config.yml
+++ b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/infra/config.yml
@@ -13,7 +13,7 @@ classes:
- system.reclass.storage.system.openstack_database_cluster
- system.reclass.storage.system.openstack_message_queue_cluster
- system.reclass.storage.system.opendaylight_control_single
-#- system.reclass.storage.system.openstack_telemetry_cluster
+- system.reclass.storage.system.openstack_telemetry_cluster
# - system.reclass.storage.system.stacklight_log_cluster
# - system.reclass.storage.system.stacklight_monitor_cluster
# - system.reclass.storage.system.stacklight_telemetry_cluster
@@ -56,15 +56,15 @@ parameters:
params:
keepalived_vip_priority: 102
linux_system_codename: xenial
-# openstack_telemetry_node01:
-# params:
-# linux_system_codename: xenial
-# openstack_telemetry_node02:
-# params:
-# linux_system_codename: xenial
-# openstack_telemetry_node03:
-# params:
-# linux_system_codename: xenial
+ openstack_telemetry_node01:
+ params:
+ linux_system_codename: xenial
+ openstack_telemetry_node02:
+ params:
+ linux_system_codename: xenial
+ openstack_telemetry_node03:
+ params:
+ linux_system_codename: xenial
openstack_message_queue_node01:
params:
linux_system_codename: xenial
diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/infra/kvm.yml b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/infra/kvm.yml
index f73d48e7a..41366f34f 100644
--- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/infra/kvm.yml
+++ b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/infra/kvm.yml
@@ -11,7 +11,7 @@ classes:
- system.salt.control.cluster.openstack_proxy_cluster
- system.salt.control.cluster.openstack_database_cluster
- system.salt.control.cluster.openstack_message_queue_cluster
-#- system.salt.control.cluster.openstack_telemetry_cluster
+- system.salt.control.cluster.openstack_telemetry_cluster
# - system.salt.control.cluster.stacklight_server_cluster
# - system.salt.control.cluster.stacklight_log_cluster
# - system.salt.control.cluster.stacklight_telemetry_cluster
@@ -45,11 +45,11 @@ parameters:
ram: 2048
disk_profile: small
net_profile: default
-# openstack.telemetry:
-# cpu: 4
-# ram: 4096
-# disk_profile: xxlarge
-# net_profile: default
+ openstack.telemetry:
+ cpu: 2
+ ram: 3072
+ disk_profile: xxlarge
+ net_profile: default
openstack.proxy:
cpu: 2
ram: 2048
@@ -83,12 +83,12 @@ parameters:
provider: ${_param:infra_kvm_node03_hostname}.${_param:cluster_domain}
image: ${_param:salt_control_xenial_image}
size: opendaylight.server
-# mdb01:
-# image: ${_param:salt_control_xenial_image}
-# mdb02:
-# image: ${_param:salt_control_xenial_image}
-# mdb03:
-# image: ${_param:salt_control_xenial_image}
+ mdb01:
+ image: ${_param:salt_control_xenial_image}
+ mdb02:
+ image: ${_param:salt_control_xenial_image}
+ mdb03:
+ image: ${_param:salt_control_xenial_image}
ctl01:
image: ${_param:salt_control_xenial_image}
ctl02:
diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/openstack/proxy.yml b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/openstack/proxy.yml
index 93abf2a67..ee5f63909 100644
--- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/openstack/proxy.yml
+++ b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/openstack/proxy.yml
@@ -6,6 +6,8 @@ classes:
- system.nginx.server.proxy.openstack_api
- system.nginx.server.proxy.openstack_vnc
- system.nginx.server.proxy.openstack_web
+- system.nginx.server.proxy.openstack.aodh
+- system.nginx.server.proxy.openstack.ceilometer
- system.horizon.server.single
- system.salt.minion.cert.proxy
- system.sphinx.server.doc.reclass
diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/openstack/telemetry.yml b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/openstack/telemetry.yml
index 4a56b65b4..4e900908b 100644
--- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/openstack/telemetry.yml
+++ b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/openstack/telemetry.yml
@@ -2,6 +2,8 @@ classes:
- system.linux.system.repo.mcp.openstack
- system.linux.system.repo.mcp.extra
- system.linux.system.repo.saltstack.xenial
+- system.mongodb.server.cluster
+- system.mongodb.server.database.ceilometer
- system.ceilometer.server.backend.mongodb
# - system.ceilometer.server.backend.influxdb
# - system.heka.ceilometer_collector.single
@@ -10,7 +12,7 @@ classes:
- cluster.baremetal-mcp-ocata-odl-ha.infra
parameters:
_param:
- keepalived_vip_interface: ens3
+ keepalived_openstack_telemetry_vip_interface: ens3
keepalived_vip_virtual_router_id: 230
cluster_vip_address: ${_param:openstack_telemetry_address}
cluster_local_address: ${_param:single_address}
@@ -25,3 +27,7 @@ parameters:
interface:
ens2: ${_param:linux_dhcp_interface}
ens3: ${_param:linux_single_interface}
+ mongodb:
+ server:
+ logging:
+ verbose: v
diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-dpdk-ha/infra/config.yml b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-dpdk-ha/infra/config.yml
index be3dc38b6..5ac2277dd 100644
--- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-dpdk-ha/infra/config.yml
+++ b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-dpdk-ha/infra/config.yml
@@ -12,7 +12,7 @@ classes:
- system.reclass.storage.system.openstack_proxy_cluster
- system.reclass.storage.system.openstack_database_cluster
- system.reclass.storage.system.openstack_message_queue_cluster
-#- system.reclass.storage.system.openstack_telemetry_cluster
+- system.reclass.storage.system.openstack_telemetry_cluster
# - system.reclass.storage.system.stacklight_log_cluster
# - system.reclass.storage.system.stacklight_monitor_cluster
# - system.reclass.storage.system.stacklight_telemetry_cluster
@@ -55,15 +55,15 @@ parameters:
params:
keepalived_vip_priority: 102
linux_system_codename: xenial
-# openstack_telemetry_node01:
-# params:
-# linux_system_codename: xenial
-# openstack_telemetry_node02:
-# params:
-# linux_system_codename: xenial
-# openstack_telemetry_node03:
-# params:
-# linux_system_codename: xenial
+ openstack_telemetry_node01:
+ params:
+ linux_system_codename: xenial
+ openstack_telemetry_node02:
+ params:
+ linux_system_codename: xenial
+ openstack_telemetry_node03:
+ params:
+ linux_system_codename: xenial
openstack_message_queue_node01:
params:
linux_system_codename: xenial
diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-dpdk-ha/infra/kvm.yml b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-dpdk-ha/infra/kvm.yml
index a4945e595..22b4a8a21 100644
--- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-dpdk-ha/infra/kvm.yml
+++ b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-dpdk-ha/infra/kvm.yml
@@ -11,7 +11,7 @@ classes:
- system.salt.control.cluster.openstack_proxy_cluster
- system.salt.control.cluster.openstack_database_cluster
- system.salt.control.cluster.openstack_message_queue_cluster
-#- system.salt.control.cluster.openstack_telemetry_cluster
+- system.salt.control.cluster.openstack_telemetry_cluster
# - system.salt.control.cluster.stacklight_server_cluster
# - system.salt.control.cluster.stacklight_log_cluster
# - system.salt.control.cluster.stacklight_telemetry_cluster
@@ -45,11 +45,11 @@ parameters:
ram: 2048
disk_profile: small
net_profile: default
-# openstack.telemetry:
-# cpu: 4
-# ram: 4096
-# disk_profile: xxlarge
-# net_profile: default
+ openstack.telemetry:
+ cpu: 2
+ ram: 3072
+ disk_profile: xxlarge
+ net_profile: default
openstack.proxy:
cpu: 2
ram: 2048
@@ -73,12 +73,12 @@ parameters:
cluster:
internal:
node:
-# mdb01:
-# image: ${_param:salt_control_xenial_image}
-# mdb02:
-# image: ${_param:salt_control_xenial_image}
-# mdb03:
-# image: ${_param:salt_control_xenial_image}
+ mdb01:
+ image: ${_param:salt_control_xenial_image}
+ mdb02:
+ image: ${_param:salt_control_xenial_image}
+ mdb03:
+ image: ${_param:salt_control_xenial_image}
ctl01:
image: ${_param:salt_control_xenial_image}
ctl02:
diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-dpdk-ha/openstack/proxy.yml b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-dpdk-ha/openstack/proxy.yml
index d6a26b0c7..14fb3ab6d 100644
--- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-dpdk-ha/openstack/proxy.yml
+++ b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-dpdk-ha/openstack/proxy.yml
@@ -6,6 +6,8 @@ classes:
- system.nginx.server.proxy.openstack_api
- system.nginx.server.proxy.openstack_vnc
- system.nginx.server.proxy.openstack_web
+- system.nginx.server.proxy.openstack.aodh
+- system.nginx.server.proxy.openstack.ceilometer
- system.horizon.server.single
- system.salt.minion.cert.proxy
- system.sphinx.server.doc.reclass
diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-dpdk-ha/openstack/telemetry.yml b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-dpdk-ha/openstack/telemetry.yml
index 28932947c..b2e49cb7e 100644
--- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-dpdk-ha/openstack/telemetry.yml
+++ b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-dpdk-ha/openstack/telemetry.yml
@@ -2,6 +2,8 @@ classes:
- system.linux.system.repo.mcp.openstack
- system.linux.system.repo.mcp.extra
- system.linux.system.repo.saltstack.xenial
+- system.mongodb.server.cluster
+- system.mongodb.server.database.ceilometer
- system.ceilometer.server.backend.mongodb
# - system.ceilometer.server.backend.influxdb
# - system.heka.ceilometer_collector.single
@@ -10,7 +12,7 @@ classes:
- cluster.baremetal-mcp-ocata-ovs-dpdk-ha.infra
parameters:
_param:
- keepalived_vip_interface: ens3
+ keepalived_openstack_telemetry_vip_interface: ens3
keepalived_vip_virtual_router_id: 230
cluster_vip_address: ${_param:openstack_telemetry_address}
cluster_local_address: ${_param:single_address}
@@ -25,3 +27,7 @@ parameters:
interface:
ens2: ${_param:linux_dhcp_interface}
ens3: ${_param:linux_single_interface}
+ mongodb:
+ server:
+ logging:
+ verbose: v
diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/infra/kvm.yml b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/infra/kvm.yml
index d919fe707..5c8026f26 100644
--- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/infra/kvm.yml
+++ b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/infra/kvm.yml
@@ -47,7 +47,7 @@ parameters:
net_profile: default
openstack.telemetry:
cpu: 2
- ram: 4096
+ ram: 3072
disk_profile: xxlarge
net_profile: default
openstack.proxy:
diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/openstack/proxy.yml b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/openstack/proxy.yml
index 2147741f2..30f2c46c4 100644
--- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/openstack/proxy.yml
+++ b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/openstack/proxy.yml
@@ -6,6 +6,8 @@ classes:
- system.nginx.server.proxy.openstack_api
- system.nginx.server.proxy.openstack_vnc
- system.nginx.server.proxy.openstack_web
+- system.nginx.server.proxy.openstack.aodh
+- system.nginx.server.proxy.openstack.ceilometer
- system.horizon.server.single
- system.salt.minion.cert.proxy
- system.sphinx.server.doc.reclass
diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/openstack/telemetry.yml b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/openstack/telemetry.yml
index 505ee7ff6..0e3c7bdae 100644
--- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/openstack/telemetry.yml
+++ b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/openstack/telemetry.yml
@@ -2,6 +2,8 @@ classes:
- system.linux.system.repo.mcp.openstack
- system.linux.system.repo.mcp.extra
- system.linux.system.repo.saltstack.xenial
+- system.mongodb.server.cluster
+- system.mongodb.server.database.ceilometer
- system.ceilometer.server.backend.mongodb
# - system.ceilometer.server.backend.influxdb
# - system.heka.ceilometer_collector.single
@@ -10,7 +12,7 @@ classes:
- cluster.baremetal-mcp-ocata-ovs-ha.infra
parameters:
_param:
- keepalived_vip_interface: ens3
+ keepalived_openstack_telemetry_vip_interface: ens3
keepalived_vip_virtual_router_id: 230
cluster_vip_address: ${_param:openstack_telemetry_address}
cluster_local_address: ${_param:single_address}
@@ -25,3 +27,7 @@ parameters:
interface:
ens2: ${_param:linux_dhcp_interface}
ens3: ${_param:linux_single_interface}
+ mongodb:
+ server:
+ logging:
+ verbose: v