Convert harcoded values to hiera ones

Settings like neutron config and virt type
will be different depending on environments.

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

diff --git a/prototypes/puppet-infracloud/hiera/common.yaml b/prototypes/puppet-infracloud/hiera/common.yaml
index 19460fb..6096b9c 100644 (file)
--- a/prototypes/puppet-infracloud/hiera/common.yaml
+++ b/prototypes/puppet-infracloud/hiera/common.yaml
@@ -163,3 +163,8 @@ ironic_inventory:
       ram: '65536'
     uuid: 0051e926-f242-e511-906e-0012795d96dd
 ipmi_passwords: {'172.30.8.90': 'octopus', '172.30.8.91': 'octopus'}
+neutron_subnet_cidr: '192.168.122.0/24'
+neutron_subnet_gateway: '192.168.122.1'
+neutron_subnet_allocation_pools:
+  - 'start=192.168.122.50,end=192.168.122.254'
+virt_type: 'qemu'

diff --git a/prototypes/puppet-infracloud/manifests/site.pp b/prototypes/puppet-infracloud/manifests/site.pp
index 70901e6..f09bfe2 100644 (file)
--- a/prototypes/puppet-infracloud/manifests/site.pp
+++ b/prototypes/puppet-infracloud/manifests/site.pp
@@ -34,11 +34,9 @@ node 'controller00.opnfvlocal' {
     ssl_cert_file_contents           => hiera('ssl_cert_file_contents'),
     br_name                          => hiera('bridge_name'),
     controller_public_address        => $::fqdn,
-    neutron_subnet_cidr              => '192.168.122.0/24',
-    neutron_subnet_gateway           => '192.168.122.1',
-    neutron_subnet_allocation_pools  => [
-                                          'start=192.168.122.50,end=192.168.122.254',
-                                        ],
+    neutron_subnet_cidr              => hiera('neutron_subnet_cidr'),
+    neutron_subnet_gateway           => hiera('neutron_subnet_gateway'),
+    neutron_subnet_allocation_pools  => hiera('neutron_subnet_allocation_pools'),
     opnfv_password                   => hiera('opnfv_password'),
   }
 }
@@ -61,7 +59,7 @@ node 'compute00.opnfvlocal' {
     ssl_key_file_contents            => hiera('ssl_key_file_contents'),
     br_name                          => hiera('bridge_name'),
     controller_public_address        => 'controller00.opnfvlocal',
-    virt_type                        => 'qemu',
+    virt_type                        => hiera('virt_type'),
   }
 }