Merge "Add Openstack Rocky configs"
diff --git a/.travis.yml b/.travis.yml
index 82a1477..2ffe067 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -11,20 +11,14 @@
- pip install PyYAML
- pip install virtualenv
- |
- test -e Gemfile || cat <<EOF > Gemfile
- source 'https://rubygems.org'
- gem 'rake'
- gem 'test-kitchen'
- gem 'kitchen-docker'
- gem 'kitchen-inspec'
- gem 'inspec', '<3.0.0'
- #Version was frozen, because of issues in the version of inspec >3.0.0 -- see https://mirantis.jira.com/browse/PROD-24324 for more info
- gem 'kitchen-salt' #, :git => 'https://github.com/salt-formulas/kitchen-salt.git'
+ if [ ! -e Gemfile ]; then
+ curl -s -o ./Gemfile 'https://gerrit.mcp.mirantis.com/gitweb?p=salt-formulas/salt-formulas-scripts.git;a=blob_plain;f=Gemfile;hb=refs/heads/master'
+ fi
- bundle install
env:
- - PLATFORM=epcim/salt-formulas:saltstack-ubuntu-xenial-salt-2017.7
- - PLATFORM=epcim/salt-formulas:saltstack-ubuntu-xenial-salt-2016.3
+ - PLATFORM=epcim/salt-formulas:saltstack-ubuntu-xenial-salt-2017.7 SUITE=default
+ - PLATFORM=epcim/salt-formulas:saltstack-ubuntu-xenial-salt-2016.3 SUITE=default
# - PLATFORM=epcim/salt-formulas:saltstack-ubuntu-bionic-salt-2017.7
before_script:
diff --git a/Makefile b/Makefile
index f9b4f47..fb69046 100644
--- a/Makefile
+++ b/Makefile
@@ -18,7 +18,11 @@
JOBS := 1
endif
+ifeq (,$(wildcard ./.kitchen.openstack.yml))
+KITCHEN_LOCAL_YAML?=.kitchen.openstack.yml
+else
KITCHEN_LOCAL_YAML?=.kitchen.yml
+endif
KITCHEN_OPTS?="--concurrency=$(JOBS)"
KITCHEN_OPTS_CREATE?=""
KITCHEN_OPTS_CONVERGE?=""
@@ -34,7 +38,6 @@
@echo "make release-major - Generate new major release"
@echo "make release-minor - Generate new minor release"
@echo "make changelog - Show changes since last release"
- @echo "make test-model-validate - Run salt jsonschema validation"
install:
# Formula
@@ -42,7 +45,6 @@
cp -a $(FORMULANAME) $(DESTDIR)/$(SALTENVDIR)/
[ ! -d _modules ] || cp -a _modules $(DESTDIR)/$(SALTENVDIR)/
[ ! -d _states ] || cp -a _states $(DESTDIR)/$(SALTENVDIR)/ || true
- [ ! -d _engines ] || cp -a _engines $(DESTDIR)/$(SALTENVDIR)/ || true
[ ! -d _grains ] || cp -a _grains $(DESTDIR)/$(SALTENVDIR)/ || true
# Metadata
[ -d $(DESTDIR)/$(RECLASSDIR)/service/$(FORMULANAME) ] || mkdir -p $(DESTDIR)/$(RECLASSDIR)/service/$(FORMULANAME)
@@ -54,10 +56,6 @@
test:
[ ! -d tests ] || (cd tests; ./run_tests.sh)
-test-model-validate:
- # TODO make it actually fail
- [ ! -d $(FORMULANAME)/schemas/ ] || (cd tests; ./run_tests.sh model-validate)
-
release-major: check-changes
@echo "Current version is $(VERSION), new version is $(NEW_MAJOR_VERSION)"
@[ $(VERSION_MAJOR) != $(NEW_MAJOR_VERSION) ] || (echo "Major version $(NEW_MAJOR_VERSION) already released, nothing to do. Do you want release-minor?" && exit 1)
diff --git a/oslo_templates/files/queens/oslo/_database.conf b/oslo_templates/files/queens/oslo/_database.conf
index 28b1fea..77ef17f 100644
--- a/oslo_templates/files/queens/oslo/_database.conf
+++ b/oslo_templates/files/queens/oslo/_database.conf
@@ -47,8 +47,10 @@
# Deprecated group/name - [DATABASE]/sql_idle_timeout
# Deprecated group/name - [sql]/idle_timeout
#connection_recycle_time = 3600
-{%- if _data.connection_recycle_time is defined %}
-connection_recycle_time = {{ _data.connection_recycle_time }}
+# (obryndzii) we change default connection_recycle_time to 280 in order to fix numerous
+# DBConnection errors in services until we implement this setting in reclass-system
+{%- if _data.get('connection_recycle_time', 280) %}
+connection_recycle_time = {{ _data.get('connection_recycle_time', 280) }}
{%- endif %}
# Minimum number of SQL connections to keep open in a pool. (integer