From 4ff84638ab1fd39b6c907ed2899227462da358cf Mon Sep 17 00:00:00 2001 From: Giulio Fidente Date: Mon, 14 Dec 2015 20:08:46 +0100 Subject: Align template defaults with the client This aligns the parameter default values from python-tripleoclient with tripleo-heat-templates. This is in preparation for removing all the defaults from the client, and maintaining them only in the templates. Change-Id: I7b635a250f1ecc170e18d8e434f0118c6fcbb942 Co-Authored-By: James Slagle --- puppet/compute.yaml | 4 ++-- puppet/controller.yaml | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) (limited to 'puppet') diff --git a/puppet/compute.yaml b/puppet/compute.yaml index 43ef5820..10ae4c33 100644 --- a/puppet/compute.yaml +++ b/puppet/compute.yaml @@ -103,7 +103,7 @@ parameters: description: The tenant network type for Neutron. default: 'vxlan' NeutronNetworkVLANRanges: - default: 'datacentre' + default: 'datacentre:1:1000' description: > The Neutron ML2 and OpenVSwitch vlan mapping range to support. See the Neutron documentation for permitted values. Defaults to permitting any @@ -200,7 +200,7 @@ parameters: type: json NovaComputeLibvirtType: type: string - default: '' + default: kvm NovaComputeLibvirtVifDriver: default: '' description: Libvirt VIF driver configuration for the network diff --git a/puppet/controller.yaml b/puppet/controller.yaml index e405333d..9b48cf59 100644 --- a/puppet/controller.yaml +++ b/puppet/controller.yaml @@ -82,7 +82,7 @@ parameters: set via parameter_defaults in the resource registry. type: json CloudName: - default: '' + default: overcloud description: The DNS name of this cloud. E.g. ci-overcloud.tripleo.org type: string ControllerExtraConfig: @@ -422,7 +422,7 @@ parameters: description: The tenant network type for Neutron. type: comma_delimited_list NeutronNetworkVLANRanges: - default: 'datacentre' + default: 'datacentre:1:1000' description: > The Neutron ML2 and OpenVSwitch vlan mapping range to support. See the Neutron documentation for permitted values. Defaults to permitting any -- cgit 1.2.3-korg