Merge "Add maxconn parameter to MySQL / HAProxy"

2 files changed, 118 insertions, 0 deletions

diff --git a/spec/classes/tripleo_haproxy_spec.rb b/spec/classes/tripleo_haproxy_spec.rb
new file mode 100644
index 0000000..966729a
--- /dev/null
+++ b/spec/classes/tripleo_haproxy_spec.rb
@@ -0,0 +1,115 @@
+# Copyright 2016 Red Hat, Inc.
+# All Rights Reserved.
+#
+# Licensed under the Apache License, Version 2.0 (the "License"); you may
+# not use this file except in compliance with the License. You may obtain
+# a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+# License for the specific language governing permissions and limitations
+# under the License.
+#
+
+require 'spec_helper'
+
+describe 'tripleo::haproxy' do
+
+  shared_examples_for 'tripleo::haproxy' do
+    let :params do {
+      :controller_virtual_ip     => '10.1.0.1',
+      :public_virtual_ip         => '192.168.0.1'
+    }
+    end
+
+    describe "default settings" do
+      it 'should configure haproxy' do
+        is_expected.to contain_haproxy__listen('mysql').with(
+          :options => {
+            'timeout client' => "90m",
+            'timeout server' => "90m",
+            'maxconn'        => :undef
+          }
+        )
+      end
+    end
+
+    describe "set clustercheck" do
+      before :each do
+        params.merge!({
+          :mysql_clustercheck => true,
+        })
+      end
+
+      it 'should configure haproxy with clustercheck' do
+        is_expected.to contain_haproxy__listen('mysql').with(
+          :options => {
+            'timeout client' => "90m",
+            'timeout server' => "90m",
+            'option'         => ["tcpka", "httpchk"],
+            'timeout client' => "90m",
+            'timeout server' => "90m",
+            'stick-table'    => "type ip size 1000",
+            'stick'          => "on dst",
+            'maxconn'        => :undef
+          }
+        )
+      end
+    end
+
+    describe "override maxconn with clustercheck" do
+      before :each do
+        params.merge!({
+          :mysql_clustercheck  => true,
+          :mysql_max_conn      => 6500,
+        })
+      end
+
+      it 'should configure haproxy' do
+        is_expected.to contain_haproxy__listen('mysql').with(
+          :options => {
+            'option'         => ["tcpka", "httpchk"],
+            'timeout client' => "90m",
+            'timeout server' => "90m",
+            'stick-table'    => "type ip size 1000",
+            'stick'          => "on dst",
+            'maxconn'        => 6500
+          }
+        )
+      end
+    end
+
+    describe "override maxconn without clustercheck" do
+      before :each do
+        params.merge!({
+          :mysql_max_conn => 6500,
+        })
+      end
+
+      it 'should configure haproxy' do
+        is_expected.to contain_haproxy__listen('mysql').with(
+          :options => {
+            'timeout client' => "90m",
+            'timeout server' => "90m",
+            'maxconn'        => 6500
+          }
+        )
+      end
+    end
+
+  end
+
+  on_supported_os.each do |os, facts|
+    context "on #{os}" do
+      let(:facts) do
+        facts.merge({ })
+      end
+
+      it_behaves_like 'tripleo::haproxy'
+    end
+  end
+
+end
\ No newline at end of file
diff --git a/spec/fixtures/hieradata/default.yaml b/spec/fixtures/hieradata/default.yaml
index 5d978cc..a0f4efc 100644
--- a/spec/fixtures/hieradata/default.yaml
+++ b/spec/fixtures/hieradata/default.yaml
@@ -33,6 +33,9 @@ cinder::keystone::authtoken::password: 'password'
 gnocchi::keystone::authtoken::password: 'password'
 gnocchi::storage::ceph::ceph_username: 'gnocchi'
 gnocchi::storage::ceph::ceph_secret: 'password'
+# haproxy related items
+mysql_enabled: true
+controller_node_ips: '10.1.0.1,10.1.0.2'
 # nova related items
 nova::rabbit_password: 'password'
 nova::keystone::authtoken::password: 'password'