From f67096d6f5c96ec678a54a81ad7b3f5d9257bf93 Mon Sep 17 00:00:00 2001
From: Giuseppe Attardi <giuseppe.attardi@garr.it>
Date: Fri, 20 Oct 2017 05:17:29 +0200
Subject: [PATCH] Update bundle_template.juju2.yaml
---
bundles/openstack/bundle_template.juju2.yaml | 112 +++++++------------
1 file changed, 39 insertions(+), 73 deletions(-)
diff --git a/bundles/openstack/bundle_template.juju2.yaml b/bundles/openstack/bundle_template.juju2.yaml
index c117369f..dae712a3 100644
--- a/bundles/openstack/bundle_template.juju2.yaml
+++ b/bundles/openstack/bundle_template.juju2.yaml
@@ -105,7 +105,7 @@ machines:
services:
- ctrl-host:
+ controller:
charm: cs:ubuntu
num_units: 3
to:
@@ -783,6 +783,8 @@ services:
annotations:
gui-x: '0'
gui-y: '1100'
+
+# ------------------------------------------------------------------------------
relations:
- [ ntp, ctrl-host ]
- [ ntp, compute-host ]
@@ -813,114 +815,78 @@ relations:
- [ nova-compute, percona-cluster ]
- [ glance, percona-cluster ]
- [ glance, keystone ]
- - - glance:image-service
- - cinder:image-service
- - - glance:amqp
- - rabbitmq-server:amqp
+ - [ "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
+ - [ "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", "cinder-backup:ceph" ]
+#FG# - [ "cinder-backup:backup-backend", "cinder:backup-backend" ]
+ - [ "ceph-proxy:client", "glance:ceph" ]
# ceph-radosgw
- - - 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
+ - [ "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: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
+ - [ "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:juju-info
- - defaultgw:juju-info
+ - [ "nagios-server:juju-info", "defaultgw:juju-info" ]
# nagios controllers (physical)
- [ctrl-host, nrpe-ctrl]
- - - nrpe-ctrl:monitors
- - nagios-server:monitors
+ - [ "nrpe-ctrl:monitors", "nagios-server:monitors" ]
# nagios ceph
- [cinder, nrpe-cinder]
- [cinder-hacluster, nrpe-cinder]
- - - nrpe-cinder:monitors
- - nagios-server:monitors
+ - [ "nrpe-cinder:monitors", "nagios-server:monitors" ]
- [glance, nrpe-glance]
- [glance-hacluster, nrpe-glance]
- - - nrpe-glance:monitors
- - nagios-server:monitors
+ - [ "nrpe-glance:monitors", "nagios-server:monitors" ]
- [ceph-radosgw, nrpe-radosgw]
- [ceph-radosgw-hacluster, nrpe-radosgw]
- - - nrpe-radosgw:monitors
- - nagios-server:monitors
+ - [ "nrpe-radosgw:monitors", "nagios-server:monitors" ]
# nagios keystone
- [keystone, nrpe-keystone]
- [keystone-hacluster, nrpe-keystone]
- - - nrpe-keystone:monitors
- - nagios-server:monitors
+ - [ "nrpe-keystone:monitors", "nagios-server:monitors" ]
# nagios horizon
- [openstack-dashboard, nrpe-dashboard]
- [horizon-hacluster, nrpe-dashboard]
- - - nrpe-dashboard:monitors
- - nagios-server:monitors
+ - [ "nrpe-dashboard:monitors", "nagios-server:monitors" ]
# nagios neutron
- [neutron-api, nrpe-neutron]
- [neutron-api-hacluster, nrpe-neutron]
- - - nrpe-neutron:monitors
- - nagios-server:monitors
+ - [ "nrpe-neutron:monitors", "nagios-server:monitors" ]
- [network-host, nrpe-neutrongw]
- [neutron-gateway, nrpe-neutrongw]
- - - nrpe-neutrongw:monitors
- - nagios-server:monitors
+ - [ "nrpe-neutrongw:monitors", "nagios-server:monitors" ]
# nagios nova
- [nova-cloud-controller, nrpe-nova]
- [controller-hacluster, nrpe-nova]
- - - nrpe-nova:monitors
- - nagios-server:monitors
+ - [ "nrpe-nova:monitors", "nagios-server:monitors" ]
- [compute-host, nrpe-novacompute]
- [nova-compute, nrpe-novacompute]
- - - nrpe-novacompute:monitors
- - nagios-server:monitors
+ - [ "nrpe-novacompute:monitors", "nagios-server:monitors" ]
# nagios percona
- [percona-cluster, nrpe-percona]
- [pxc-hacluster, nrpe-percona]
- - - nrpe-percona:monitors
- - nagios-server:monitors
+ - [ "nrpe-percona:monitors", "nagios-server:monitors" ]
# nagios memcache
- - - memcached:nrpe-external-master
- - nrpe-memcache:nrpe-external-master
- - - nrpe-memcache:monitors
- - nagios-server:monitors
+ - [ "memcached:nrpe-external-master", "nrpe-memcache:nrpe-external-master" ]
+ - [ "nrpe-memcache:monitors", "nagios-server:monitors" ]
# nagios rabbitmq
- [rabbitmq-server, nrpe-rabbitmq]
- - - nrpe-rabbitmq:monitors
- - nagios-server:monitors
+ - [ "nrpe-rabbitmq:monitors", "nagios-server:monitors" ]
--
GitLab