Merge "[noha] Bring in gnocchi/panko services"

5 files changed, 45 insertions, 12 deletions

diff --git a/mcp/config/states/openstack_noha b/mcp/config/states/openstack_noha
index 4c8cbcf8a..a266989a7 100755
--- a/mcp/config/states/openstack_noha
+++ b/mcp/config/states/openstack_noha
@@ -46,7 +46,9 @@ salt -I 'neutron:compute' state.sls neutron
 
 salt -I 'nova:compute' state.sls nova
 
-wait_for 3 "salt -I 'mongodb:server' state.sls mongodb"
+salt -I 'redis:server' state.sls redis
+salt -I 'gnocchi:server' state.sls gnocchi
+salt -I 'panko:server' state.sls panko
 salt -I 'aodh:server' state.sls aodh
 salt -I 'ceilometer:server' state.sls ceilometer
 salt -I 'ceilometer:agent' state.sls ceilometer
diff --git a/mcp/reclass/classes/cluster/mcp-pike-common-noha/openstack_compute.yml b/mcp/reclass/classes/cluster/mcp-pike-common-noha/openstack_compute.yml
index 3d84e6c18..8b6a74d7a 100644
--- a/mcp/reclass/classes/cluster/mcp-pike-common-noha/openstack_compute.yml
+++ b/mcp/reclass/classes/cluster/mcp-pike-common-noha/openstack_compute.yml
@@ -14,6 +14,7 @@ classes:
   - system.ceilometer.agent.cluster
   - system.ceilometer.client.nova_compute
   - system.ceilometer.client.cinder_volume
+  - system.ceilometer.agent.polling.default
   - system.linux.system.repo.mcp.openstack
   - cluster.mcp-pike-common-noha.openstack_compute_pdf
 parameters:
diff --git a/mcp/reclass/classes/cluster/mcp-pike-common-noha/openstack_control.yml b/mcp/reclass/classes/cluster/mcp-pike-common-noha/openstack_control.yml
index c77fc9ba3..29b2d627e 100644
--- a/mcp/reclass/classes/cluster/mcp-pike-common-noha/openstack_control.yml
+++ b/mcp/reclass/classes/cluster/mcp-pike-common-noha/openstack_control.yml
@@ -10,8 +10,6 @@ classes:
   - system.linux.system.lowmem
   - system.linux.system.repo.mcp.openstack
   - service.nfs.server
-  - system.mongodb.server.single
-  - system.mongodb.server.database.ceilometer
   - system.ceilometer.client
   - system.ceilometer.client.neutron
   - system.memcached.server.single
@@ -25,6 +23,8 @@ classes:
   - system.keystone.client.service.cinder3
   - system.keystone.client.service.ceilometer
   - system.keystone.client.service.aodh
+  - system.keystone.client.service.gnocchi
+  - system.keystone.client.service.panko
   - system.glance.control.single
   - system.nova.control.single
   - system.cinder.control.single
@@ -39,8 +39,21 @@ classes:
   - system.galera.server.database.nova
   - system.galera.server.database.ceilometer
   - system.galera.server.database.aodh
+  - system.galera.server.database.gnocchi
+  - system.galera.server.database.panko
+  - service.redis.server.single
   - service.ceilometer.server.single
+  - system.ceilometer.server.coordination.redis
+  - system.ceilometer.server.backend.default
   - system.aodh.server.single
+  - system.aodh.server.coordination.redis
+  - system.gnocchi.server.single
+  - system.gnocchi.common.storage.incoming.redis
+  - system.gnocchi.common.storage.redis
+  - system.gnocchi.common.coordination.redis
+  - service.panko.server.single
+  - system.apache.server.site.gnocchi
+  - system.apache.server.site.panko
   - system.horizon.server.single
   - service.haproxy.proxy.single
   - cluster.mcp-pike-common-noha.haproxy_openstack_api
@@ -48,6 +61,7 @@ classes:
 parameters:
   _param:
     linux_system_codename: xenial
+    ceilometer_create_gnocchi_resources: 'True'
   linux:
     system:
       package:
@@ -104,12 +118,15 @@ parameters:
       thread_cache_size: 12
       query_cache_limit: 2
       query_cache_size: 0
-  mongodb:
+  ceilometer:
     server:
+      ~database: ~
+  redis:
+    server:
+      version: 3.0
+      appendfsync: 'no'
       bind:
-        address: ${_param:cluster_local_address},127.0.0.1
-      logging:
-        verbose: v
+        address: ${_param:single_address}
   nfs:
     server:
       share:
@@ -126,3 +143,9 @@ parameters:
     server:
       vlan_aware_vms: true
       root_helper_daemon: false
+  apache:
+    server:
+      site:
+        gnocchi:
+          wsgi:
+            threads: 1
diff --git a/mcp/reclass/classes/cluster/mcp-pike-common-noha/openstack_init.yml b/mcp/reclass/classes/cluster/mcp-pike-common-noha/openstack_init.yml
index bc9f8fb07..ff99b9b42 100644
--- a/mcp/reclass/classes/cluster/mcp-pike-common-noha/openstack_init.yml
+++ b/mcp/reclass/classes/cluster/mcp-pike-common-noha/openstack_init.yml
@@ -84,13 +84,20 @@ parameters:
     horizon_identity_host: ${_param:cluster_vip_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
     aodh_version: ${_param:openstack_version}
     keystone_aodh_password: opnfv_secret
     aodh_service_host: ${_param:cluster_local_address}
+    gnocchi_version: 4.0
+    gnocchi_service_host: ${_param:cluster_local_address}
+    mysql_gnocchi_password: opnfv_secret
+    keystone_gnocchi_password: opnfv_secret
+    panko_version: ${_param:openstack_version}
+    panko_service_host: ${_param:cluster_local_address}
+    mysql_panko_password: opnfv_secret
+    keystone_panko_password: opnfv_secret
+    ceilometer_agent_default_polling_interval: 180
+    ceilometer_agent_default_polling_meters:
+      - "*"
   linux:
     system:
       kernel:
diff --git a/mcp/scripts/salt.sh b/mcp/scripts/salt.sh
index aecfecea4..2224d660a 100755
--- a/mcp/scripts/salt.sh
+++ b/mcp/scripts/salt.sh
@@ -82,7 +82,7 @@ ssh ${SSH_OPTS} "${SSH_SALT}" bash -s -e << SALT_INSTALL_END
   OLD_DOMAIN=\$(grep -sPzo "id: cfg01\.\K(\S*)" /etc/salt/minion.d/minion.conf) || true
   BOOTSTRAP_SALTSTACK_OPTS=" -r -dX stable 2016.11 " \
     MASTER_HOSTNAME=cfg01.${CLUSTER_DOMAIN} DISTRIB_REVISION=nightly \
-      EXTRA_FORMULAS="nfs" \
+      EXTRA_FORMULAS="nfs panko gnocchi" \
         ./salt-master-init.sh
   salt-key -Ay