From a0b54fb401bfab0286e261af62eebdd499f05693 Mon Sep 17 00:00:00 2001
From: Giuseppe Attardi <giuseppe.attardi@garr.it>
Date: Fri, 20 Oct 2017 05:02:25 +0200
Subject: [PATCH] Update bundle_template.juju2.yaml

---
 bundles/openstack/bundle_template.juju2.yaml | 470 +++++++++++--------
 1 file changed, 264 insertions(+), 206 deletions(-)

diff --git a/bundles/openstack/bundle_template.juju2.yaml b/bundles/openstack/bundle_template.juju2.yaml
index bdb6e99c..c117369f 100644
--- a/bundles/openstack/bundle_template.juju2.yaml
+++ b/bundles/openstack/bundle_template.juju2.yaml
@@ -1,7 +1,7 @@
 variables:
 
   # sources
-  openstack-origin: &openstack_origin   cloud:xenial-mitaka
+  openstack-origin: &openstack_origin   cloud:xenial-ocata
   series: &series  xenial
 
   # Region settings
@@ -88,25 +88,25 @@ variables:
 
 machines:
   '0':
-    constraints: arch=amd64 tags=STRSITE-neutron-gw
+    constraints: arch=amd64 tags=neutron-gw
     series: *series
   '1':
-    constraints: arch=amd64 tags=STRSITE-controller
+    constraints: arch=amd64 tags=-controller
     series: *series
   '2':
-    constraints: arch=amd64 tags=STRSITE-controller
+    constraints: arch=amd64 tags=controller
     series: *series
   '3':
-    constraints: arch=amd64 tags=STRSITE-compute
+    constraints: arch=amd64 tags=compute
     series: *series
   '4':
-    constraints: arch=amd64 tags=STRSITE-compute
+    constraints: arch=amd64 tags=compute
     series: *series
 
 
 services:
-  ctrl-host-STRSITE:
-    charm: cs:xenial/ubuntu
+  ctrl-host:
+    charm: cs:ubuntu
     num_units: 3
     to:
       - '1'
@@ -114,8 +114,8 @@ services:
     annotations:
       gui-x: '2000'
       gui-y: '0'
-  compute-host-STRSITE:
-    charm: cs:xenial/ubuntu
+  compute-host:
+    charm: cs:ubuntu
     num_units: 2
     bindings:
       "": *network_space_default
@@ -125,30 +125,33 @@ services:
     annotations:
       gui-x: '2000'
       gui-y: '500'
-  network-host-STRSITE:
-    charm: cs:xenial/ubuntu
+  network-host:
+    charm: cs:ubuntu
     num_units: 1
     to:
       - '0'
     annotations:
       gui-x: '2000'
       gui-y: '800'
-  ntp-STRSITE:
-    charm: cs:xenial/ntp
+  ntp:
+    charm: cs:ntp
     options:
         source: *source_ntp
     annotations:
       gui-x: '2200'
       gui-y: '500'
-  defaultgw-STRSITE:
+
+  defaultgw:
     charm: cs:~csd-garr/defaultgw
     options:
       gateway: *default_gw_pub
     annotations:
       gui-x: '800'
       gui-y: '0'
-  ceph-radosgw-hacluster-STRSITE:
-    charm: cs:xenial/hacluster
+
+  ceph-radosgw-hacluster:
+    charm: cs:hacluster
+    series: *series
     bindings:
       "": *network_space_os_mgmt
     options:
@@ -159,8 +162,10 @@ services:
     annotations:
       gui-x: '1000'
       gui-y: '-200'
-  cinder-hacluster-STRSITE:
-    charm: cs:xenial/hacluster
+
+  cinder-hacluster:
+    charm: cs:hacluster
+    series: *series
     bindings:
       "": *network_space_os_mgmt
     options:
@@ -171,8 +176,10 @@ services:
     annotations:
       gui-x: '1250'
       gui-y: '350'
-  controller-hacluster-STRSITE:
-    charm: cs:xenial/hacluster
+
+  controller-hacluster:
+    charm: cs:hacluster
+    series: *series
     bindings:
       "": *network_space_os_mgmt
     options:
@@ -183,8 +190,10 @@ services:
     annotations:
       gui-x: '-200'
       gui-y: '500'
-  glance-hacluster-STRSITE:
-    charm: cs:xenial/hacluster
+
+  glance-hacluster:
+    charm: cs:hacluster
+    series: *series
     bindings:
       "": *network_space_os_mgmt
     options:
@@ -195,8 +204,10 @@ services:
     annotations:
       gui-x: '1200'
       gui-y: '600'
-  horizon-hacluster-STRSITE:
-    charm: cs:xenial/hacluster
+
+  horizon-hacluster:
+    charm: cs:hacluster
+    series: *series
     bindings:
       "": *network_space_os_mgmt
     options:
@@ -207,8 +218,10 @@ services:
     annotations:
       gui-x: '250'
       gui-y: '50'
-  keystone-hacluster-STRSITE:
-    charm: cs:xenial/hacluster
+
+  keystone-hacluster:
+    charm: cs:hacluster
+    series: *series
     bindings:
       "": *network_space_os_mgmt
     options:
@@ -219,8 +232,10 @@ services:
     annotations:
       gui-x: '350'
       gui-y: '350'
-  neutron-api-hacluster-STRSITE:
-    charm: cs:xenial/hacluster
+
+  neutron-api-hacluster:
+    charm: cs:hacluster
+    series: *series
     bindings:
       "": *network_space_os_mgmt
     options:
@@ -231,8 +246,10 @@ services:
     annotations:
       gui-x: '550'
       gui-y: '1350'
-  pxc-hacluster-STRSITE:
-    charm: cs:xenial/hacluster
+
+  pxc-hacluster:
+    charm: cs:hacluster
+    series: *series
     bindings:
       "": *network_space_os_mgmt
     options:
@@ -243,9 +260,11 @@ services:
     annotations:
       gui-x: '1300'
       gui-y: '800'
+
 # Nagios
-  nagios-server-STRSITE:
+  nagios-server:
     charm: cs:nagios
+    series: *series
     num_units: 1
     bindings:
       "": *network_space_os_mgmt
@@ -257,61 +276,75 @@ services:
       ro-password: nagiosadmin
     to:
       - 'lxd:2'
-  nrpe-ctrl-STRSITE:
+  nrpe-ctrl:
     charm: cs:nrpe
+    series: *series
     options:
       swap: '-w 40% -c 25% -n ok'
-  nrpe-cinder-STRSITE:
+  nrpe-cinder:
     charm: cs:nrpe
+    series: *series
     options:
       swap: '-w 40% -c 25% -n ok'
-  nrpe-glance-STRSITE:
+  nrpe-glance:
     charm: cs:nrpe
+    series: *series
     options:
       swap: '-w 40% -c 25% -n ok'
-  nrpe-radosgw-STRSITE:
+  nrpe-radosgw:
     charm: cs:nrpe
+    series: *series
     options:
       swap: '-w 40% -c 25% -n ok'
-  nrpe-keystone-STRSITE:
+  nrpe-keystone:
     charm: cs:nrpe
+    series: *series
     options:
       swap: '-w 40% -c 25% -n ok'
-  nrpe-dashboard-STRSITE:
+  nrpe-dashboard:
     charm: cs:nrpe
+    series: *series
     options:
       swap: '-w 40% -c 25% -n ok'
-  nrpe-neutron-STRSITE:
+  nrpe-neutron:
     charm: cs:nrpe
+    series: *series
     options:
       swap: '-w 40% -c 25% -n ok'
-  nrpe-neutrongw-STRSITE:
+  nrpe-neutrongw:
     charm: cs:nrpe
+    series: *series
     options:
       swap: '-w 40% -c 25% -n ok'
-  nrpe-nova-STRSITE:
+  nrpe-nova:
     charm: cs:nrpe
+    series: *series
     options:
       swap: '-w 40% -c 25% -n ok'
-  nrpe-novacompute-STRSITE:
+  nrpe-novacompute:
     charm: cs:nrpe
+    series: *series
     options:
       swap: '-w 40% -c 25% -n ok'
-  nrpe-percona-STRSITE:
+  nrpe-percona:
     charm: cs:nrpe
+    series: *series
     options:
       swap: '-w 40% -c 25% -n ok'
-  nrpe-rabbitmq-STRSITE:
+  nrpe-rabbitmq:
     charm: cs:nrpe
+    series: *series
     options:
       swap: '-w 40% -c 25% -n ok'
-  nrpe-memcache-STRSITE:
+  nrpe-memcache:
     charm: cs:nrpe
+    series: *series
     options:
       swap: '-w 40% -c 25% -n ok'
-# Charms
-  rabbitmq-server-STRSITE:
-    charm: cs:xenial/rabbitmq-server
+
+  rabbitmq-server:
+    charm: cs:rabbitmq-server
+    series: *series
     num_units: 3
     bindings:
       "": *network_space_default
@@ -330,8 +363,10 @@ services:
     annotations:
       gui-x: '400'
       gui-y: '800'
-  percona-cluster-STRSITE:
-    charm: cs:xenial/percona-cluster
+
+  percona-cluster:
+    charm: cs:percona-cluster
+    series: *series
     num_units: 3
     bindings:
       "": *network_space_default
@@ -355,8 +390,10 @@ services:
     annotations:
       gui-x: '1000'
       gui-y: '800'
-  keystone-STRSITE:
-    charm: cs:xenial/keystone
+
+  keystone:
+    charm: cs:keystone
+    series: *series
     num_units: 3
     bindings:
       "": *network_space_default
@@ -386,8 +423,10 @@ services:
     annotations:
       gui-x: '500'
       gui-y: '500'
-  openstack-dashboard-STRSITE:
-    charm: cs:xenial/openstack-dashboard
+
+  openstack-dashboard:
+    charm: cs:openstack-dashboard
+    series: *series
     num_units: 3
     bindings:
       "": *network_space_default
@@ -415,8 +454,10 @@ services:
     annotations:
       gui-x: '500'
       gui-y: '0'
-  nova-compute-STRSITE:
-    charm: cs:xenial/nova-compute
+
+  nova-compute:
+    charm: cs:nova-compute
+    series: *series
     num_units: 2
     bindings:
       "": *network_space_default
@@ -454,8 +495,10 @@ services:
     annotations:
       gui-x: '0'
       gui-y: '200'
-  nova-cloud-controller-STRSITE:
-    charm: cs:xenial/nova-cloud-controller
+
+  nova-cloud-controller:
+    charm: cs:nova-cloud-controller
+    series: *series
     num_units: 3
     bindings:
       "": *network_space_default
@@ -497,8 +540,10 @@ services:
     annotations:
       gui-x: '0'
       gui-y: '450'
-  neutron-api-STRSITE:
-    charm: cs:xenial/neutron-api
+
+  neutron-api:
+    charm: cs:neutron-api
+    series: *series
     num_units: 3
     bindings:
       "": *network_space_default
@@ -539,8 +584,9 @@ services:
     annotations:
       gui-x: '500'
       gui-y: '1100'
-  neutron-openvswitch-STRSITE:
-    charm: cs:xenial/neutron-openvswitch
+  neutron-openvswitch:
+    charm: cs:neutron-openvswitch
+    series: *series
     bindings:
       "": *network_space_default
       amqp: *network_space_os_mgmt
@@ -561,9 +607,11 @@ services:
     annotations:
       gui-x: '1100'
       gui-y: '1100'
-  cinder-STRSITE:
+
+  cinder:
+    charm: cs:cinder
+    series: *series
     num_units: 3
-    charm: cs:xenial/cinder
     bindings:
       "": *network_space_default
       public: *network_space_pub
@@ -580,7 +628,7 @@ services:
     options:
       block-device: None
       openstack-origin: *openstack_origin
-      glance-api-version: 2
+      glance-api-version: 3
       nagios_servicegroups: ceph,block,storage
       nagios_context: *nagios_context
       region: *region
@@ -594,8 +642,10 @@ services:
     annotations:
       gui-x: '1000'
       gui-y: '200'
-  cinder-ceph-STRSITE:
-    charm: cs:xenial/cinder-ceph
+
+  cinder-ceph:
+    charm: cs:cinder-ceph
+    series: *series
     num_units: 0
     bindings:
       "": *network_space_default
@@ -606,9 +656,11 @@ services:
       gui-y: '230'
     options:
       restrict-ceph-pools: True
-  ceph-proxy-STRSITE:
+
+  ceph-proxy:
+    charm: cs:ceph-proxy
+    series: *series
     num_units: 1
-    charm: cs:xenial/ceph-proxy
     bindings:
       "": *network_space_default
       public: *network_space_os_mgmt
@@ -623,8 +675,9 @@ services:
     annotations:
       gui-x: '1300'
       gui-y: '0'
-  ceph-radosgw-STRSITE:
-    charm: cs:xenial/ceph-radosgw
+  ceph-radosgw:
+    charm: cs:ceph-radosgw
+    series: *series
     bindings:
       "": *network_space_default
       public: *network_space_pub
@@ -650,9 +703,11 @@ services:
     to:
       - 'lxd:1'
       - 'lxd:2'
-  glance-STRSITE:
+
+  glance:
+    charm: cs:glance
+    series: *series
     num_units: 3
-    charm: cs:xenial/glance
     bindings:
       "": *network_space_default
       public: *network_space_pub
@@ -684,9 +739,11 @@ services:
     annotations:
       gui-x: '1000'
       gui-y: '400'
-  memcached-STRSITE:
+
+  memcached:
+    charm: cs:memcached
+    series: *series
     num_units: 3
-    charm: cs:xenial/memcached
     bindings:
       "": *network_space_default
       cache: *network_space_os_mgmt
@@ -700,8 +757,10 @@ services:
     annotations:
       gui-x: '100'
       gui-y: '800'
-  neutron-gateway-STRSITE:
-    charm: cs:xenial/neutron-gateway
+
+  neutron-gateway:
+    charm: cs:neutron-gateway
+    series: *series
     num_units: 1
     bindings:
       "": *network_space_default
@@ -725,144 +784,143 @@ services:
       gui-x: '0'
       gui-y: '1100'
 relations:
-  - [ ntp-STRSITE, ctrl-host-STRSITE ]
-  - [ ntp-STRSITE, compute-host-STRSITE ]
-  - [ ntp-STRSITE, network-host-STRSITE ]
-  - [ percona-cluster-STRSITE, pxc-hacluster-STRSITE ]
-  - [ cinder-STRSITE, cinder-hacluster-STRSITE ]
-  - [ glance-STRSITE, glance-hacluster-STRSITE ]
-  - [ keystone-STRSITE, keystone-hacluster-STRSITE ]
-  - [ neutron-api-STRSITE, neutron-api-hacluster-STRSITE ]
-  - [ nova-cloud-controller-STRSITE, controller-hacluster-STRSITE ]
-  - [ openstack-dashboard-STRSITE, horizon-hacluster-STRSITE ]
-  - [ keystone-STRSITE, percona-cluster-STRSITE ]
-  - [ neutron-api-STRSITE, percona-cluster-STRSITE ]
-  - [ neutron-api-STRSITE, rabbitmq-server-STRSITE ]
-  - [ neutron-api-STRSITE, nova-cloud-controller-STRSITE ]
-  - [ neutron-api-STRSITE, keystone-STRSITE ]
-  - [ neutron-openvswitch-STRSITE, rabbitmq-server-STRSITE ]
-  - [ neutron-openvswitch-STRSITE, neutron-api-STRSITE ]
-  - [ neutron-openvswitch-STRSITE, nova-compute-STRSITE ]
-  - [ nova-cloud-controller-STRSITE, memcached-STRSITE ]
-  - [ nova-cloud-controller-STRSITE, percona-cluster-STRSITE ]
-  - [ nova-cloud-controller-STRSITE, rabbitmq-server-STRSITE ]
-  - [ nova-cloud-controller-STRSITE, glance-STRSITE ]
-  - [ nova-cloud-controller-STRSITE, keystone-STRSITE ]
-  - [ nova-compute-STRSITE, nova-cloud-controller-STRSITE ]
-  - - nova-compute-STRSITE:amqp
-    - rabbitmq-server-STRSITE:amqp
-  - [ nova-compute-STRSITE, glance-STRSITE ]
-  - [ nova-compute-STRSITE, percona-cluster-STRSITE ]
-  - [ glance-STRSITE, percona-cluster-STRSITE ]
-  - [ glance-STRSITE, keystone-STRSITE ]
-  - - glance-STRSITE:image-service
-    - cinder-STRSITE:image-service
-  - - glance-STRSITE:amqp
-    - rabbitmq-server-STRSITE:amqp
-  - [ cinder-STRSITE, percona-cluster-STRSITE ]
-  - [ cinder-STRSITE, rabbitmq-server-STRSITE ]
-  - [ cinder-STRSITE, nova-cloud-controller-STRSITE ]
-  - [ cinder-STRSITE, keystone-STRSITE ]
-  - [ openstack-dashboard-STRSITE, keystone-STRSITE ]
-  - - neutron-gateway-STRSITE:amqp
-    - rabbitmq-server-STRSITE:amqp
-  - - neutron-gateway-STRSITE:neutron-plugin-api
-    - neutron-api-STRSITE:neutron-plugin-api
-  - - nova-cloud-controller-STRSITE:quantum-network-service
-    - neutron-gateway-STRSITE:quantum-network-service
-  - - ceph-proxy-STRSITE:client
-    - nova-compute-STRSITE:ceph
-  - - ceph-proxy-STRSITE:client
-    - cinder-ceph-STRSITE:ceph
-  - - cinder-ceph-STRSITE:storage-backend
-    - cinder-STRSITE:storage-backend
-#FG#  - - ceph-proxy-STRSITE:client
-#FG#    - cinder-backup-STRSITE:ceph
-#FG#  - - cinder-backup-STRSITE:backup-backend
-#FG#    - cinder-STRSITE:backup-backend
-  - - ceph-proxy-STRSITE:client
-    - glance-STRSITE:ceph
+  - [ ntp, ctrl-host ]
+  - [ ntp, compute-host ]
+  - [ ntp, network-host ]
+  - [ percona-cluster, pxc-hacluster ]
+  - [ cinder, cinder-hacluster ]
+  - [ glance, glance-hacluster ]
+  - [ keystone, keystone-hacluster ]
+  - [ neutron-api, neutron-api-hacluster ]
+  - [ nova-cloud-controller, controller-hacluster ]
+  - [ openstack-dashboard, horizon-hacluster ]
+  - [ keystone, percona-cluster ]
+  - [ neutron-api, percona-cluster ]
+  - [ neutron-api, rabbitmq-server ]
+  - [ neutron-api, nova-cloud-controller ]
+  - [ neutron-api, keystone ]
+  - [ neutron-openvswitch, rabbitmq-server ]
+  - [ neutron-openvswitch, neutron-api ]
+  - [ neutron-openvswitch, nova-compute ]
+  - [ nova-cloud-controller, memcached ]
+  - [ nova-cloud-controller, percona-cluster ]
+  - [ nova-cloud-controller, rabbitmq-server ]
+  - [ nova-cloud-controller, glance ]
+  - [ nova-cloud-controller, keystone ]
+  - [ nova-compute, nova-cloud-controller ]
+  - [ "nova-compute:amqp", "rabbitmq-server:amqp" ]
+  - [ nova-compute, glance ]
+  - [ nova-compute, percona-cluster ]
+  - [ glance, percona-cluster ]
+  - [ glance, keystone ]
+  - - glance:image-service
+    - cinder:image-service
+  - - glance:amqp
+    - rabbitmq-server:amqp
+  - [ cinder, percona-cluster ]
+  - [ cinder, rabbitmq-server ]
+  - [ cinder, nova-cloud-controller ]
+  - [ cinder, keystone ]
+  - [ openstack-dashboard, keystone ]
+  - - neutron-gateway:amqp
+    - rabbitmq-server:amqp
+  - - neutron-gateway:neutron-plugin-api
+    - neutron-api:neutron-plugin-api
+  - - nova-cloud-controller:quantum-network-service
+    - neutron-gateway:quantum-network-service
+  - - ceph-proxy:client
+    - nova-compute:ceph
+  - - ceph-proxy:client
+    - cinder-ceph:ceph
+  - - cinder-ceph:storage-backend
+    - cinder:storage-backend
+#FG#  - - ceph-proxy:client
+#FG#    - cinder-backup:ceph
+#FG#  - - cinder-backup:backup-backend
+#FG#    - cinder:backup-backend
+  - - ceph-proxy:client
+    - glance:ceph
 # ceph-radosgw
-  - - ceph-radosgw-STRSITE:ha
-    - ceph-radosgw-hacluster-STRSITE:ha
-  - - keystone-STRSITE:identity-service
-    - ceph-radosgw-STRSITE:identity-service
-  - - ceph-radosgw-STRSITE:mon
-    - ceph-proxy-STRSITE:radosgw
-  - - ceph-radosgw-STRSITE:juju-info
-    - defaultgw-STRSITE:juju-info
+  - - ceph-radosgw:ha
+    - ceph-radosgw-hacluster:ha
+  - - keystone:identity-service
+    - ceph-radosgw:identity-service
+  - - ceph-radosgw:mon
+    - ceph-proxy:radosgw
+  - - ceph-radosgw:juju-info
+    - defaultgw:juju-info
 # default-gw
-  - - keystone-STRSITE:juju-info
-    - defaultgw-STRSITE:juju-info
-  - - openstack-dashboard-STRSITE:juju-info
-    - defaultgw-STRSITE:juju-info
-  - - nova-cloud-controller-STRSITE:juju-info
-    - defaultgw-STRSITE:juju-info
-  - - glance-STRSITE:juju-info
-    - defaultgw-STRSITE:juju-info
-  - - cinder-STRSITE:juju-info
-    - defaultgw-STRSITE:juju-info
-  - - neutron-api-STRSITE:juju-info
-    - defaultgw-STRSITE:juju-info
+  - - keystone:juju-info
+    - defaultgw:juju-info
+  - - openstack-dashboard:juju-info
+    - defaultgw:juju-info
+  - - nova-cloud-controller:juju-info
+    - defaultgw:juju-info
+  - - glance:juju-info
+    - defaultgw:juju-info
+  - - cinder:juju-info
+    - defaultgw:juju-info
+  - - neutron-api:juju-info
+    - defaultgw:juju-info
 # nagios server
-  - - nagios-server-STRSITE:juju-info
-    - defaultgw-STRSITE:juju-info
+  - - nagios-server:juju-info
+    - defaultgw:juju-info
 # nagios controllers (physical)
-  - [ctrl-host-STRSITE, nrpe-ctrl-STRSITE]
-  - - nrpe-ctrl-STRSITE:monitors
-    - nagios-server-STRSITE:monitors
+  - [ctrl-host, nrpe-ctrl]
+  - - nrpe-ctrl:monitors
+    - nagios-server:monitors
 # nagios ceph
-  - [cinder-STRSITE, nrpe-cinder-STRSITE]
-  - [cinder-hacluster-STRSITE, nrpe-cinder-STRSITE]
-  - - nrpe-cinder-STRSITE:monitors
-    - nagios-server-STRSITE:monitors
-  - [glance-STRSITE, nrpe-glance-STRSITE]
-  - [glance-hacluster-STRSITE, nrpe-glance-STRSITE]
-  - - nrpe-glance-STRSITE:monitors
-    - nagios-server-STRSITE:monitors
-  - [ceph-radosgw-STRSITE, nrpe-radosgw-STRSITE]
-  - [ceph-radosgw-hacluster-STRSITE, nrpe-radosgw-STRSITE]
-  - - nrpe-radosgw-STRSITE:monitors
-    - nagios-server-STRSITE:monitors
+  - [cinder, nrpe-cinder]
+  - [cinder-hacluster, nrpe-cinder]
+  - - nrpe-cinder:monitors
+    - nagios-server:monitors
+  - [glance, nrpe-glance]
+  - [glance-hacluster, nrpe-glance]
+  - - nrpe-glance:monitors
+    - nagios-server:monitors
+  - [ceph-radosgw, nrpe-radosgw]
+  - [ceph-radosgw-hacluster, nrpe-radosgw]
+  - - nrpe-radosgw:monitors
+    - nagios-server:monitors
 # nagios keystone
-  - [keystone-STRSITE, nrpe-keystone-STRSITE]
-  - [keystone-hacluster-STRSITE, nrpe-keystone-STRSITE]
-  - - nrpe-keystone-STRSITE:monitors
-    - nagios-server-STRSITE:monitors
+  - [keystone, nrpe-keystone]
+  - [keystone-hacluster, nrpe-keystone]
+  - - nrpe-keystone:monitors
+    - nagios-server:monitors
 # nagios horizon
-  - [openstack-dashboard-STRSITE, nrpe-dashboard-STRSITE]
-  - [horizon-hacluster-STRSITE, nrpe-dashboard-STRSITE]
-  - - nrpe-dashboard-STRSITE:monitors
-    - nagios-server-STRSITE:monitors
+  - [openstack-dashboard, nrpe-dashboard]
+  - [horizon-hacluster, nrpe-dashboard]
+  - - nrpe-dashboard:monitors
+    - nagios-server:monitors
 # nagios neutron
-  - [neutron-api-STRSITE, nrpe-neutron-STRSITE]
-  - [neutron-api-hacluster-STRSITE, nrpe-neutron-STRSITE]
-  - - nrpe-neutron-STRSITE:monitors
-    - nagios-server-STRSITE:monitors
-  - [network-host-STRSITE, nrpe-neutrongw-STRSITE]
-  - [neutron-gateway-STRSITE, nrpe-neutrongw-STRSITE]
-  - - nrpe-neutrongw-STRSITE:monitors
-    - nagios-server-STRSITE:monitors
+  - [neutron-api, nrpe-neutron]
+  - [neutron-api-hacluster, nrpe-neutron]
+  - - nrpe-neutron:monitors
+    - nagios-server:monitors
+  - [network-host, nrpe-neutrongw]
+  - [neutron-gateway, nrpe-neutrongw]
+  - - nrpe-neutrongw:monitors
+    - nagios-server:monitors
 # nagios nova
-  - [nova-cloud-controller-STRSITE, nrpe-nova-STRSITE]
-  - [controller-hacluster-STRSITE, nrpe-nova-STRSITE]
-  - - nrpe-nova-STRSITE:monitors
-    - nagios-server-STRSITE:monitors
-  - [compute-host-STRSITE, nrpe-novacompute-STRSITE]
-  - [nova-compute-STRSITE, nrpe-novacompute-STRSITE]
-  - - nrpe-novacompute-STRSITE:monitors
-    - nagios-server-STRSITE:monitors
+  - [nova-cloud-controller, nrpe-nova]
+  - [controller-hacluster, nrpe-nova]
+  - - nrpe-nova:monitors
+    - nagios-server:monitors
+  - [compute-host, nrpe-novacompute]
+  - [nova-compute, nrpe-novacompute]
+  - - nrpe-novacompute:monitors
+    - nagios-server:monitors
 # nagios percona
-  - [percona-cluster-STRSITE, nrpe-percona-STRSITE]
-  - [pxc-hacluster-STRSITE, nrpe-percona-STRSITE]
-  - - nrpe-percona-STRSITE:monitors
-    - nagios-server-STRSITE:monitors
+  - [percona-cluster, nrpe-percona]
+  - [pxc-hacluster, nrpe-percona]
+  - - nrpe-percona:monitors
+    - nagios-server:monitors
 # nagios memcache
-  - - memcached-STRSITE:nrpe-external-master
-    - nrpe-memcache-STRSITE:nrpe-external-master
-  - - nrpe-memcache-STRSITE:monitors
-    - nagios-server-STRSITE:monitors
+  - - memcached:nrpe-external-master
+    - nrpe-memcache:nrpe-external-master
+  - - nrpe-memcache:monitors
+    - nagios-server:monitors
 # nagios rabbitmq
-  - [rabbitmq-server-STRSITE, nrpe-rabbitmq-STRSITE]
-  - - nrpe-rabbitmq-STRSITE:monitors
-    - nagios-server-STRSITE:monitors
+  - [rabbitmq-server, nrpe-rabbitmq]
+  - - nrpe-rabbitmq:monitors
+    - nagios-server:monitors
-- 
GitLab