diff options
| author |   Yolanda Robla Mota <yroblamo@redhat.com> | 2016-10-04 17:32:11 +0200 |
|---|---|---|
| committer |   Trevor Bramwell <tbramwell@linuxfoundation.org> | 2017-08-11 12:56:12 -0700 |
| commit | 4fb2590c8c6a3aa3bd06208dade81b082e1e6831 (patch) | |
| tree | f8bb66c8c1c278aa5243946d44b964c6fd1c1b3c /puppet-infracloud/manifests | |
| parent | 4c0b388f5f5eac386d93fdd6c3d0207b40bdd206 (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 'puppet-infracloud/manifests')
| -rw-r--r-- | puppet-infracloud/manifests/site.pp | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/puppet-infracloud/manifests/site.pp b/puppet-infracloud/manifests/site.pp index 70901e69..f09bfe2e 100644 --- a/puppet-infracloud/manifests/site.pp +++ b/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'), } } |