diff options
| author |   Jenkins <jenkins@review.openstack.org> | 2016-01-06 09:04:18 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <review@openstack.org> | 2016-01-06 09:04:18 +0000 |
| commit | 6746cb80f32032d2d205ea1a7d15c2f5a06a2843 (patch) | |
| tree | a39df2724b91e61ca6fa6f2fd1da10b0024eaf89 /puppet | |
| parent | 1dcfdab92067afe30cf26edb27f384a01b8809c2 (diff) | |
| parent | 4ff84638ab1fd39b6c907ed2899227462da358cf (diff) | |
Merge "Align template defaults with the client"
Diffstat (limited to 'puppet')
| -rw-r--r-- | puppet/compute.yaml | 4 | ||||
| -rw-r--r-- | puppet/controller.yaml | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/puppet/compute.yaml b/puppet/compute.yaml index 0d3e0754..7269d736 100644 --- a/puppet/compute.yaml +++ b/puppet/compute.yaml @@ -100,7 +100,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 @@ -195,7 +195,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 8e013400..0d5443b9 100644 --- a/puppet/controller.yaml +++ b/puppet/controller.yaml @@ -85,7 +85,7 @@ parameters: description: Number of workers for Cinder service. type: number CloudName: - default: '' + default: overcloud description: The DNS name of this cloud. E.g. ci-overcloud.tripleo.org type: string ControllerExtraConfig: @@ -442,7 +442,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 |