Merge "Add missing hiera vars for bifrost"

2 files changed, 87 insertions, 3 deletions

diff --git a/prototypes/puppet-infracloud/hiera/common.yaml b/prototypes/puppet-infracloud/hiera/common.yaml
index 1fcde2f75..9357b6489 100644
--- a/prototypes/puppet-infracloud/hiera/common.yaml
+++ b/prototypes/puppet-infracloud/hiera/common.yaml
@@ -76,5 +76,89 @@ hosts:
   compute00.opnfvlocal:
     ip: 192.168.122.4
 
-# br-eth0 for debian, br_ens3 for RHEL
-bridge_name: br-eth0
+# settings for bifrost
+bridge_name: br_opnfv
+ironic_db_password: pass
+bifrost_mysql_password: pass
+bifrost_ssh_private_key: |
+  -----BEGIN RSA PRIVATE KEY-----
+  MIIEowIBAAKCAQEAvwr2LbfJQuKZDOQse+DQHX84c9LCHvQfy0pu15JkiLM5dUtx
+  hLr/5fxSzblubS4WkNZVsGTtUp51f8yoQyltqquGlVfUf0GO+PCLaRp0arhli0Rl
+  sAGatI12amnrVap82jINiKQRO+UnF97z2hiB35Zxko4jSaPOOiL48DEKowZHL2Ja
+  jjUt6dXcaNotXNaKZpcxz92gdZhFOPU8BrJ/mI9k9u6QI/4qLG/WzW4frHLigA1t
+  OrZ3Nnu3tloWNsS1lh71KRfEv46VD8tCAZfXqJtjdH4Z4AUO++CLF/K4zXhIoFqU
+  Wf8aS64YzoaAfnJ+jUwKs92dVjuFtbEk+t2YLQIDAQABAoIBAQCAr++YaD6oUV9r
+  caANaiiGVhY+3u9oTmXEWMVFbRVPh/riaglzsUuDLm7QqWIbJXqJ4fcitTmv95GK
+  nt+RLizzVEt5+gnoFs8qHU6rY+ibos6z+0TMRKhjiw8DK4oc0JT9nc3EB1CcmgW1
+  bLeyZ+PEKuEiKaDXkAHw43HwyfgyS3Lc90TSaLj3P7egsBuhx1Yy+wgyiPQ/bF0b
+  OBLHHK+nwYLGAq25n/+zA7XAndc2OQd4KzUJcvjyND+IMYnzEbeFH36UcFqbvgGu
+  nR55yIrCxsxcJhhT2slMNtg/xCmo3Jzz1kNBtwbNBik4/5Lkckny0xhQl+h7vz9U
+  +cKjwfK5AoGBAPSy/JHMeQ5/rzbA5LAZhVa/Yc4B5datkwLNg6mh4CzMabJs8AKd
+  de05XB/Nq6Hfp8Aa7zLt2GIb3iqF6w/y+j8YAXS2KQD8/HDs2/9Oxr512kfssk5D
+  dcpTqeIFetzM9pqnctVXBGlbz0QLeL+lT3kXY00+CBm6LjEv8dsPxZr3AoGBAMfd
+  nDnTjUVZ+sRpTBDM3MhKLMETxNWNDaozL+SgpYQwtKlSTfQVdFcM66a8qCFjQFsc
+  /6AjL0bjCA5u859IoQ4ValD0vgkyLHdEN0P1Grf3MK8kjOW1A1s1i2FY6U0z9AM2
+  zsUCA9bB5A9wwxwofoa8VkaDpVSMITbakVoNxJj7AoGAImcft2fmBTHScoJAJLoR
+  0xZpK8t8gug4aQZ34luN5v5+RcWnINb+g3GzEA2cec+2B/5BbwmdiH2eiJ/3YnCo
+  2kIHwl7x+N+Ypk/GxmhO7Owo2j/e+b3mS6HjmpFmqrBuY2PzcyceyalMxKZQPbGC
+  MOYm4e88uFFCuUuiV0gqYhUCgYBmSFhCE6yxeCnoSEbgNicq7SLYMIjEDOqYVpfE
+  9h2ed9qM6IzyQ+SFBBy4+MVGSOfPeRis2DTCnz8pO8i7lEyvy2/cPFPgmue8pZFu
+  2smwqfUlPJxKlgdArzdEO18x3kubNXo9whk614EiEcAX8fVGeK3iak665Pe+fb5z
+  Cqa47wKBgDp3/dgtMneoePKNefy4a9vp5y4XKviC6GOrr0xpEM2ptZ+I7mUJcACN
+  KbaW0dPgtS1cApelmF73IAJRYbKMW7lQzql61IoGw4pGTIMPKerqRs/hTWYPZiSG
+  QHWf3iTV5uQr6cSRoUgkAUHVw2KTGad41RAhDp352iakZuNNBFga
+  -----END RSA PRIVATE KEY-----
+bifrost_ssh_public_key: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQC/CvYtt8lC4pkM5Cx74NAdfzhz0sIe9B/LSm7XkmSIszl1S3GEuv/l/FLNuW5tLhaQ1lWwZO1SnnV/zKhDKW2qq4aVV9R/QY748ItpGnRquGWLRGWwAZq0jXZqaetVqnzaMg2IpBE75ScX3vPaGIHflnGSjiNJo846IvjwMQqjBkcvYlqONS3p1dxo2i1c1opmlzHP3aB1mEU49TwGsn+Yj2T27pAj/iosb9bNbh+scuKADW06tnc2e7e2WhY2xLWWHvUpF8S/jpUPy0IBl9eom2N0fhngBQ774IsX8rjNeEigWpRZ/xpLrhjOhoB+cn6NTAqz3Z1WO4W1sST63Zgt yolanda@trasto
+infracloud_vlan: 415
+infracloud_gateway_ip: 172.30.13.1
+default_network_interface: eno3
+dchp_pool_start: 10.20.0.130
+dhcp_pool_end: 10.20.0.254
+network_interface: eno1
+ipv4_nameserver: 8.8.8.8
+ipv4_subnet_mask: 255.255.255.0
+ipv4_gateway: 172.30.13.1
+ironic_inventory:
+  controller000.opnfvlocal:
+    driver: agent_ipmitool
+    driver_info:
+      power:
+        ipmi_address: 172.30.8.90
+        ipmi_username: admin
+    provisioning_ipv4_address: 10.20.0.130
+    ipv4_address: 172.30.13.66
+    ansible_ssh_host: 172.30.13.66
+    ipv4_gateway: 172.30.13.1
+    ipv4_interface_mac: 00:1e:67:f9:9b:35
+    name: controller000.opnfvlocal
+    nics:
+    - mac: a4:bf:01:01:a9:fc
+    - mac: 00:1e:67:f6:9b:35
+    properties:
+      cpu_arch: x86_64
+      cpus: '44'
+      disk_size: '1800'
+      ram: '65536'
+    uuid: 00a22849-2442-e511-906e-0012795d96dd
+  compute000.opnfvlocal:
+    driver: agent_ipmitool
+    driver_info:
+      power:
+        ipmi_address: 172.30.8.91
+        ipmi_username: admin
+    provisioning_ipv4_address: 10.20.0.131
+    ipv4_address: 172.30.13.67
+    ansible_ssh_host: 172.30.13.67
+    ipv4_gateway: 172.30.13.1
+    ipv4_subnet_mask: 255.255.255.0
+    name: compute000.opnfvlocal
+    nics:
+    - mac: a4:bf:01:01:a9:d4
+    - mac: 00:1e:67:f6:9b:37
+    properties:
+      cpu_arch: x86_64
+      cpus: '44'
+      disk_size: '1800'
+      ram: '65536'
+    uuid: 0051e926-f242-e511-906e-0012795d96dd
+ipmi_passwords: {'172.30.8.90': 'octopus', '172.30.8.91': 'octopus'}
diff --git a/prototypes/puppet-infracloud/manifests/site.pp b/prototypes/puppet-infracloud/manifests/site.pp
index 31c45767f..ae229d8ee 100644
--- a/prototypes/puppet-infracloud/manifests/site.pp
+++ b/prototypes/puppet-infracloud/manifests/site.pp
@@ -73,7 +73,7 @@ node 'jumphost.opnfvlocal' {
   }
 }
 
-node 'baremetal.opnfvlocal' {
+node 'baremetal.opnfvlocal', 'lfpod5-jumpserver' {
   class { '::opnfv::server':
     iptables_public_udp_ports => [67, 69],
     sysadmins                 => hiera('sysadmins', []),