From: Narinder Gupta <narinder.gupta@canonical.com>
Date: Thu, 29 Mar 2018 14:00:46 +0000 (-0500)
Subject: modified to use gnocchi charm
X-Git-Tag: opnfv-6.0.0~3
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=refs%2Fchanges%2F11%2F54611%2F1;p=joid.git

modified to use gnocchi charm

Change-Id: I419660ffce7840a372260e75f37631c3c879e19a
Signed-off-by: Narinder Gupta <narinder.gupta@canonical.com>
---

diff --git a/ci/config_tpl/juju2/bundle_tpl/ceilometer.yaml b/ci/config_tpl/juju2/bundle_tpl/ceilometer.yaml
index 49bd4f7d..33bbbd8a 100644
--- a/ci/config_tpl/juju2/bundle_tpl/ceilometer.yaml
+++ b/ci/config_tpl/juju2/bundle_tpl/ceilometer.yaml
@@ -1,7 +1,17 @@
-    mongodb:
-      charm: ./{{ ubuntu.release }}/mongodb
+    gnocchi:
+      charm: ./{{ ubuntu.release }}/gnocchi
+      num_units: 1
+{% if os.service.bindings %}
+      bindings:
+        "": *internal-space
+{% endif %}
+      options:
+        openstack-origin: *openstack-origin
+      to:
+        - "lxd:nodes/0"
+    memcached:
+      charm: ./{{ ubuntu.release }}/memcached
       num_units: 1
-      constraints: *oam-space-constr
 {% if os.service.bindings %}
       bindings:
         "": *internal-space
diff --git a/ci/config_tpl/juju2/bundle_tpl/relations.yaml b/ci/config_tpl/juju2/bundle_tpl/relations.yaml
index 2ed75e67..9fd234ff 100644
--- a/ci/config_tpl/juju2/bundle_tpl/relations.yaml
+++ b/ci/config_tpl/juju2/bundle_tpl/relations.yaml
@@ -5,10 +5,15 @@
     - [ 'nova-cloud-controller:quantum-network-service', 'neutron-gateway:quantum-network-service' ]
     - [ 'ceilometer:amqp', 'rabbitmq-server:amqp' ]
     - [ 'ceilometer-agent:ceilometer-service', 'ceilometer:ceilometer-service' ]
-    - [ 'ceilometer:identity-service', 'keystone:identity-service' ]
     - [ 'ceilometer:identity-notifications', 'keystone:identity-notifications' ]
     - [ 'ceilometer-agent:nova-ceilometer', 'nova-compute:nova-ceilometer' ]
-    - [ 'ceilometer:shared-db', 'mongodb:database' ]
+    - [ 'gnocchi:storage-ceph', 'ceph-mon:client' ]
+    - [ 'gnocchi:shared-db', 'mysql:shared-db' ]
+    - [ 'gnocchi:amqp', 'rabbitmq-server:amqp' ]
+    - [ 'gnocchi:coordinator-memcached', 'memcached:cache' ]
+    - [ 'gnocchi:metric-service', 'ceilometer:metric-service' ]
+    - [ 'gnocchi:identity-service', 'keystone:identity-service' ]
+    - [ 'ceilometer:identity-credentials', 'keystone:identity-credentials' ]
 {% endif %}
     - [ 'heat:shared-db', 'mysql:shared-db' ]
     - [ 'heat:identity-service', 'keystone:identity-service' ]
diff --git a/ci/nosdn/fetch-charms.sh b/ci/nosdn/fetch-charms.sh
index 2bf78313..a38518fe 100755
--- a/ci/nosdn/fetch-charms.sh
+++ b/ci/nosdn/fetch-charms.sh
@@ -34,8 +34,9 @@ git clone -b stable/18.02 https://github.com/openstack/charm-heat.git $distro/he
 git clone -b stable/18.02 https://github.com/openstack/charm-lxd.git $distro/lxd
 git clone https://github.com/openbaton/juju-charm.git $distro/openbaton
 
+charm pull cs:memcached $distro/memcached
+charm pull cs:gnocchi $distro/gnocchi
 charm pull cs:$distro/aodh $distro/aodh
-charm pull cs:$distro/mongodb $distro/mongodb
 charm pull cs:ntp $distro/ntp
 charm pull cs:$distro/haproxy $distro/haproxy
 charm pull cs:~narindergupta/congress-1 $distro/congress