summaryrefslogtreecommitdiffstats
path: root/prototypes/puppet-infracloud/manifests
diff options
context:
space:
mode:
authorYolanda Robla Mota <yroblamo@redhat.com>2016-10-04 17:32:11 +0200
committerFatih Degirmenci <fatih.degirmenci@ericsson.com>2016-10-05 09:15:15 +0000
commit401d922759aafb670954b3f92eec7273e67acd3d (patch)
treeb17324ca3819f81b83e023967718c62e595a37d1 /prototypes/puppet-infracloud/manifests
parent3ea7b3944090beb21e7dc8bc16f638e14498cc58 (diff)
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>
Diffstat (limited to 'prototypes/puppet-infracloud/manifests')
-rw-r--r--prototypes/puppet-infracloud/manifests/site.pp10
1 files changed, 4 insertions, 6 deletions
diff --git a/prototypes/puppet-infracloud/manifests/site.pp b/prototypes/puppet-infracloud/manifests/site.pp
index 70901e696..f09bfe2e9 100644
--- 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'),
}
}