diff options
| -rw-r--r-- | controller.yaml | 2 | ||||
| -rw-r--r-- | environments/net-bond-with-vlans.yaml | 6 | ||||
| -rw-r--r-- | environments/net-single-nic-with-vlans.yaml | 6 | ||||
| -rw-r--r-- | overcloud-without-mergepy.yaml | 2 | ||||
| -rw-r--r-- | puppet/controller-puppet.yaml | 2 | ||||
| -rw-r--r-- | puppet/hieradata/volume.yaml | 6 | ||||
| -rw-r--r-- | puppet/manifests/overcloud_volume.pp | 1 |
7 files changed, 20 insertions, 5 deletions
diff --git a/controller.yaml b/controller.yaml index 5983a41e..ae60e910 100644 --- a/controller.yaml +++ b/controller.yaml @@ -256,7 +256,7 @@ parameters: MysqlMaxConnections: description: Configures MySQL max_connections config setting type: number - default: 1024 + default: 4096 MysqlRootPassword: type: string hidden: true diff --git a/environments/net-bond-with-vlans.yaml b/environments/net-bond-with-vlans.yaml index 73f71324..9600fc7e 100644 --- a/environments/net-bond-with-vlans.yaml +++ b/environments/net-bond-with-vlans.yaml @@ -12,7 +12,11 @@ resource_registry: OS::TripleO::ObjectStorage::Net::SoftwareConfig: ../network/config/bond-with-vlans/swift-storage.yaml OS::TripleO::CephStorage::Net::SoftwareConfig: ../network/config/bond-with-vlans/ceph-storage.yaml -parameters: +# We use parameter_defaults instead of parameters here because Tuskar munges +# the names of top level and role level parameters with the role name and a +# version. Using parameter_defaults makes it such that if the parameter name is +# not defined in the template, we don't get an error. +parameter_defaults: # This sets 'external_network_bridge' in l3_agent.ini to an empty string # so that external networks act like provider bridge networks (they # will plug into br-int instead of br-ex) diff --git a/environments/net-single-nic-with-vlans.yaml b/environments/net-single-nic-with-vlans.yaml index 8561acd3..bdfeadd3 100644 --- a/environments/net-single-nic-with-vlans.yaml +++ b/environments/net-single-nic-with-vlans.yaml @@ -12,7 +12,11 @@ resource_registry: OS::TripleO::ObjectStorage::Net::SoftwareConfig: ../network/config/single-nic-vlans/swift-storage.yaml OS::TripleO::CephStorage::Net::SoftwareConfig: ../network/config/single-nic-vlans/ceph-storage.yaml -parameters: +# We use parameter_defaults instead of parameters here because Tuskar munges +# the names of top level and role level parameters with the role name and a +# version. Using parameter_defaults makes it such that if the parameter name is +# not defined in the template, we don't get an error. +parameter_defaults: # This sets 'external_network_bridge' in l3_agent.ini to an empty string # so that external networks act like provider bridge networks (they # will plug into br-int instead of br-ex) diff --git a/overcloud-without-mergepy.yaml b/overcloud-without-mergepy.yaml index d4dd5a1f..5e1470f0 100644 --- a/overcloud-without-mergepy.yaml +++ b/overcloud-without-mergepy.yaml @@ -398,7 +398,7 @@ parameters: MysqlMaxConnections: description: Configures MySQL max_connections config setting type: number - default: 1024 + default: 4096 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 tunnel overhead. diff --git a/puppet/controller-puppet.yaml b/puppet/controller-puppet.yaml index d88e54b5..bd8823ad 100644 --- a/puppet/controller-puppet.yaml +++ b/puppet/controller-puppet.yaml @@ -228,7 +228,7 @@ parameters: MysqlMaxConnections: description: Configures MySQL max_connections config setting type: number - default: 1024 + default: 4096 MysqlRootPassword: type: string hidden: true diff --git a/puppet/hieradata/volume.yaml b/puppet/hieradata/volume.yaml index 9f3907ef..f4cd78a9 100644 --- a/puppet/hieradata/volume.yaml +++ b/puppet/hieradata/volume.yaml @@ -3,4 +3,10 @@ # cinder cinder::scheduler::scheduler_driver: cinder.scheduler.filter_scheduler.FilterScheduler +cinder::config::cinder_config: + DEFAULT/nova_catalog_info: + value: 'compute:Compute Service:internalURL' + DEFAULT/swift_catalog_info: + value: 'object-store:swift:internalURL' + volume_classes: []
\ No newline at end of file diff --git a/puppet/manifests/overcloud_volume.pp b/puppet/manifests/overcloud_volume.pp index 2ef0884b..f5c9ae5d 100644 --- a/puppet/manifests/overcloud_volume.pp +++ b/puppet/manifests/overcloud_volume.pp @@ -31,6 +31,7 @@ if count(hiera('ntp::servers')) > 0 { } include ::cinder +include ::cinder::config include ::cinder::glance include ::cinder::volume include ::cinder::setup_test_volume |