Merge lp:~dweaver/orange-box-examples/orange-box-examples into lp:~kirkland/orange-box-examples/trunk

[Darryl Weaver]

Adding integrate-infrastructure.sh to combine openstack with infrastructure services.
Changing tags to physical and virtual.

[lp:~dweaver/orange-box-examples/orange-box-examples]

21. By Dustin Kirkland  on 2014-07-28

* usr/lib/orange-box/examples/infrastructure/precise/infrastructure-
  bundle.yaml, usr/lib/orange-
  box/examples/infrastructure/trusty/infrastructure-bundle.yaml,
  usr/lib/orange-
  box/examples/openstack/icehouse/precise/icehouseOB.yaml,
  usr/lib/orange-box/examples/openstack/icehouse/precise/integrate-
  infrastructure.sh, usr/lib/orange-
  box/examples/openstack/icehouse/trusty/icehouseOB.yaml,
  usr/lib/orange-box/examples/openstack/icehouse/trusty/integrate-
  infrastructure.sh:
  - Adding integrate-infrastructure.sh to combine openstack with
    infrastructure services.
  - Changing tags to physical and virtual.

=== modified file 'usr/lib/orange-box/examples/infrastructure/precise/infrastructure-bundle.yaml'
--- usr/lib/orange-box/examples/infrastructure/precise/infrastructure-bundle.yaml	2014-07-24 01:20:29 +0000
+++ usr/lib/orange-box/examples/infrastructure/precise/infrastructure-bundle.yaml	2014-07-28 20:32:55 +0000
@@ -9,7 +9,7 @@
     nagios: 
       branch: "lp:charms/nagios"
       num_units: 1
-      constraints: tags=nagios
+      constraints: tags=virtual
       expose: true
       annotations: 
         "gui-x": "-680"

=== modified file 'usr/lib/orange-box/examples/infrastructure/trusty/infrastructure-bundle.yaml'
--- usr/lib/orange-box/examples/infrastructure/trusty/infrastructure-bundle.yaml	2014-07-24 01:20:29 +0000
+++ usr/lib/orange-box/examples/infrastructure/trusty/infrastructure-bundle.yaml	2014-07-28 20:32:55 +0000
@@ -9,7 +9,7 @@
     nagios: 
       branch: "lp:charms/nagios"
       num_units: 1
-      constraints: tags=nagios
+      constraints: tags=virtual
       expose: true
       annotations: 
         "gui-x": "-680"

=== modified file 'usr/lib/orange-box/examples/openstack/icehouse/precise/icehouseOB.yaml'
--- usr/lib/orange-box/examples/openstack/icehouse/precise/icehouseOB.yaml	2014-07-25 18:07:05 +0000
+++ usr/lib/orange-box/examples/openstack/icehouse/precise/icehouseOB.yaml	2014-07-28 20:32:55 +0000
@@ -38,7 +38,7 @@
     "neutron-gateway":
       charm: "cs:precise/quantum-gateway-21"
       num_units: 1
-      constraints: tags=neutron
+      constraints: tags=virtual
       options:
         ext-port: eth1
         instance-mtu: 1400

=== added file 'usr/lib/orange-box/examples/openstack/icehouse/precise/integrate-infrastructure.sh'
--- usr/lib/orange-box/examples/openstack/icehouse/precise/integrate-infrastructure.sh	1970-01-01 00:00:00 +0000
+++ usr/lib/orange-box/examples/openstack/icehouse/precise/integrate-infrastructure.sh	2014-07-28 20:32:55 +0000
@@ -0,0 +1,17 @@
+#!/bin/bash
+
+set -e
+
+echo "Adding relationships to infrastructure services"
+
+services="mysql rabbitmq nova-cloud-controller nova-compute cinder glance neutron-gateway openstack-dashboard ceph ceph-radosgw mongodb ceilometer heat keystone"
+
+for service in $services
+do
+	juju add-relation $service nagios
+	juju add-relation $service nrpe
+	juju add-relation $service landscape-client
+	juju add-relation $service ganglia-node
+
+done
+echo "Finished"

=== modified file 'usr/lib/orange-box/examples/openstack/icehouse/trusty/icehouseOB.yaml'
--- usr/lib/orange-box/examples/openstack/icehouse/trusty/icehouseOB.yaml	2014-07-25 18:07:05 +0000
+++ usr/lib/orange-box/examples/openstack/icehouse/trusty/icehouseOB.yaml	2014-07-28 20:32:55 +0000
@@ -38,7 +38,7 @@
     "neutron-gateway":
       charm: "cs:trusty/quantum-gateway-3"
       num_units: 1
-      constraints: tags=neutron
+      constraints: tags=virtual
       options:
         ext-port: eth1
         instance-mtu: 1400

=== added file 'usr/lib/orange-box/examples/openstack/icehouse/trusty/integrate-infrastructure.sh'
--- usr/lib/orange-box/examples/openstack/icehouse/trusty/integrate-infrastructure.sh	1970-01-01 00:00:00 +0000
+++ usr/lib/orange-box/examples/openstack/icehouse/trusty/integrate-infrastructure.sh	2014-07-28 20:32:55 +0000
@@ -0,0 +1,17 @@
+#!/bin/bash
+
+set -e
+
+echo "Adding relationships to infrastructure services"
+
+services="mysql rabbitmq nova-cloud-controller nova-compute cinder glance neutron-gateway openstack-dashboard ceph ceph-radosgw mongodb ceilometer heat keystone"
+
+for service in $services
+do
+	juju add-relation $service nagios
+	juju add-relation $service nrpe
+	juju add-relation $service landscape-client
+	juju add-relation $service ganglia-node
+
+done
+echo "Finished"