diff options
| author |   Jenkins <jenkins@review.openstack.org> | 2015-04-27 14:21:00 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <review@openstack.org> | 2015-04-27 14:21:00 +0000 |
| commit | 645b447b86ef9dbc37c46958b3e08b3ac65e3762 (patch) | |
| tree | 1f9d187a131812f59142afdd7f36f5d49475011a /puppet | |
| parent | 476a1b347d85c5fb119d428159e9dcd498f0bbd3 (diff) | |
| parent | 95889dd4ee035d466eb9e5b26a1f2a75ce7847d7 (diff) | |
Merge "Make all default values match overcloud defaults"
Diffstat (limited to 'puppet')
| -rw-r--r-- | puppet/cinder-storage-puppet.yaml | 4 | ||||
| -rw-r--r-- | puppet/compute-puppet.yaml | 6 | ||||
| -rw-r--r-- | puppet/controller-puppet.yaml | 4 |
3 files changed, 7 insertions, 7 deletions
diff --git a/puppet/cinder-storage-puppet.yaml b/puppet/cinder-storage-puppet.yaml index b59385ac..de96809a 100644 --- a/puppet/cinder-storage-puppet.yaml +++ b/puppet/cinder-storage-puppet.yaml @@ -75,10 +75,10 @@ parameters: description: Name of an existing EC2 KeyPair to enable SSH access to the instances type: string RabbitPassword: - default: '' + default: 'guest' type: string RabbitUserName: - default: '' + default: 'guest' type: string RabbitClientUseSSL: default: false diff --git a/puppet/compute-puppet.yaml b/puppet/compute-puppet.yaml index 4d9ff62f..a31ea858 100644 --- a/puppet/compute-puppet.yaml +++ b/puppet/compute-puppet.yaml @@ -110,13 +110,13 @@ parameters: network) - if changing this either use different post-install network scripts or be sure to keep 'datacentre' as a mapping network name. type: string - default: "" + default: "datacentre:br-ex" NeutronEnableTunnelling: type: string default: "True" NeutronFlatNetworks: type: string - default: '' + default: 'datacentre' description: > If set, flat networks to configure in neutron plugins. NeutronHost: @@ -139,7 +139,7 @@ parameters: type: string hidden: true NeutronPhysicalBridge: - default: '' + default: 'br-ex' description: An OVS bridge to create for accessing external networks. type: string NeutronPublicInterface: diff --git a/puppet/controller-puppet.yaml b/puppet/controller-puppet.yaml index 9ecce0e1..4e04eb0e 100644 --- a/puppet/controller-puppet.yaml +++ b/puppet/controller-puppet.yaml @@ -221,7 +221,7 @@ parameters: network) - if changing this either use different post-install network scripts or be sure to keep 'datacentre' as a mapping network name. type: string - default: "" + default: "datacentre:br-ex" NeutronDnsmasqOptions: default: 'dhcp-option-force=26,1400' description: Dnsmasq options for neutron-dhcp-agent. The default value here forces MTU to be set to 1400 to account for the gre tunnel overhead. @@ -257,7 +257,7 @@ parameters: default: "True" NeutronFlatNetworks: type: string - default: '' + default: 'datacentre' description: If set, flat networks to configure in neutron plugins. NeutronL3HA: default: 'False' |