From f2b367a7359b73557e3e59d612c786252409da34 Mon Sep 17 00:00:00 2001
From: Colleen Murphy <colleen@gazlene.net>
Date: Tue, 6 Oct 2015 16:00:18 -0700
Subject: [PATCH] Add Infra Cloud compute node definition

Add definition for compute nodes in the hpuswest region.

Change-Id: I9bce2a37d427558ba7a59fc6bc9edfd62edeac45
---
 manifests/site.pp                               | 16 ++++++++++++++++
 .../manifests/infracloud/compute.pp             | 17 +++++++++++++++++
 2 files changed, 33 insertions(+)
 create mode 100644 modules/openstack_project/manifests/infracloud/compute.pp

diff --git a/manifests/site.pp b/manifests/site.pp
index 16efe79f00..a3c0c386cb 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -1158,4 +1158,20 @@ node 'controller00.hpuswest.ic.openstack.org' {
   }
 }
 
+node /^compute\d{3}\.hpuswest\.ic\.openstack\.org$/ {
+  $group = 'infracloud'
+  class { '::openstack_project::server':
+    sysadmins                 => hiera('sysadmins', []),
+    enable_unbound            => false,
+  }
+  class { '::openstack_project::infracloud::compute':
+    nova_rabbit_password             => hiera('nova_rabbit_password'),
+    neutron_rabbit_password          => hiera('neutron_rabbit_password'),
+    neutron_admin_password           => hiera('neutron_admin_password'),
+    br_name                          => 'br-vlan25',
+    controller_management_address    => '10.10.16.146',
+    controller_public_address        => 'controller00.hpuswest.ic.openstack.org',
+  }
+}
+
 # vim:sw=2:ts=2:expandtab:textwidth=79
diff --git a/modules/openstack_project/manifests/infracloud/compute.pp b/modules/openstack_project/manifests/infracloud/compute.pp
new file mode 100644
index 0000000000..c2bf5f25f8
--- /dev/null
+++ b/modules/openstack_project/manifests/infracloud/compute.pp
@@ -0,0 +1,17 @@
+class openstack_project::infracloud::compute (
+  $nova_rabbit_password,
+  $neutron_rabbit_password,
+  $neutron_admin_password,
+  $br_name,
+  $controller_management_address,
+  $controller_public_address,
+) {
+  class { '::infracloud::compute':
+    nova_rabbit_password          => $nova_rabbit_password,
+    neutron_rabbit_password       => $neutron_rabbit_password,
+    neutron_admin_password        => $neutron_admin_password,
+    br_name                       => $br_name,
+    controller_management_address => $controller_management_address,
+    controller_public_address     => $controller_public_address,
+  }
+}