From: Yolanda Robla Mota <yroblamo@redhat.com>
Date: Fri, 16 Sep 2016 15:32:44 +0000 (+0200)
Subject: Add baremetal node for puppet-infracloud
X-Git-Tag: colorado.1.0~22^2
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?p=releng.git;a=commitdiff_plain;h=282c226c7d8485b4599106a17d97f4c5f087b9a3

Add baremetal node for puppet-infracloud

Change-Id: Ie18b25634016dcc98ec83e30c51b4c386ffd9ecc
Signed-Off-By: Yolanda Robla <yroblamo@redhat.com>
---

diff --git a/prototypes/puppet-infracloud/manifests/site.pp b/prototypes/puppet-infracloud/manifests/site.pp
index 1bbd282ee..2cb12a3cd 100644
--- a/prototypes/puppet-infracloud/manifests/site.pp
+++ b/prototypes/puppet-infracloud/manifests/site.pp
@@ -68,3 +68,29 @@ node 'jumphost.opnfvlocal' {
     purge_apt_sources         => false,
   }
 }
+
+node 'baremetal.opnfvlocal' {
+  class { '::opnfv::server':
+    iptables_public_udp_ports => [67, 69],
+    sysadmins                 => hiera('sysadmins', []),
+    enable_unbound            => false,
+    purge_apt_sources         => false,
+  }
+
+  class { '::infracloud::bifrost':
+    ironic_inventory          => hiera('ironic_inventory', {}),
+    ironic_db_password        => hiera('ironic_db_password'),
+    mysql_password            => hiera('bifrost_mysql_password'),
+    ipmi_passwords            => hiera('ipmi_passwords'),
+    ssh_private_key           => hiera('bifrost_ssh_private_key'),
+    ssh_public_key            => hiera('bifrost_ssh_public_key'),
+    vlan                      => hiera('infracloud_vlan'),
+    gateway_ip                => hiera('infracloud_gateway_ip'),
+    default_network_interface => hiera('default_network_interface'),
+    dhcp_pool_start           => hiera('dhcp_pool_start'),
+    dhcp_pool_end             => hiera('dhcp_pool_end'),
+    network_interface         => hiera('network_interface'),
+    ipv4_nameserver           => hiera('ipv4_nameserver'),
+    ipv4_subnet_mask          => hiera('ipv4_subnet_mask'),
+  }
+}
diff --git a/prototypes/puppet-infracloud/modules.env b/prototypes/puppet-infracloud/modules.env
index 2df81ecc4..9c07ec9b2 100644
--- a/prototypes/puppet-infracloud/modules.env
+++ b/prototypes/puppet-infracloud/modules.env
@@ -37,6 +37,7 @@ SOURCE_MODULES["$OPENSTACK_GIT_ROOT/openstack/puppet-nova"]="origin/stable/mitak
 SOURCE_MODULES["$OPENSTACK_GIT_ROOT/openstack/puppet-openstack_extras"]="origin/stable/mitaka"
 SOURCE_MODULES["$OPENSTACK_GIT_ROOT/openstack/puppet-openstacklib"]="origin/stable/mitaka"
 
+SOURCE_MODULES["https://git.openstack.org/openstack-infra/puppet-vcsrepo"]="0.0.8"
 SOURCE_MODULES["https://github.com/duritong/puppet-sysctl"]="v0.0.11"
 SOURCE_MODULES["https://github.com/nanliu/puppet-staging"]="1.0.0"
 SOURCE_MODULES["https://github.com/jfryman/puppet-selinux"]="v0.2.5"
@@ -63,9 +64,11 @@ SOURCE_MODULES["https://github.com/voxpupuli/puppet-nodejs"]="1.2.0"
 SOURCE_MODULES["https://github.com/voxpupuli/puppet-puppetboard"]="2.4.0"
 
 
+INTEGRATION_MODULES["$OPENSTACK_GIT_ROOT/openstack-infra/puppet-ansible"]="origin/master"
 INTEGRATION_MODULES["$OPENSTACK_GIT_ROOT/openstack-infra/puppet-httpd"]="origin/master"
 INTEGRATION_MODULES["$OPENSTACK_GIT_ROOT/openstack-infra/puppet-infracloud"]="origin/master"
 INTEGRATION_MODULES["$OPENSTACK_GIT_ROOT/openstack-infra/puppet-iptables"]="origin/master"
+INTEGRATION_MODULES["$OPENSTACK_GIT_ROOT/openstack-infra/puppet-logrotate"]="origin/master"
 INTEGRATION_MODULES["$OPENSTACK_GIT_ROOT/openstack-infra/puppet-pip"]="origin/master"
 INTEGRATION_MODULES["$OPENSTACK_GIT_ROOT/openstack-infra/puppet-snmpd"]="origin/master"
 INTEGRATION_MODULES["$OPENSTACK_GIT_ROOT/openstack-infra/puppet-ssh"]="origin/master"