Updates for new neutron-* charms
diff --git a/files/openstack.cfg b/files/openstack.cfg
index ae83d46..c274bd8 100644
--- a/files/openstack.cfg
+++ b/files/openstack.cfg
@@ -10,7 +10,6 @@
config-flags: "firewall_driver=nova.virt.firewall.NoopFirewallDriver"
openstack-origin: "cloud:trusty-kilo"
ntp:
- source: "ntp.cs.princeton.edu"
openstack-dashboard:
openstack-origin: "cloud:trusty-kilo"
neutron-gateway:
diff --git a/scripts/juju-relations.py b/scripts/juju-relations.py
index a723395..d376814 100755
--- a/scripts/juju-relations.py
+++ b/scripts/juju-relations.py
@@ -24,7 +24,6 @@
"neutron-api nova-cloud-controller",
"neutron-openvswitch rabbitmq-server",
"openstack-dashboard keystone",
- "ntp nova-cloud-controller",
"mysql nagios",
"rabbitmq-server nagios",
"keystone nagios",
@@ -32,14 +31,16 @@
"nova-cloud-controller nagios",
"neutron-gateway nagios",
"openstack-dashboard nagios",
+ "neutron-api nagios",
"nagios nrpe",
- "mysql nrpe",
+ "mysql:juju-info nrpe:general-info",
"rabbitmq-server nrpe",
"keystone nrpe",
"glance nrpe",
"nova-cloud-controller nrpe",
"neutron-gateway nrpe",
"openstack-dashboard nrpe",
+ "neutron-api nrpe",
"ceilometer mongodb",
"ceilometer rabbitmq-server",
"ceilometer:identity-service keystone:identity-service",