commit d268b45de40a6f14f30b5d7b9e9f264d21390214
author Andy Bavier <acb@cs.princeton.edu> Tue Sep 22 18:22:23 2015 -0400
committer Andy Bavier <acb@cs.princeton.edu> Tue Sep 22 18:22:23 2015 -0400
tree 9c13739ebd7f1ce183aafcc6f667fdf2888ded99
parent c0c96eec84f1013a6d17cf79fa583bb4a39556f3

Juju adjustments

files/openstack.cfg

diff --git a/files/openstack.cfg b/files/openstack.cfg
index 1963ef6..92744e1 100644
--- a/files/openstack.cfg
+++ b/files/openstack.cfg
@@ -10,6 +10,8 @@
    openstack-origin: "cloud:trusty-kilo"
 nova-compute:
 #   config-flags: "firewall_driver=nova.virt.firewall.NoopFirewallDriver"
+   config-flags: "xos_api_url=http://130.127.133.61:8000"
+   disable-neutron-security-groups: "True"
    openstack-origin: "cloud:trusty-kilo"
 ntp:
 openstack-dashboard:

scripts/juju-relations.py

diff --git a/scripts/juju-relations.py b/scripts/juju-relations.py
index d376814..9c4b1f7 100755
--- a/scripts/juju-relations.py
+++ b/scripts/juju-relations.py
@@ -24,14 +24,14 @@
              "neutron-api nova-cloud-controller",
              "neutron-openvswitch rabbitmq-server",
              "openstack-dashboard keystone",
-             "mysql nagios",
-             "rabbitmq-server nagios",
-             "keystone nagios",
-             "glance nagios",
-             "nova-cloud-controller nagios",
-             "neutron-gateway nagios",
-             "openstack-dashboard nagios",
-             "neutron-api nagios",
+#             "mysql nagios",
+#             "rabbitmq-server nagios",
+#             "keystone nagios",
+#             "glance nagios",
+#             "nova-cloud-controller nagios",
+#             "neutron-gateway nagios",
+#             "openstack-dashboard nagios",
+#             "neutron-api nagios",
              "nagios nrpe",
              "mysql:juju-info nrpe:general-info",
              "rabbitmq-server nrpe",