[ha] Bring in gnocchi/panko services

JIRA: FUEL-372
Change-Id: I9083898f0179649d855750d48f3f9bc79caba50c
Signed-off-by: Michael Polenchuk <mpolenchuk@mirantis.com>

diff --git a/mcp/config/states/openstack_ha b/mcp/config/states/openstack_ha
index 77063d6..a30f9af 100755 (executable)
--- a/mcp/config/states/openstack_ha
+++ b/mcp/config/states/openstack_ha
@@ -53,11 +53,10 @@ salt -I 'neutron:gateway' state.sls neutron.gateway
 
 salt -I 'nova:compute' state.sls nova
 
-salt -C 'I@mongodb:server and *01*' state.sls mongodb || true
-wait_for 10.0 "salt -C 'I@mongodb:server and *01*' cmd.run 'mongo localhost:27017/admin'"
-salt -C 'I@mongodb:server and *01*' cmd.run 'mongo localhost:27017/admin --eval "rs.initiate()"'
-salt -I 'mongodb:server' state.sls mongodb
-
+salt -I 'redis:cluster:role:master' state.sls redis
+salt -I 'redis:server' state.sls redis
+salt -I 'gnocchi:server' state.sls gnocchi -b 1
+salt -I 'panko:server' state.sls panko -b 1
 salt -I 'aodh:server' state.sls aodh -b 1
 salt -I 'ceilometer:server' state.sls ceilometer
 salt -I 'ceilometer:agent' state.sls ceilometer

diff --git a/mcp/reclass/classes/cluster/mcp-pike-common-ha/infra/config.yml b/mcp/reclass/classes/cluster/mcp-pike-common-ha/infra/config.yml
index bd75e7b..525abbe 100644 (file)
--- a/mcp/reclass/classes/cluster/mcp-pike-common-ha/infra/config.yml
+++ b/mcp/reclass/classes/cluster/mcp-pike-common-ha/infra/config.yml
@@ -87,12 +87,18 @@ parameters:
         openstack_telemetry_node01:
           params:
             linux_system_codename: xenial
+            # create resources only from 1 controller
+            # to prevent race conditions
+            ceilometer_create_gnocchi_resources: true
+            redis_cluster_role: 'master'
         openstack_telemetry_node02:
           params:
             linux_system_codename: xenial
+            redis_cluster_role: 'slave'
         openstack_telemetry_node03:
           params:
             linux_system_codename: xenial
+            redis_cluster_role: 'slave'
         openstack_message_queue_node01:
           params:
             linux_system_codename: xenial

diff --git a/mcp/reclass/classes/cluster/mcp-pike-common-ha/openstack_compute.yml b/mcp/reclass/classes/cluster/mcp-pike-common-ha/openstack_compute.yml
index 24acbac..c9bba93 100644 (file)
--- a/mcp/reclass/classes/cluster/mcp-pike-common-ha/openstack_compute.yml
+++ b/mcp/reclass/classes/cluster/mcp-pike-common-ha/openstack_compute.yml
@@ -16,6 +16,7 @@ classes:
   - system.cinder.volume.single
   - system.cinder.volume.backend.lvm
   - system.ceilometer.agent.cluster
+  - system.ceilometer.agent.polling.default
   - cluster.mcp-pike-common-ha.openstack_compute_pdf
   - cluster.mcp-pike-common-ha.include.maas_proxy
   - cluster.mcp-pike-common-ha.include.lab_proxy_pdf

diff --git a/mcp/reclass/classes/cluster/mcp-pike-common-ha/openstack_control_init.yml b/mcp/reclass/classes/cluster/mcp-pike-common-ha/openstack_control_init.yml
index e3517b1..d348922 100644 (file)
--- a/mcp/reclass/classes/cluster/mcp-pike-common-ha/openstack_control_init.yml
+++ b/mcp/reclass/classes/cluster/mcp-pike-common-ha/openstack_control_init.yml
@@ -14,3 +14,5 @@ classes:
   - system.keystone.client.service.nova-placement
   - system.keystone.client.service.cinder3
   - system.keystone.client.service.designate
+  - system.keystone.client.service.gnocchi
+  - system.keystone.client.service.panko

diff --git a/mcp/reclass/classes/cluster/mcp-pike-common-ha/openstack_database.yml b/mcp/reclass/classes/cluster/mcp-pike-common-ha/openstack_database.yml
index 221c84f..e65fc24 100644 (file)
--- a/mcp/reclass/classes/cluster/mcp-pike-common-ha/openstack_database.yml
+++ b/mcp/reclass/classes/cluster/mcp-pike-common-ha/openstack_database.yml
@@ -14,11 +14,13 @@ classes:
   - system.galera.server.database.cinder
   - system.galera.server.database.designate
   - system.galera.server.database.glance
+  - system.galera.server.database.gnocchi
   - system.galera.server.database.grafana
   - system.galera.server.database.heat
   - system.galera.server.database.keystone
   - system.galera.server.database.nova
   - system.galera.server.database.neutron
+  - system.galera.server.database.panko
 parameters:
   _param:
     keepalived_vip_interface: ${_param:single_nic}

diff --git a/mcp/reclass/classes/cluster/mcp-pike-common-ha/openstack_init.yml.j2 b/mcp/reclass/classes/cluster/mcp-pike-common-ha/openstack_init.yml.j2
index 5928435..796bbb1 100644 (file)
--- a/mcp/reclass/classes/cluster/mcp-pike-common-ha/openstack_init.yml.j2
+++ b/mcp/reclass/classes/cluster/mcp-pike-common-ha/openstack_init.yml.j2
@@ -201,13 +201,20 @@ parameters:
     horizon_identity_host: ${_param:openstack_control_address}
     horizon_identity_encryption: none
     horizon_identity_version: 3
-    mongodb_server_replica_set: ceilometer
-    mongodb_ceilometer_password: opnfv_secret
-    mongodb_admin_password: opnfv_secret
-    mongodb_shared_key: eoTh1AwahlahqueingeejooLughah4tei9feing0eeVaephooDi2li1TaeV1ooth
     metadata_password: opnfv_secret
     openstack_telemetry_keepalived_password: opnfv_secret
     aodh_service_host: ${_param:openstack_telemetry_address}
+    gnocchi_version: 4.0
+    gnocchi_service_host: ${_param:openstack_telemetry_address}
+    mysql_gnocchi_password: opnfv_secret
+    keystone_gnocchi_password: opnfv_secret
+    panko_version: ${_param:openstack_version}
+    panko_service_host: ${_param:openstack_telemetry_address}
+    mysql_panko_password: opnfv_secret
+    keystone_panko_password: opnfv_secret
+    ceilometer_agent_default_polling_interval: 180
+    ceilometer_agent_default_polling_meters:
+      - "*"
     designate_service_host: ${_param:openstack_control_address}
     designate_bind9_rndc_key: 4pc+X4PDqb2q+5o72dISm72LM1Ds9X2EYZjqg+nmsS7FhdTwzFFY8l/iEDmHxnyjkA33EQC8H+z0fLLBunoitw==
     designate_domain_id: 5186883b-91fb-4891-bd49-e6769234a8fc

diff --git a/mcp/reclass/classes/cluster/mcp-pike-common-ha/openstack_telemetry.yml b/mcp/reclass/classes/cluster/mcp-pike-common-ha/openstack_telemetry.yml
index 17af1b3..bf0dc0b 100644 (file)
--- a/mcp/reclass/classes/cluster/mcp-pike-common-ha/openstack_telemetry.yml
+++ b/mcp/reclass/classes/cluster/mcp-pike-common-ha/openstack_telemetry.yml
@@ -8,13 +8,21 @@
 ---
 classes:
   - system.linux.system.repo.mcp.openstack
-  - system.mongodb.server.cluster
-  - system.mongodb.server.database.ceilometer
-  - system.ceilometer.server.backend.mongodb
-  # - system.ceilometer.server.backend.influxdb
-  # - system.heka.ceilometer_collector.single
+  - service.redis.server.single
   - system.ceilometer.server.cluster
+  - system.ceilometer.server.coordination.redis
+  - system.ceilometer.server.backend.default
   - system.aodh.server.cluster
+  - system.aodh.server.coordination.redis
+  - system.memcached.server.single
+  - system.apache.server.single
+  - system.apache.server.site.gnocchi
+  - system.apache.server.site.panko
+  - system.gnocchi.server.cluster
+  - system.gnocchi.common.storage.incoming.redis
+  - system.gnocchi.common.storage.redis
+  - system.gnocchi.common.coordination.redis
+  - system.panko.server.cluster
 parameters:
   _param:
     keepalived_openstack_telemetry_vip_interface: ${_param:single_nic}
@@ -27,7 +35,53 @@ parameters:
     cluster_node02_address: ${_param:openstack_telemetry_node02_address}
     cluster_node03_hostname: ${_param:openstack_telemetry_node03_hostname}
     cluster_node03_address: ${_param:openstack_telemetry_node03_address}
-  mongodb:
+    redis_sentinel_node01_address: ${_param:openstack_telemetry_node01_address}
+    redis_sentinel_node02_address: ${_param:openstack_telemetry_node02_address}
+    redis_sentinel_node03_address: ${_param:openstack_telemetry_node03_address}
+    # yamllint disable-line rule:line-length
+    openstack_telemetry_redis_url: redis://${_param:redis_sentinel_node01_address}:26379?sentinel=master_1&sentinel_fallback=${_param:redis_sentinel_node02_address}:26379&sentinel_fallback=${_param:redis_sentinel_node03_address}:26379
+    gnocchi_coordination_url: ${_param:openstack_telemetry_redis_url}
+    gnocchi_storage_incoming_redis_url: ${_param:openstack_telemetry_redis_url}
+  redis:
     server:
-      logging:
-        verbose: v
+      version: 3.0
+      appendfsync: 'no'
+      bind:
+        address: ${_param:single_address}
+    cluster:
+      enabled: true
+      mode: sentinel
+      role: ${_param:redis_cluster_role}
+      quorum: 2
+      master:
+        host: ${_param:cluster_node01_address}
+        port: 6379
+      sentinel:
+        address: ${_param:single_address}
+  gnocchi:
+    common:
+      database:
+        host: ${_param:openstack_database_address}
+    server:
+      pkgs:
+        - gnocchi-api
+        - gnocchi-metricd
+        - python-memcache
+  apache:
+    server:
+      ~modules:
+        - wsgi
+        - rewrite
+      site:
+        gnocchi:
+          wsgi:
+            threads: 1
+  aodh:
+    server:
+      coordination_backend:
+        url: ${_param:openstack_telemetry_redis_url}
+  ceilometer:
+    server:
+      ~database: ~
+      coordination_backend:
+        url: ${_param:openstack_telemetry_redis_url}