diff --git a/hiera/group/infracloud.yaml b/hiera/group/infracloud.yaml
new file mode 100644
index 0000000000..9255d24284
--- /dev/null
+++ b/hiera/group/infracloud.yaml
@@ -0,0 +1,829 @@
+---
+ironic_inventory_hpuswest:
+  baremetal00.hpuswest.ic.openstack.org:
+    driver: agent_ipmitool
+    driver_info:
+      power:
+        ipmi_address: 10.10.16.36
+        ipmi_username: Administrator
+    ipv4_public_address: 15.184.52.2
+    ipv4_address: 10.10.16.144
+    name: baremetal00.hpuswest.ic.openstack.org
+    nics:
+    - mac: 78:e7:d1:23:95:6d
+    properties:
+      cpu_arch: x86_64
+      cpus: '24'
+      disk_size: '1800'
+      ram: '96676'
+    uuid: 0090edd1-d3b6-4b6b-b3e4-b2bb09665d7b
+    disabled: true # currently deployed
+  baremetal01.hpuswest.ic.openstack.org:
+    driver: agent_ipmitool
+    driver_info:
+      power:
+        ipmi_address: 10.10.16.7
+        ipmi_username: Administrator
+    ipv4_public_address: 15.184.52.3
+    ipv4_address: 10.10.16.145
+    name: baremetal01.hpuswest.ic.openstack.org
+    nics:
+    - mac: 78:e7:d1:23:99:bd
+    properties:
+      cpu_arch: x86_64
+      cpus: '24'
+      disk_size: '1800'
+      ram: 96676
+    uuid: 476b4113-6378-470f-834d-181017b8f1a8
+    disabled: true # only need one deployed baremetal server
+  compute000.hpuswest.ic.openstack.org:
+    driver: agent_ipmitool
+    driver_info:
+      power:
+        ipmi_address: 10.10.16.42
+        ipmi_username: Administrator
+    ipv4_public_address: 15.184.52.100
+    ipv4_address: 10.10.16.150
+    name: compute000.hpuswest.ic.openstack.org
+    nics:
+    - mac: 78:e7:d1:23:93:05
+    properties:
+      cpu_arch: x86_64
+      cpus: '24'
+      disk_size: '1800'
+      ram: '96676'
+    uuid: 0fdfbf53-fe80-4602-83fd-ed6119ad16d4
+  compute001.hpuswest.ic.openstack.org:
+    driver: agent_ipmitool
+    driver_info:
+      power:
+        ipmi_address: 10.10.16.23
+        ipmi_username: Administrator
+    ipv4_public_address: 15.184.52.101
+    ipv4_address: 10.10.16.151
+    name: compute001.hpuswest.ic.openstack.org
+    nics:
+    - mac: 78:e7:d1:22:aa:44
+    properties:
+      cpu_arch: x86_64
+      cpus: '24'
+      disk_size: '1800'
+      ram: '96676'
+    uuid: d1d4232d-91ec-41d9-9f9b-80350ae9f048
+  compute002.hpuswest.ic.openstack.org:
+    driver: agent_ipmitool
+    driver_info:
+      power:
+        ipmi_address: 10.10.16.41
+        ipmi_username: Administrator
+    ipv4_public_address: 15.184.52.102
+    ipv4_address: 10.10.16.152
+    name: compute002.hpuswest.ic.openstack.org
+    nics:
+    - mac: 78:e7:d1:23:9b:2d
+    properties:
+      cpu_arch: x86_64
+      cpus: '24'
+      disk_size: '1800'
+      ram: '96676'
+    uuid: ad9e12c5-f74d-449c-96ea-db7ad44cd52c
+  compute003.hpuswest.ic.openstack.org:
+    driver: agent_ipmitool
+    driver_info:
+      power:
+        ipmi_address: 10.10.16.12
+        ipmi_username: Administrator
+    ipv4_public_address: 15.184.52.103
+    ipv4_address: 10.10.16.153
+    name: compute003.hpuswest.ic.openstack.org
+    nics:
+    - mac: 78:e7:d1:22:36:05
+    properties:
+      cpu_arch: x86_64
+      cpus: '24'
+      disk_size: '1800'
+      ram: '96676'
+    uuid: b1a17d9b-5620-42a4-b211-f0a9d4800b7f
+  compute004.hpuswest.ic.openstack.org:
+    driver: agent_ipmitool
+    driver_info:
+      power:
+        ipmi_address: 10.10.16.34
+        ipmi_username: Administrator
+    ipv4_public_address: 15.184.52.104
+    ipv4_address: 10.10.16.154
+    name: compute004.hpuswest.ic.openstack.org
+    nics:
+    - mac: 78:e7:d1:23:95:25
+    properties:
+      cpu_arch: x86_64
+      cpus: '24'
+      disk_size: '1800'
+      ram: 96676
+    uuid: 6d76f9b9-5655-4363-b383-110f74b45aaf
+  compute005.hpuswest.ic.openstack.org:
+    driver: agent_ipmitool
+    driver_info:
+      power:
+        ipmi_address: 10.10.16.33
+        ipmi_username: Administrator
+    ipv4_public_address: 15.184.52.105
+    ipv4_address: 10.10.16.155
+    name: compute005.hpuswest.ic.openstack.org
+    nics:
+    - mac: 78:e7:d1:22:95:ed
+    properties:
+      cpu_arch: x86_64
+      cpus: '24'
+      disk_size: '1800'
+      ram: '96676'
+    uuid: 945a6ae1-de7c-4f9b-8642-a0aef1ce9c45
+    disabled: true # iLO doesn't ping
+  compute006.hpuswest.ic.openstack.org:
+    driver: agent_ipmitool
+    driver_info:
+      power:
+        ipmi_address: 10.10.16.18
+        ipmi_username: Administrator
+    ipv4_public_address: 15.184.52.106
+    ipv4_address: 10.10.16.156
+    name: compute006.hpuswest.ic.openstack.org
+    nics:
+    - mac: 78:e7:d1:23:9b:45
+    properties:
+      cpu_arch: x86_64
+      cpus: '24'
+      disk_size: '1800'
+      ram: '96676'
+    uuid: c3a35603-ed63-4801-afce-8d8d3df762b1
+  compute007.hpuswest.ic.openstack.org:
+    driver: agent_ipmitool
+    driver_info:
+      power:
+        ipmi_address: 10.10.16.38
+        ipmi_username: Administrator
+    ipv4_public_address: 15.184.52.107
+    ipv4_address: 10.10.16.157
+    name: compute007.hpuswest.ic.openstack.org
+    nics:
+    - mac: 78:e7:d1:24:e2:65
+    properties:
+      cpu_arch: x86_64
+      cpus: '24'
+      disk_size: '1800'
+      ram: 96676
+    uuid: 7889d9ff-5c17-4f2f-9ac8-8f7b9e8f3bac
+  compute008.hpuswest.ic.openstack.org:
+    driver: agent_ipmitool
+    driver_info:
+      power:
+        ipmi_address: 10.10.16.27
+        ipmi_username: Administrator
+    ipv4_public_address: 15.184.52.108
+    ipv4_address: 10.10.16.158
+    name: compute008.hpuswest.ic.openstack.org
+    nics:
+    - mac: 78:e7:d1:21:66:75
+    properties:
+      cpu_arch: x86_64
+      cpus: '24'
+      disk_size: '1800'
+      ram: 96676
+    uuid: 88df2eb2-8ec5-4601-8ea6-04288193b966
+    disabled: true # needs iLO firmware upgrade
+  compute009.hpuswest.ic.openstack.org:
+    driver: agent_ipmitool
+    driver_info:
+      power:
+        ipmi_address: 10.10.16.39
+        ipmi_username: Administrator
+    ipv4_public_address: 15.184.52.109
+    ipv4_address: 10.10.16.159
+    name: compute009.hpuswest.ic.openstack.org
+    nics:
+    - mac: 78:e7:d1:23:99:d5
+    properties:
+      cpu_arch: x86_64
+      cpus: '24'
+      disk_size: '1800'
+      ram: '96676'
+    uuid: 183df9cb-35c4-4e83-97d6-76d41680a045
+  compute010.hpuswest.ic.openstack.org:
+    driver: agent_ipmitool
+    driver_info:
+      power:
+        ipmi_address: 10.10.16.51
+        ipmi_username: Administrator
+    ipv4_public_address: 15.184.52.110
+    ipv4_address: 10.10.16.160
+    name: compute010.hpuswest.ic.openstack.org
+    nics:
+    - mac: 78:e7:d1:23:90:0d
+    properties:
+      cpu_arch: x86_64
+      cpus: '24'
+      disk_size: '1800'
+      ram: 96676
+    uuid: d1a88893-abe2-4523-9144-2039e600f839
+    disabled: true # iLO doesn't ping
+  compute011.hpuswest.ic.openstack.org:
+    driver: agent_ipmitool
+    driver_info:
+      power:
+        ipmi_address: 10.10.16.26
+        ipmi_username: Administrator
+    ipv4_public_address: 15.184.52.111
+    ipv4_address: 10.10.16.161
+    name: compute011.hpuswest.ic.openstack.org
+    nics:
+    - mac: 78:e7:d1:23:9a:e5
+    properties:
+      cpu_arch: x86_64
+      cpus: '24'
+      disk_size: '1800'
+      ram: '96676'
+    uuid: 116dfbc8-74e1-4b48-b08e-a338b0981887
+  compute012.hpuswest.ic.openstack.org:
+    driver: agent_ipmitool
+    driver_info:
+      power:
+        ipmi_address: 10.10.16.17
+        ipmi_username: Administrator
+    ipv4_public_address: 15.184.52.112
+    ipv4_address: 10.10.16.162
+    name: compute012.hpuswest.ic.openstack.org
+    nics:
+    - mac: 78:e7:d1:23:93:e5
+    properties:
+      cpu_arch: x86_64
+      cpus: '24'
+      disk_size: '1800'
+      ram: '96676'
+    uuid: cd8accf6-8d39-40b9-b5fa-cb14e5744750
+  compute013.hpuswest.ic.openstack.org:
+    driver: agent_ipmitool
+    driver_info:
+      power:
+        ipmi_address: 10.10.16.50
+        ipmi_username: Administrator
+    ipv4_public_address: 15.184.52.113
+    ipv4_address: 10.10.16.163
+    name: compute013.hpuswest.ic.openstack.org
+    nics:
+    - mac: 78:e7:d1:23:93:d5
+    properties:
+      cpu_arch: x86_64
+      cpus: '24'
+      disk_size: '1800'
+      ram: '96676'
+    uuid: f002f9a1-e75b-40fe-8ead-31009eb4d997
+  compute014.hpuswest.ic.openstack.org:
+    driver: agent_ipmitool
+    driver_info:
+      power:
+        ipmi_address: 10.10.16.19
+        ipmi_username: Administrator
+    ipv4_public_address: 15.184.52.114
+    ipv4_address: 10.10.16.164
+    name: compute014.hpuswest.ic.openstack.org
+    nics:
+    - mac: 78:e7:d1:24:32:8d
+    properties:
+      cpu_arch: x86_64
+      cpus: '24'
+      disk_size: '1800'
+      ram: 96676
+    uuid: 2793d114-8855-4243-8a60-98303610a2ab
+  compute015.hpuswest.ic.openstack.org:
+    driver: agent_ipmitool
+    driver_info:
+      power:
+        ipmi_address: 10.10.16.35
+        ipmi_username: Administrator
+    ipv4_public_address: 15.184.52.115
+    ipv4_address: 10.10.16.165
+    name: compute015.hpuswest.ic.openstack.org
+    nics:
+    - mac: 78:e7:d1:21:5d:55
+    properties:
+      cpu_arch: x86_64
+      cpus: '24'
+      disk_size: '1800'
+      ram: 96676
+    uuid: 3e00f75a-958e-4034-bd0a-4a0ba9e2df4d
+    disabled: true # needs iLO firmware upgrade
+  compute016.hpuswest.ic.openstack.org:
+    driver: agent_ipmitool
+    driver_info:
+      power:
+        ipmi_address: 10.10.16.6
+        ipmi_username: Administrator
+    ipv4_public_address: 15.184.52.116
+    ipv4_address: 10.10.16.166
+    name: compute016.hpuswest.ic.openstack.org
+    nics:
+    - mac: 78:e7:d1:23:97:cd
+    properties:
+      cpu_arch: x86_64
+      cpus: '24'
+      disk_size: '1800'
+      ram: 96676
+    uuid: 98d141a3-7efc-4df3-84a6-e3d8cdff3025
+  compute017.hpuswest.ic.openstack.org:
+    driver: agent_ipmitool
+    driver_info:
+      power:
+        ipmi_address: 10.10.16.10
+        ipmi_username: Administrator
+    ipv4_public_address: 15.184.52.117
+    ipv4_address: 10.10.16.167
+    name: compute017.hpuswest.ic.openstack.org
+    nics:
+    - mac: 78:e7:d1:24:1f:1c
+    properties:
+      cpu_arch: x86_64
+      cpus: '24'
+      disk_size: '1800'
+      ram: 96676
+    uuid: 2e251e9d-0b00-477c-9069-f9dbe966b5e3
+  compute018.hpuswest.ic.openstack.org:
+    driver: agent_ipmitool
+    driver_info:
+      power:
+        ipmi_address: 10.10.16.44
+        ipmi_username: Administrator
+    ipv4_public_address: 15.184.52.118
+    ipv4_address: 10.10.16.168
+    name: compute018.hpuswest.ic.openstack.org
+    nics:
+    - mac: 78:e7:d1:23:94:15
+    properties:
+      cpu_arch: x86_64
+      cpus: '24'
+      disk_size: '1800'
+      ram: '96676'
+    uuid: 0a4da2d7-2420-4201-8714-c78c71c2f17b
+    disabled: true # nic issues
+  compute019.hpuswest.ic.openstack.org:
+    driver: agent_ipmitool
+    driver_info:
+      power:
+        ipmi_address: 10.10.16.16
+        ipmi_username: Administrator
+    ipv4_public_address: 15.184.52.119
+    ipv4_address: 10.10.16.169
+    name: compute019.hpuswest.ic.openstack.org
+    nics:
+    - mac: 78:e7:d1:21:5c:55
+    properties:
+      cpu_arch: x86_64
+      cpus: '24'
+      disk_size: '1800'
+      ram: '96676'
+    uuid: b9b47664-c5d0-472c-b232-8c1a4ef22fd0
+  compute020.hpuswest.ic.openstack.org:
+    driver: agent_ipmitool
+    driver_info:
+      power:
+        ipmi_address: 10.10.16.46
+        ipmi_username: Administrator
+    ipv4_public_address: 15.184.52.120
+    ipv4_address: 10.10.16.170
+    name: compute020.hpuswest.ic.openstack.org
+    nics:
+    - mac: 78:e7:d1:25:38:7d
+    properties:
+      cpu_arch: x86_64
+      cpus: '24'
+      disk_size: '1800'
+      ram: '96676'
+    uuid: 4ae583ec-60ae-4027-9a95-f6c132e7a509
+  compute021.hpuswest.ic.openstack.org:
+    driver: agent_ipmitool
+    driver_info:
+      power:
+        ipmi_address: 10.10.16.31
+        ipmi_username: Administrator
+    ipv4_public_address: 15.184.52.121
+    ipv4_address: 10.10.16.171
+    name: compute021.hpuswest.ic.openstack.org
+    nics:
+    - mac: 78:e7:d1:23:94:fd
+    properties:
+      cpu_arch: x86_64
+      cpus: '24'
+      disk_size: '1800'
+      ram: '96676'
+    uuid: 272215ce-baf3-4d80-a0c9-c0997b204b2d
+  compute022.hpuswest.ic.openstack.org:
+    driver: agent_ipmitool
+    driver_info:
+      power:
+        ipmi_address: 10.10.16.21
+        ipmi_username: Administrator
+    ipv4_public_address: 15.184.52.122
+    ipv4_address: 10.10.16.172
+    name: compute022.hpuswest.ic.openstack.org
+    nics:
+    - mac: 78:e7:d1:24:31:5d
+    properties:
+      cpu_arch: x86_64
+      cpus: '24'
+      disk_size: '1800'
+      ram: 96676
+    uuid: ac81d1fe-b6be-4677-ba0e-259227ec0e9d
+    disabled: true # current baremetal00
+  compute023.hpuswest.ic.openstack.org:
+    driver: agent_ipmitool
+    driver_info:
+      power:
+        ipmi_address: 10.10.16.45
+        ipmi_username: Administrator
+    ipv4_public_address: 15.184.52.123
+    ipv4_address: 10.10.16.173
+    name: compute023.hpuswest.ic.openstack.org
+    nics:
+    - mac: 78:e7:d1:23:95:d5
+    properties:
+      cpu_arch: x86_64
+      cpus: '24'
+      disk_size: '1800'
+      ram: '96676'
+    uuid: 9b4711f0-0fd4-4630-9495-649c64b0f071
+  compute024.hpuswest.ic.openstack.org:
+    driver: agent_ipmitool
+    driver_info:
+      power:
+        ipmi_address: 10.10.16.15
+        ipmi_username: Administrator
+    ipv4_public_address: 15.184.52.124
+    ipv4_address: 10.10.16.174
+    name: compute024.hpuswest.ic.openstack.org
+    nics:
+    - mac: 78:e7:d1:23:62:95
+    properties:
+      cpu_arch: x86_64
+      cpus: '24'
+      disk_size: '1800'
+      ram: 96676
+    uuid: e9220599-54a6-4bc7-ae4a-60d61fd47bb8
+  compute025.hpuswest.ic.openstack.org:
+    driver: agent_ipmitool
+    driver_info:
+      power:
+        ipmi_address: 10.10.16.30
+        ipmi_username: Administrator
+    ipv4_public_address: 15.184.52.125
+    ipv4_address: 10.10.16.175
+    name: compute025.hpuswest.ic.openstack.org
+    nics:
+    - mac: 78:e7:d1:23:99:0d
+    properties:
+      cpu_arch: x86_64
+      cpus: '24'
+      disk_size: '1800'
+      ram: 96676
+    uuid: 4c717b30-c2d1-43be-b499-eeddeb760576
+  compute026.hpuswest.ic.openstack.org:
+    driver: agent_ipmitool
+    driver_info:
+      power:
+        ipmi_address: 10.10.16.8
+        ipmi_username: Administrator
+    ipv4_public_address: 15.184.52.126
+    ipv4_address: 10.10.16.176
+    name: compute026.hpuswest.ic.openstack.org
+    nics:
+    - mac: 78:e7:d1:22:d5:94
+    properties:
+      cpu_arch: x86_64
+      cpus: '24'
+      disk_size: '1800'
+      ram: '96676'
+    uuid: 5519d63e-edb5-44b8-a3d2-5291d52811b6
+  compute027.hpuswest.ic.openstack.org:
+    driver: agent_ipmitool
+    driver_info:
+      power:
+        ipmi_address: 10.10.16.11
+        ipmi_username: Administrator
+    ipv4_public_address: 15.184.52.127
+    ipv4_address: 10.10.16.177
+    name: compute027.hpuswest.ic.openstack.org
+    nics:
+    - mac: 78:e7:d1:23:61:0d
+    properties:
+      cpu_arch: x86_64
+      cpus: '24'
+      disk_size: '1800'
+      ram: '96676'
+    uuid: dbd6cbdf-cee3-4deb-8918-47120610400e
+  compute028.hpuswest.ic.openstack.org:
+    driver: agent_ipmitool
+    driver_info:
+      power:
+        ipmi_address: 10.10.16.9
+        ipmi_username: Administrator
+    ipv4_public_address: 15.184.52.128
+    ipv4_address: 10.10.16.178
+    name: compute028.hpuswest.ic.openstack.org
+    nics:
+    - mac: 78:e7:d1:23:93:15
+    properties:
+      cpu_arch: x86_64
+      cpus: '24'
+      disk_size: '1800'
+      ram: 96676
+    uuid: 3334a4a2-3ba8-440f-930c-32eceb6974e5
+  compute029.hpuswest.ic.openstack.org:
+    driver: agent_ipmitool
+    driver_info:
+      power:
+        ipmi_address: 10.10.16.49
+        ipmi_username: Administrator
+    ipv4_public_address: 15.184.52.129
+    ipv4_address: 10.10.16.179
+    name: compute029.hpuswest.ic.openstack.org
+    nics:
+    - mac: 78:e7:d1:23:15:34
+    properties:
+      cpu_arch: x86_64
+      cpus: '24'
+      disk_size: '1800'
+      ram: '96676'
+    uuid: f32b231c-7643-4231-a4cb-d2d4e35fecf3
+  compute030.hpuswest.ic.openstack.org:
+    driver: agent_ipmitool
+    driver_info:
+      power:
+        ipmi_address: 10.10.16.14
+        ipmi_username: Administrator
+    ipv4_public_address: 15.184.52.130
+    ipv4_address: 10.10.16.180
+    name: compute030.hpuswest.ic.openstack.org
+    nics:
+    - mac: 78:e7:d1:23:63:75
+    properties:
+      cpu_arch: x86_64
+      cpus: '24'
+      disk_size: '1800'
+      ram: 96676
+    uuid: fef8db84-d7cf-476b-a883-48ba79675c5c
+  compute031.hpuswest.ic.openstack.org:
+    driver: agent_ipmitool
+    driver_info:
+      power:
+        ipmi_address: 10.10.16.37
+        ipmi_username: Administrator
+    ipv4_public_address: 15.184.52.131
+    ipv4_address: 10.10.16.181
+    name: compute031.hpuswest.ic.openstack.org
+    nics:
+    - mac: 78:e7:d1:23:9a:2d
+    properties:
+      cpu_arch: x86_64
+      cpus: '24'
+      disk_size: '1800'
+      ram: '96676'
+    uuid: fc6861a4-95f6-4e5a-b303-6d43a4d21dfa
+  compute032.hpuswest.ic.openstack.org:
+    driver: agent_ipmitool
+    driver_info:
+      power:
+        ipmi_address: 10.10.16.29
+        ipmi_username: Administrator
+    ipv4_public_address: 15.184.52.132
+    ipv4_address: 10.10.16.182
+    name: compute032.hpuswest.ic.openstack.org
+    nics:
+    - mac: 78:e7:d1:23:9d:9d
+    properties:
+      cpu_arch: x86_64
+      cpus: '24'
+      disk_size: '1800'
+      ram: '96676'
+    uuid: 0cb0676c-cd26-4ebc-ad78-1a0d6aa26808
+  compute033.hpuswest.ic.openstack.org:
+    driver: agent_ipmitool
+    driver_info:
+      power:
+        ipmi_address: 10.10.16.47
+        ipmi_username: Administrator
+    ipv4_public_address: 15.184.52.133
+    ipv4_address: 10.10.16.183
+    name: compute033.hpuswest.ic.openstack.org
+    nics:
+    - mac: 78:e7:d1:23:92:ed
+    properties:
+      cpu_arch: x86_64
+      cpus: '24'
+      disk_size: '1800'
+      ram: 96676
+    uuid: 49d5d5ba-a249-4d65-8bb0-749765a3a5bb
+  compute034.hpuswest.ic.openstack.org:
+    driver: agent_ipmitool
+    driver_info:
+      power:
+        ipmi_address: 10.10.16.22
+        ipmi_username: Administrator
+    ipv4_public_address: 15.184.52.134
+    ipv4_address: 10.10.16.184
+    name: compute034.hpuswest.ic.openstack.org
+    nics:
+    - mac: 78:e7:d1:23:98:05
+    properties:
+      cpu_arch: x86_64
+      cpus: '24'
+      disk_size: '1800'
+      ram: 96676
+    uuid: 6dbfed9d-d4d0-4a13-93bb-8c3ab26f7004
+  compute035.hpuswest.ic.openstack.org:
+    driver: agent_ipmitool
+    driver_info:
+      power:
+        ipmi_address: 10.10.16.32
+        ipmi_username: Administrator
+    ipv4_public_address: 15.184.52.135
+    ipv4_address: 10.10.16.185
+    name: compute035.hpuswest.ic.openstack.org
+    nics:
+    - mac: 78:e7:d1:23:4b:f5
+    properties:
+      cpu_arch: x86_64
+      cpus: '24'
+      disk_size: '1800'
+      ram: '96676'
+    uuid: 11335bc4-d0ab-4693-88a9-64177a0b6e60
+  compute036.hpuswest.ic.openstack.org:
+    driver: agent_ipmitool
+    driver_info:
+      power:
+        ipmi_address: 10.10.16.28
+        ipmi_username: Administrator
+    ipv4_public_address: 15.184.52.136
+    ipv4_address: 10.10.16.186
+    name: compute036.hpuswest.ic.openstack.org
+    nics:
+    - mac: 78:e7:d1:23:9d:7d
+    properties:
+      cpu_arch: x86_64
+      cpus: '24'
+      disk_size: '1800'
+      ram: '96676'
+    uuid: e650d06b-dfa9-42be-8c5b-34229934bf4b
+  compute037.hpuswest.ic.openstack.org:
+    driver: agent_ipmitool
+    driver_info:
+      power:
+        ipmi_address: 10.10.16.40
+        ipmi_username: Administrator
+    ipv4_public_address: 15.184.52.137
+    ipv4_address: 10.10.16.187
+    name: compute037.hpuswest.ic.openstack.org
+    nics:
+    - mac: 78:e7:d1:23:af:ac
+    properties:
+      cpu_arch: x86_64
+      cpus: '24'
+      disk_size: '1800'
+      ram: 96676
+    uuid: 4122dd74-0bbf-49db-ba4b-4c1afda1f8a6
+    disabled: true # needs IPMI password reset
+  compute038.hpuswest.ic.openstack.org:
+    driver: agent_ipmitool
+    driver_info:
+      power:
+        ipmi_address: 10.10.16.25
+        ipmi_username: Administrator
+    ipv4_public_address: 15.184.52.138
+    ipv4_address: 10.10.16.188
+    name: compute038.hpuswest.ic.openstack.org
+    nics:
+    - mac: 78:e7:d1:23:95:65
+    properties:
+      cpu_arch: x86_64
+      cpus: '24'
+      disk_size: '1800'
+      ram: '96676'
+    uuid: 42fe827f-e567-4c17-8b74-4c28f93728d4
+  compute039.hpuswest.ic.openstack.org:
+    driver: agent_ipmitool
+    driver_info:
+      power:
+        ipmi_address: 10.10.16.20
+        ipmi_username: Administrator
+    ipv4_public_address: 15.184.52.139
+    ipv4_address: 10.10.16.189
+    name: compute039.hpuswest.ic.openstack.org
+    nics:
+    - mac: 78:e7:d1:23:93:f5
+    properties:
+      cpu_arch: x86_64
+      cpus: '24'
+      disk_size: '1800'
+      ram: 96676
+    uuid: 54a174f6-173e-4250-bbcf-0103d9b99346
+    disabled: true # disk errors
+  compute040.hpuswest.ic.openstack.org:
+    driver: agent_ipmitool
+    driver_info:
+      power:
+        ipmi_address: 10.10.16.4
+        ipmi_username: Administrator
+    ipv4_public_address: 15.184.52.140
+    ipv4_address: 10.10.16.190
+    name: compute040.hpuswest.ic.openstack.org
+    nics:
+    - mac: 78:e7:d1:23:94:95
+    properties:
+      cpu_arch: x86_64
+      cpus: '24'
+      disk_size: '1800'
+      ram: 96676
+    uuid: b3d510c9-110c-49db-ba9d-a0d8e893eb24
+    disabled: true # needs iLO firmware upgrade
+  compute041.hpuswest.ic.openstack.org:
+    driver: agent_ipmitool
+    driver_info:
+      power:
+        ipmi_address: 10.10.16.13
+        ipmi_username: Administrator
+    ipv4_public_address: 15.184.52.141
+    ipv4_address: 10.10.16.191
+    name: compute041.hpuswest.ic.openstack.org
+    nics:
+    - mac: 78:e7:d1:23:95:dd
+    properties:
+      cpu_arch: x86_64
+      cpus: '24'
+      disk_size: '1800'
+      ram: 96676
+    uuid: c8119dcc-84a8-4263-a5c3-418a20e3afe4
+  compute042.hpuswest.ic.openstack.org:
+    driver: agent_ipmitool
+    driver_info:
+      power:
+        ipmi_address: 10.10.16.24
+        ipmi_username: Administrator
+    ipv4_public_address: 15.184.52.142
+    ipv4_address: 10.10.16.192
+    name: compute042.hpuswest.ic.openstack.org
+    nics:
+    - mac: 78:e7:d1:23:9b:b5
+    properties:
+      cpu_arch: x86_64
+      cpus: '24'
+      disk_size: '1800'
+      ram: 96676
+    uuid: 1f38e82d-0836-4cf1-9351-f76b9a16efa7
+  compute043.hpuswest.ic.openstack.org:
+    driver: agent_ipmitool
+    driver_info:
+      power:
+        ipmi_address: 10.10.16.48
+        ipmi_username: Administrator
+    ipv4_public_address: 15.184.52.143
+    ipv4_address: 10.10.16.193
+    name: compute043.hpuswest.ic.openstack.org
+    nics:
+    - mac: 78:e7:d1:23:93:fd
+    properties:
+      cpu_arch: x86_64
+      cpus: '24'
+      disk_size: '1800'
+      ram: 96676
+    uuid: fce5f6df-ad12-42d4-ad9a-1f0642eba21a
+  controller00.hpuswest.ic.openstack.org:
+    driver: agent_ipmitool
+    driver_info:
+      power:
+        ipmi_address: 10.10.16.5
+        ipmi_username: Administrator
+    ipv4_public_address: 15.184.52.4
+    ipv4_address: 10.10.16.146
+    name: controller00.hpuswest.ic.openstack.org
+    nics:
+    - mac: 78:e7:d1:23:94:cd
+    properties:
+      cpu_arch: x86_64
+      cpus: '24'
+      disk_size: '1800'
+      ram: 96676
+    uuid: 1df8345b-168c-4f7d-b6ad-d33a3afa9239
+  controller01.hpuswest.ic.openstack.org:
+    driver: agent_ipmitool
+    driver_info:
+      power:
+        ipmi_address: 10.10.16.43
+        ipmi_username: Administrator
+    ipv4_public_address: 15.184.52.5
+    ipv4_address: 10.10.16.147
+    name: controller01.hpuswest.ic.openstack.org
+    nics:
+    - mac: 78:e7:d1:23:99:35
+    properties:
+      cpu_arch: x86_64
+      cpus: '24'
+      disk_size: '1800'
+      ram: 96676
+    uuid: 1d937491-56b6-4eb9-bc73-720a8af1c788
diff --git a/manifests/site.pp b/manifests/site.pp
index be004a1e14..e590173620 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -1188,4 +1188,28 @@ node /^compute\d{3}\.hpuswest\.ic\.openstack\.org$/ {
   }
 }
 
+# Node-OS: trusty
+# Upgrade-Modules
+node /^baremetal\d{2}\.hpuswest\.ic\.openstack\.org$/ {
+  $group = 'infracloud'
+  class { '::openstack_project::server':
+    iptables_public_tcp_ports => [80],
+    iptables_public_udp_ports => [67,69],
+    sysadmins                 => hiera('sysadmins', []),
+    enable_unbound            => false,
+  }
+
+  class { '::openstack_project::infracloud::baremetal':
+    ironic_inventory   => hiera('ironic_inventory_hpuswest', {}),
+    ironic_db_password => hiera('ironic_db_password'),
+    mysql_password     => hiera('bifrost_mysql_password'),
+    region             => 'hpuswest',
+    ipmi_passwords     => hiera('ipmi_west_passwords'),
+    ssh_private_key    => hiera('bifrost_hpuswest_ssh_private_key'),
+    ssh_public_key     => hiera('bifrost_hpuswest_ssh_public_key'),
+    vlan               => 25,
+    gateway_ip         => '15.184.52.1',
+  }
+}
+
 # vim:sw=2:ts=2:expandtab:textwidth=79
diff --git a/modules/openstack_project/manifests/infracloud/baremetal.pp b/modules/openstack_project/manifests/infracloud/baremetal.pp
new file mode 100644
index 0000000000..75d8947bf9
--- /dev/null
+++ b/modules/openstack_project/manifests/infracloud/baremetal.pp
@@ -0,0 +1,25 @@
+# == Class: openstack_project::baremetal
+#
+class openstack_project::infracloud::baremetal (
+  $ironic_inventory,
+  $ironic_db_password,
+  $ipmi_passwords,
+  $mysql_password,
+  $region,
+  $ssh_private_key,
+  $ssh_public_key,
+  $vlan,
+  $gateway_ip,
+) {
+  class { '::infracloud::bifrost':
+    ironic_inventory     => $ironic_inventory,
+    ironic_db_password   => $ironic_db_password,
+    mysql_password       => $mysql_password,
+    region               => $region,
+    ipmi_passwords       => $ipmi_passwords,
+    ssh_private_key      => $ssh_private_key,
+    ssh_public_key       => $ssh_public_key,
+    vlan                 => $vlan,
+    gateway_ip           => $gateway_ip,
+  }
+}
diff --git a/run_bifrost.sh b/run_bifrost.sh
new file mode 100755
index 0000000000..ef910f8000
--- /dev/null
+++ b/run_bifrost.sh
@@ -0,0 +1,31 @@
+#!/bin/bash
+
+# Copyright 2014 Hewlett-Packard Development Company, L.P.
+#
+# Licensed under the Apache License, Version 2.0 (the "License"); you may
+# not use this file except in compliance with the License. You may obtain
+# a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+# License for the specific language governing permissions and limitations
+# under the License.
+
+set -e
+
+export BIFROST_INVENTORY_SOURCE=/opt/stack/baremetal.json
+
+apt-get update
+
+# Enroll-dynamic
+ansible-playbook -e @/etc/bifrost/bifrost_global_vars -vvvv \
+    -i /opt/stack/bifrost/playbooks/inventory/bifrost_inventory.py \
+    /opt/stack/bifrost/playbooks/enroll-dynamic.yaml
+
+# Deploy-dynamic
+ansible-playbook -e @/etc/bifrost/bifrost_global_vars -vvvv \
+    -i /opt/stack/bifrost/playbooks/inventory/bifrost_inventory.py \
+    /opt/stack/bifrost/playbooks/deploy-dynamic.yaml