Hello community,
here is the log from the commit of package habootstrap-formula for
openSUSE:Factory checked in at 2020-05-28 09:19:22
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/habootstrap-formula (Old)
and /work/SRC/openSUSE:Factory/.habootstrap-formula.new.3606 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "habootstrap-formula"
Thu May 28 09:19:22 2020 rev:9 rq:809529 version:0.3.6
Changes:
--------
--- /work/SRC/openSUSE:Factory/habootstrap-formula/habootstrap-formula.changes
2020-03-06 21:33:34.829782421 +0100
+++
/work/SRC/openSUSE:Factory/.habootstrap-formula.new.3606/habootstrap-formula.changes
2020-05-28 09:19:23.497216762 +0200
@@ -1,0 +2,41 @@
+Thu May 21 10:12:17 UTC 2020 - Xabier Arbulu <[email protected]>
+
+- Version bump 0.3.6
+ * Add the option to configure the cluster properties and defaults
+ * Add the option to configure the sbd resource parameters
+ (bsc#1170702)
+
+-------------------------------------------------------------------
+Fri May 15 07:25:49 UTC 2020 - Stefano Torresi <[email protected]>
+
+- Version bump 0.3.5
+ * Change monitoring settings
+
+-------------------------------------------------------------------
+Fri Apr 17 08:10:24 UTC 2020 - Xabier Arbulu <[email protected]>
+
+- Version bump 0.3.4
+ * Autodetect GCP instance name and add it to the grains file
+ * Install the correct packages for the GCP resources
+ (bsc#1161898, bsc#1160933)
+
+-------------------------------------------------------------------
+Fri Mar 27 11:13:04 UTC 2020 - Xabier Arbulu <[email protected]>
+
+- Version bump 0.3.3
+ * Autodetect GCP instance id and add it to the grains file
+
+-------------------------------------------------------------------
+ Thu Mar 5 10:29:22 UTC 2020 - Xabier Arbulu <[email protected]>
+
+- Version bump 0.3.2
+ * Add new option to configure corosync configuration file
+
+-------------------------------------------------------------------
+Tue Mar 3 09:51:10 UTC 2020 - Xabier Arbulu <[email protected]>
+
+- Version bump 0.3.1
+ * Add the required packages to use gcp specific agents
+ (bsc#1161898, bsc#1160933)
+
+-------------------------------------------------------------------
Old:
----
habootstrap-formula-0.3.0.tar.gz
New:
----
habootstrap-formula-0.3.6.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ habootstrap-formula.spec ++++++
--- /var/tmp/diff_new_pack.x5u5P0/_old 2020-05-28 09:19:24.193218036 +0200
+++ /var/tmp/diff_new_pack.x5u5P0/_new 2020-05-28 09:19:24.197218044 +0200
@@ -17,11 +17,9 @@
# See also http://en.opensuse.org/openSUSE:Specfile_guidelines
-%define fname cluster
-%define fdir %{_datadir}/salt-formulas
Name: habootstrap-formula
-Version: 0.3.0
+Version: 0.3.6
Group: System/Packages
Release: 0
Summary: HA cluster (crmsh) deployment salt formula
@@ -34,6 +32,10 @@
Requires: salt-shaptools
Requires: salt-formulas-configuration
+%define fname cluster
+%define fdir %{_datadir}/salt-formulas
+%define ftemplates templates
+
%description
HA cluster salt deployment formula. This formula is capable to perform
the HA cluster bootstrap actions (init, join, remove) using standalone salt
@@ -49,6 +51,7 @@
mkdir -p %{buildroot}%{fdir}/states/%{fname}
mkdir -p %{buildroot}%{fdir}/metadata/%{fname}
cp -R %{fname} %{buildroot}%{fdir}/states
+cp -R %{ftemplates} %{buildroot}%{fdir}/states/%{fname}
cp -R form.yml %{buildroot}%{fdir}/metadata/%{fname}
if [ -f metadata.yml ]
then
@@ -70,6 +73,7 @@
%dir %attr(0755, root, salt) %{fdir}/metadata
%attr(0755, root, salt) %{fdir}/states/%{fname}
+%attr(0755, root, salt) %{fdir}/states/%{fname}/%{ftemplates}
%attr(0755, root, salt) %{fdir}/metadata/%{fname}
%changelog
++++++ habootstrap-formula-0.3.0.tar.gz -> habootstrap-formula-0.3.6.tar.gz
++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/habootstrap-formula-0.3.0/Gemfile.lock
new/habootstrap-formula-0.3.6/Gemfile.lock
--- old/habootstrap-formula-0.3.0/Gemfile.lock 2020-03-06 15:01:35.947485011
+0100
+++ new/habootstrap-formula-0.3.6/Gemfile.lock 2020-05-27 14:43:48.273339999
+0200
@@ -1,157 +1,160 @@
GEM
remote: https://rubygems.org/
specs:
- activesupport (5.2.4.1)
+ activesupport (5.2.4.3)
concurrent-ruby (~> 1.0, >= 1.0.2)
i18n (>= 0.7, < 2)
minitest (~> 5.1)
tzinfo (~> 1.1)
addressable (2.7.0)
public_suffix (>= 2.0.2, < 5.0)
- aws-eventstream (1.0.3)
- aws-partitions (1.280.0)
- aws-sdk-apigateway (1.36.0)
+ aws-eventstream (1.1.0)
+ aws-partitions (1.321.0)
+ aws-sdk-apigateway (1.40.0)
aws-sdk-core (~> 3, >= 3.71.0)
aws-sigv4 (~> 1.1)
- aws-sdk-apigatewayv2 (1.15.0)
+ aws-sdk-apigatewayv2 (1.20.0)
aws-sdk-core (~> 3, >= 3.71.0)
aws-sigv4 (~> 1.1)
- aws-sdk-athena (1.22.0)
+ aws-sdk-athena (1.25.0)
aws-sdk-core (~> 3, >= 3.71.0)
aws-sigv4 (~> 1.1)
aws-sdk-autoscaling (1.22.0)
aws-sdk-core (~> 3, >= 3.52.1)
aws-sigv4 (~> 1.1)
- aws-sdk-budgets (1.27.0)
+ aws-sdk-budgets (1.29.0)
aws-sdk-core (~> 3, >= 3.71.0)
aws-sigv4 (~> 1.1)
- aws-sdk-cloudformation (1.30.0)
+ aws-sdk-cloudformation (1.35.0)
aws-sdk-core (~> 3, >= 3.71.0)
aws-sigv4 (~> 1.1)
- aws-sdk-cloudhsm (1.19.0)
+ aws-sdk-cloudhsm (1.21.0)
aws-sdk-core (~> 3, >= 3.71.0)
aws-sigv4 (~> 1.1)
- aws-sdk-cloudhsmv2 (1.20.0)
+ aws-sdk-cloudhsmv2 (1.22.0)
aws-sdk-core (~> 3, >= 3.71.0)
aws-sigv4 (~> 1.1)
- aws-sdk-cloudtrail (1.20.0)
+ aws-sdk-cloudtrail (1.22.0)
aws-sdk-core (~> 3, >= 3.71.0)
aws-sigv4 (~> 1.1)
- aws-sdk-cloudwatch (1.33.0)
+ aws-sdk-cloudwatch (1.37.0)
aws-sdk-core (~> 3, >= 3.71.0)
aws-sigv4 (~> 1.1)
- aws-sdk-cloudwatchlogs (1.28.0)
+ aws-sdk-cloudwatchlogs (1.30.0)
aws-sdk-core (~> 3, >= 3.71.0)
aws-sigv4 (~> 1.1)
- aws-sdk-codecommit (1.30.0)
+ aws-sdk-codecommit (1.32.0)
aws-sdk-core (~> 3, >= 3.71.0)
aws-sigv4 (~> 1.1)
- aws-sdk-codedeploy (1.27.0)
+ aws-sdk-codedeploy (1.30.0)
aws-sdk-core (~> 3, >= 3.71.0)
aws-sigv4 (~> 1.1)
- aws-sdk-codepipeline (1.28.0)
+ aws-sdk-codepipeline (1.30.0)
aws-sdk-core (~> 3, >= 3.71.0)
aws-sigv4 (~> 1.1)
- aws-sdk-configservice (1.42.1)
+ aws-sdk-configservice (1.44.0)
aws-sdk-core (~> 3, >= 3.71.0)
aws-sigv4 (~> 1.1)
- aws-sdk-core (3.90.1)
- aws-eventstream (~> 1.0, >= 1.0.2)
+ aws-sdk-core (3.96.1)
+ aws-eventstream (~> 1, >= 1.0.2)
aws-partitions (~> 1, >= 1.239.0)
aws-sigv4 (~> 1.1)
jmespath (~> 1.0)
- aws-sdk-costandusagereportservice (1.18.0)
+ aws-sdk-costandusagereportservice (1.20.0)
+ aws-sdk-core (~> 3, >= 3.71.0)
+ aws-sigv4 (~> 1.1)
+ aws-sdk-dynamodb (1.47.0)
aws-sdk-core (~> 3, >= 3.71.0)
aws-sigv4 (~> 1.1)
- aws-sdk-dynamodb (1.44.0)
+ aws-sdk-ec2 (1.163.0)
aws-sdk-core (~> 3, >= 3.71.0)
aws-sigv4 (~> 1.1)
- aws-sdk-ec2 (1.147.0)
+ aws-sdk-ecr (1.29.0)
aws-sdk-core (~> 3, >= 3.71.0)
aws-sigv4 (~> 1.1)
- aws-sdk-ecr (1.25.0)
+ aws-sdk-ecs (1.62.0)
aws-sdk-core (~> 3, >= 3.71.0)
aws-sigv4 (~> 1.1)
- aws-sdk-ecs (1.57.0)
+ aws-sdk-efs (1.28.0)
aws-sdk-core (~> 3, >= 3.71.0)
aws-sigv4 (~> 1.1)
- aws-sdk-eks (1.32.0)
+ aws-sdk-eks (1.36.0)
aws-sdk-core (~> 3, >= 3.71.0)
aws-sigv4 (~> 1.1)
- aws-sdk-elasticache (1.29.0)
+ aws-sdk-elasticache (1.34.0)
aws-sdk-core (~> 3, >= 3.71.0)
aws-sigv4 (~> 1.1)
- aws-sdk-elasticbeanstalk (1.26.0)
+ aws-sdk-elasticbeanstalk (1.29.0)
aws-sdk-core (~> 3, >= 3.71.0)
aws-sigv4 (~> 1.1)
- aws-sdk-elasticloadbalancing (1.19.0)
+ aws-sdk-elasticloadbalancing (1.21.0)
aws-sdk-core (~> 3, >= 3.71.0)
aws-sigv4 (~> 1.1)
- aws-sdk-elasticloadbalancingv2 (1.40.1)
+ aws-sdk-elasticloadbalancingv2 (1.42.0)
aws-sdk-core (~> 3, >= 3.71.0)
aws-sigv4 (~> 1.1)
- aws-sdk-elasticsearchservice (1.30.0)
+ aws-sdk-elasticsearchservice (1.34.0)
aws-sdk-core (~> 3, >= 3.71.0)
aws-sigv4 (~> 1.1)
- aws-sdk-firehose (1.24.0)
+ aws-sdk-firehose (1.27.0)
aws-sdk-core (~> 3, >= 3.71.0)
aws-sigv4 (~> 1.1)
- aws-sdk-iam (1.33.0)
+ aws-sdk-iam (1.37.0)
aws-sdk-core (~> 3, >= 3.71.0)
aws-sigv4 (~> 1.1)
- aws-sdk-kafka (1.18.0)
+ aws-sdk-kafka (1.20.0)
aws-sdk-core (~> 3, >= 3.71.0)
aws-sigv4 (~> 1.1)
- aws-sdk-kinesis (1.20.0)
+ aws-sdk-kinesis (1.22.0)
aws-sdk-core (~> 3, >= 3.71.0)
aws-sigv4 (~> 1.1)
- aws-sdk-kms (1.29.0)
+ aws-sdk-kms (1.31.0)
aws-sdk-core (~> 3, >= 3.71.0)
aws-sigv4 (~> 1.1)
- aws-sdk-lambda (1.36.0)
+ aws-sdk-lambda (1.41.0)
aws-sdk-core (~> 3, >= 3.71.0)
aws-sigv4 (~> 1.1)
aws-sdk-organizations (1.17.0)
aws-sdk-core (~> 3, >= 3.39.0)
aws-sigv4 (~> 1.0)
- aws-sdk-rds (1.78.0)
+ aws-sdk-rds (1.84.0)
aws-sdk-core (~> 3, >= 3.71.0)
aws-sigv4 (~> 1.1)
- aws-sdk-redshift (1.37.0)
+ aws-sdk-redshift (1.42.0)
aws-sdk-core (~> 3, >= 3.71.0)
aws-sigv4 (~> 1.1)
- aws-sdk-route53 (1.30.0)
+ aws-sdk-route53 (1.34.0)
aws-sdk-core (~> 3, >= 3.71.0)
aws-sigv4 (~> 1.1)
- aws-sdk-route53domains (1.18.0)
+ aws-sdk-route53domains (1.21.0)
aws-sdk-core (~> 3, >= 3.71.0)
aws-sigv4 (~> 1.1)
- aws-sdk-route53resolver (1.11.0)
+ aws-sdk-route53resolver (1.13.0)
aws-sdk-core (~> 3, >= 3.71.0)
aws-sigv4 (~> 1.1)
- aws-sdk-s3 (1.60.2)
- aws-sdk-core (~> 3, >= 3.83.0)
+ aws-sdk-s3 (1.66.0)
+ aws-sdk-core (~> 3, >= 3.96.1)
aws-sdk-kms (~> 1)
aws-sigv4 (~> 1.1)
- aws-sdk-securityhub (1.19.0)
+ aws-sdk-securityhub (1.25.0)
aws-sdk-core (~> 3, >= 3.71.0)
aws-sigv4 (~> 1.1)
- aws-sdk-ses (1.27.0)
+ aws-sdk-ses (1.29.0)
aws-sdk-core (~> 3, >= 3.71.0)
aws-sigv4 (~> 1.1)
- aws-sdk-sms (1.17.0)
+ aws-sdk-sms (1.19.0)
aws-sdk-core (~> 3, >= 3.71.0)
aws-sigv4 (~> 1.1)
- aws-sdk-sns (1.21.0)
+ aws-sdk-sns (1.23.0)
aws-sdk-core (~> 3, >= 3.71.0)
aws-sigv4 (~> 1.1)
- aws-sdk-sqs (1.23.1)
+ aws-sdk-sqs (1.25.0)
aws-sdk-core (~> 3, >= 3.71.0)
aws-sigv4 (~> 1.1)
- aws-sdk-ssm (1.71.0)
+ aws-sdk-ssm (1.78.0)
aws-sdk-core (~> 3, >= 3.71.0)
aws-sigv4 (~> 1.1)
- aws-sigv4 (1.1.1)
+ aws-sigv4 (1.1.3)
aws-eventstream (~> 1.0, >= 1.0.2)
azure_graph_rbac (0.17.1)
ms_rest_azure (~> 0.11.0)
@@ -161,23 +164,23 @@
ms_rest_azure (~> 0.11.1)
azure_mgmt_security (0.18.0)
ms_rest_azure (~> 0.11.1)
- azure_mgmt_storage (0.19.3)
+ azure_mgmt_storage (0.21.0)
ms_rest_azure (~> 0.11.1)
bcrypt_pbkdf (1.0.1)
builder (3.2.4)
- chef-config (15.8.23)
+ chef-config (16.1.16)
addressable
- chef-utils (= 15.8.23)
+ chef-utils (= 16.1.16)
fuzzyurl
mixlib-config (>= 2.2.12, < 4.0)
mixlib-shellout (>= 2.0, < 4.0)
tomlrb (~> 1.2)
- chef-telemetry (1.0.3)
+ chef-telemetry (1.0.5)
chef-config
concurrent-ruby (~> 1.0)
ffi-yajl (~> 2.2)
- http (~> 2.2)
- chef-utils (15.8.23)
+ http (~> 4)
+ chef-utils (16.1.16)
coderay (1.1.2)
concurrent-ruby (1.1.6)
declarative (0.0.10)
@@ -188,12 +191,12 @@
multi_json
domain_name (0.5.20190701)
unf (>= 0.0.5, < 1.0.0)
- ecma-re-validator (0.2.0)
+ ecma-re-validator (0.2.1)
regexp_parser (~> 1.2)
ed25519 (1.2.4)
equatable (0.6.1)
erubi (1.9.0)
- excon (0.72.0)
+ excon (0.73.0)
faraday (0.17.3)
multipart-post (>= 1.2, < 3)
faraday-cookie_jar (0.0.6)
@@ -202,6 +205,9 @@
faraday_middleware (0.12.2)
faraday (>= 0.7.4, < 1.0)
ffi (1.12.2)
+ ffi-compiler (1.0.1)
+ ffi (>= 1.0.0)
+ rake
ffi-yajl (2.3.3)
libyajl2 (~> 1.2)
fuzzyurl (0.9.0)
@@ -224,30 +230,31 @@
ffi (>= 1.0.1)
gyoku (1.3.1)
builder (>= 2.1.2)
- hana (1.3.5)
+ hana (1.3.6)
hashie (3.6.0)
htmlentities (4.3.4)
- http (2.2.2)
+ http (4.4.1)
addressable (~> 2.3)
http-cookie (~> 1.0)
- http-form_data (~> 1.0.1)
- http_parser.rb (~> 0.6.0)
+ http-form_data (~> 2.2)
+ http-parser (~> 1.2.0)
http-cookie (1.0.3)
domain_name (~> 0.5)
- http-form_data (1.0.3)
- http_parser.rb (0.6.0)
+ http-form_data (2.3.0)
+ http-parser (1.2.1)
+ ffi-compiler (>= 1.0, < 2.0)
httpclient (2.8.3)
i18n (1.8.2)
concurrent-ruby (~> 1.0)
inifile (3.0.0)
- inspec (4.18.100)
+ inspec (4.18.114)
faraday_middleware (~> 0.12.2)
- inspec-core (= 4.18.100)
+ inspec-core (= 4.18.114)
train (~> 3.0)
train-aws (~> 0.1)
train-habitat (~> 0.1)
train-winrm (~> 0.2)
- inspec-core (4.18.100)
+ inspec-core (4.18.114)
addressable (~> 2.4)
chef-telemetry (~> 1.0)
faraday (>= 0.9.0)
@@ -255,12 +262,12 @@
htmlentities (~> 4.3)
json_schemer (~> 0.2.1)
license-acceptance (>= 0.2.13, < 2.0)
- method_source (~> 0.8)
+ method_source (>= 0.8, < 2.0)
mixlib-log (~> 3.0)
multipart-post (~> 2.0)
parallel (~> 1.9)
parslet (~> 1.5)
- pry (~> 0)
+ pry (~> 0.13)
rspec (~> 3.9)
rspec-its (~> 1.2)
rubyzip (~> 1.2, >= 1.2.2)
@@ -274,23 +281,23 @@
tty-table (~> 0.10)
jmespath (1.4.0)
json (2.3.0)
- json_schemer (0.2.10)
+ json_schemer (0.2.11)
ecma-re-validator (~> 0.2)
hana (~> 1.3)
regexp_parser (~> 1.5)
uri_template (~> 0.7)
jwt (2.2.1)
- kitchen-docker (2.9.0)
+ kitchen-docker (2.10.0)
test-kitchen (>= 1.0.0)
- kitchen-inspec (1.3.1)
+ kitchen-inspec (1.3.2)
hashie (~> 3.4)
inspec (>= 1.47, < 5.0)
test-kitchen (>= 1.6, < 3)
- kitchen-salt (0.6.0)
+ kitchen-salt (0.6.3)
hashie (>= 3.5)
test-kitchen (>= 1.4)
libyajl2 (1.2.0)
- license-acceptance (1.0.13)
+ license-acceptance (1.0.19)
pastel (~> 0.7)
tomlrb (~> 1.2)
tty-box (~> 0.3)
@@ -300,12 +307,12 @@
little-plugger (~> 1.1)
multi_json (~> 1.10)
memoist (0.16.2)
- method_source (0.9.2)
+ method_source (1.0.0)
mini_mime (1.0.2)
- minitest (5.14.0)
+ minitest (5.14.1)
mixlib-config (3.0.6)
tomlrb
- mixlib-install (3.11.28)
+ mixlib-install (3.12.1)
mixlib-shellout
mixlib-versioning
thor
@@ -331,16 +338,17 @@
net-ssh-gateway (2.0.0)
net-ssh (>= 4.0.0)
nori (2.6.0)
- os (1.0.1)
+ os (1.1.0)
parallel (1.19.1)
parslet (1.8.2)
- pastel (0.7.3)
+ pastel (0.7.4)
equatable (~> 0.6)
tty-color (~> 0.5)
- pry (0.12.2)
- coderay (~> 1.1.0)
- method_source (~> 0.9.0)
- public_suffix (4.0.3)
+ pry (0.13.1)
+ coderay (~> 1.1)
+ method_source (~> 1.0)
+ public_suffix (4.0.5)
+ rake (13.0.1)
regexp_parser (1.7.0)
representable (3.0.4)
declarative (< 0.1.0)
@@ -351,9 +359,9 @@
rspec-core (~> 3.9.0)
rspec-expectations (~> 3.9.0)
rspec-mocks (~> 3.9.0)
- rspec-core (3.9.1)
- rspec-support (~> 3.9.1)
- rspec-expectations (3.9.0)
+ rspec-core (3.9.2)
+ rspec-support (~> 3.9.3)
+ rspec-expectations (3.9.2)
diff-lcs (>= 1.2.0, < 2.0)
rspec-support (~> 3.9.0)
rspec-its (1.3.0)
@@ -362,11 +370,11 @@
rspec-mocks (3.9.1)
diff-lcs (>= 1.2.0, < 2.0)
rspec-support (~> 3.9.0)
- rspec-support (3.9.2)
+ rspec-support (3.9.3)
rubyntlm (0.6.2)
rubyzip (1.3.0)
semverse (3.0.0)
- signet (0.13.0)
+ signet (0.14.0)
addressable (~> 2.3)
faraday (>= 0.17.3, < 2.0)
jwt (>= 1.5, < 3.0)
@@ -380,14 +388,14 @@
sync (0.5.0)
term-ansicolor (1.7.1)
tins (~> 1.0)
- test-kitchen (2.4.0)
+ test-kitchen (2.5.1)
bcrypt_pbkdf (~> 1.0)
ed25519 (~> 1.2)
license-acceptance (~> 1.0, >= 1.0.11)
mixlib-install (~> 3.6)
mixlib-shellout (>= 1.2, < 4.0)
- net-scp (>= 1.1, < 3.0)
- net-ssh (>= 2.9, < 6.0)
+ net-scp (>= 1.1, < 4.0)
+ net-ssh (>= 2.9, < 7.0)
net-ssh-gateway (>= 1.2, < 3.0)
thor (~> 0.19)
winrm (~> 2.0)
@@ -396,10 +404,10 @@
thor (0.20.3)
thread_safe (0.3.6)
timeliness (0.3.10)
- tins (1.24.1)
+ tins (1.25.0)
sync
- tomlrb (1.2.9)
- train (3.2.23)
+ tomlrb (1.3.0)
+ train (3.2.28)
activesupport (~> 5.2.3)
azure_graph_rbac (~> 0.16)
azure_mgmt_key_vault (~> 0.17)
@@ -409,9 +417,10 @@
docker-api (~> 1.26)
google-api-client (>= 0.23.9, < 0.35.0)
googleauth (>= 0.6.6, < 0.11.0)
- train-core (= 3.2.23)
+ inifile (~> 3.0)
+ train-core (= 3.2.28)
train-winrm (~> 0.2)
- train-aws (0.1.15)
+ train-aws (0.1.16)
aws-sdk-apigateway (~> 1.0)
aws-sdk-apigatewayv2 (~> 1.0)
aws-sdk-athena (~> 1.0)
@@ -433,6 +442,7 @@
aws-sdk-ec2 (~> 1.70)
aws-sdk-ecr (~> 1.18)
aws-sdk-ecs (~> 1.30)
+ aws-sdk-efs (~> 1.0)
aws-sdk-eks (~> 1.9)
aws-sdk-elasticache (~> 1.0)
aws-sdk-elasticbeanstalk (~> 1.0)
@@ -458,9 +468,8 @@
aws-sdk-sns (~> 1.9)
aws-sdk-sqs (~> 1.10)
aws-sdk-ssm (~> 1.0)
- train-core (3.2.23)
+ train-core (3.2.28)
addressable (~> 2.5)
- inifile (~> 3.0)
json (>= 1.8, < 3.0)
mixlib-shellout (>= 2.0, < 4.0)
net-scp (>= 1.2, < 3.0)
@@ -475,7 +484,7 @@
tty-cursor (~> 0.7)
tty-color (0.5.1)
tty-cursor (0.7.1)
- tty-prompt (0.20.0)
+ tty-prompt (0.21.0)
necromancer (~> 0.5.0)
pastel (~> 0.7.0)
tty-reader (~> 0.7.0)
@@ -490,13 +499,13 @@
pastel (~> 0.7.2)
strings (~> 0.1.5)
tty-screen (~> 0.7)
- tzinfo (1.2.6)
+ tzinfo (1.2.7)
thread_safe (~> 0.1)
uber (0.1.0)
unf (0.1.4)
unf_ext
unf_ext (0.0.7.2)
- unicode-display_width (1.6.1)
+ unicode-display_width (1.7.0)
unicode_utils (1.4.0)
uri_template (0.7.0)
winrm (2.3.4)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/habootstrap-formula-0.3.0/cluster/cloud_detection.sls
new/habootstrap-formula-0.3.6/cluster/cloud_detection.sls
--- old/habootstrap-formula-0.3.0/cluster/cloud_detection.sls 2020-03-06
15:01:35.947485011 +0100
+++ new/habootstrap-formula-0.3.6/cluster/cloud_detection.sls 2020-05-27
14:43:48.273339999 +0200
@@ -1,3 +1,8 @@
# crmsh must exist to run crm.detect_cloud
{% do salt['pkg.install'](name='crmsh') %}
{% do salt['grains.set']('cloud_provider', salt['crm.detect_cloud']()) %}
+
+{% if grains['cloud_provider'] == 'google-cloud-platform' %}
+{% do salt['grains.set']('gcp_instance_id',
salt['http.query'](url='http://metadata.google.internal/computeMetadata/v1/instance/id',
header_dict={"Metadata-Flavor": "Google"})['body']) %}
+{% do salt['grains.set']('gcp_instance_name',
salt['http.query'](url='http://metadata.google.internal/computeMetadata/v1/instance/name',
header_dict={"Metadata-Flavor": "Google"})['body']) %}
+{% endif %}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/habootstrap-formula-0.3.0/cluster/configure_resources.sls
new/habootstrap-formula-0.3.6/cluster/configure_resources.sls
--- old/habootstrap-formula-0.3.0/cluster/configure_resources.sls
2020-03-06 15:01:35.947485011 +0100
+++ new/habootstrap-formula-0.3.6/cluster/configure_resources.sls
2020-05-27 14:43:48.273339999 +0200
@@ -1,7 +1,34 @@
{%- from "cluster/map.jinja" import cluster with context -%}
{% set host = grains['host'] %}
+include:
+ - .configure_sbd_resource
+
{% if cluster.configure is defined %}
+
+# Configure the cluster properties
+{% if cluster.configure.properties is defined and
cluster.configure.properties|length>0 %}
+configure-cluster-properties:
+ crm.cluster_properties_present:
+ - properties: {{ cluster.configure.properties|json }}
+{% endif %}
+
+# Configure the cluster rsc_defaults
+{% if cluster.configure.rsc_defaults is defined and
cluster.configure.rsc_defaults|length>0 %}
+configure-cluster-rsc-defaults:
+ crm.cluster_rsc_defaults_present:
+ - rsc_defaults: {{ cluster.configure.rsc_defaults|json }}
+{% endif %}
+
+# Configure the cluster op_defaults
+{% if cluster.configure.op_defaults is defined and
cluster.configure.op_defaults|length>0 %}
+configure-cluster-op-defaults:
+ crm.cluster_op_defaults_present:
+ - op_defaults: {{ cluster.configure.op_defaults|json }}
+{% endif %}
+
+# Configure the cluster using a configuration file
+{% if cluster.configure.url is defined or cluster.configure.template is
defined %}
{% set url = none %}
{% if cluster.configure.template is defined %}
{% set url =
cluster.configure.template.destination|default('/tmp/cluster.config') %}
@@ -16,11 +43,10 @@
configure-the-cluster:
crm.cluster_configured:
- - name: {{ cluster.configure.method }}
+ - name: {{ cluster.configure.method|default("update") }}
- url: {{ cluster.configure.url|default(url) }}
- {% if cluster.configure.is_xml is defined %}
- - is_xml: {{ cluster.configure.is_xml }}
- {% endif %}
+ - is_xml: {{ cluster.configure.is_xml|default(False) }}
+ - force: {{ cluster.configure.force|default(False) }}
- require:
{% if cluster.init == host %}
- bootstrap-the-cluster
@@ -28,3 +54,4 @@
- join-the-cluster
{% endif %}
{% endif %}
+{% endif %}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/habootstrap-formula-0.3.0/cluster/configure_sbd_resource.sls
new/habootstrap-formula-0.3.6/cluster/configure_sbd_resource.sls
--- old/habootstrap-formula-0.3.0/cluster/configure_sbd_resource.sls
1970-01-01 01:00:00.000000000 +0100
+++ new/habootstrap-formula-0.3.6/cluster/configure_sbd_resource.sls
2020-05-27 14:43:48.273339999 +0200
@@ -0,0 +1,26 @@
+{%- from "cluster/map.jinja" import cluster with context -%}
+{% set host = grains['host'] %}
+
+{% if cluster.sbd is defined and cluster.sbd.configure_resource is defined %}
+
+create-sbd-resource-configuration:
+ file.managed:
+ - name: /tmp/sbd.config
+ - source: salt://cluster/templates/sbd_resource.j2
+ - user: root
+ - group: root
+ - mode: 644
+ - template: jinja
+ - context:
+ configure: {{ cluster.sbd.configure_resource|yaml }}
+
+configure-sbd-resource:
+ crm.cluster_configured:
+ - name: update
+ - url: /tmp/sbd.config
+ - is_xml: False
+ - force: {{ cluster.sbd.configure_resource.force|default(False) }}
+ - require:
+ - create-sbd-resource-configuration
+
+{% endif %}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/habootstrap-formula-0.3.0/cluster/corosync.sls
new/habootstrap-formula-0.3.6/cluster/corosync.sls
--- old/habootstrap-formula-0.3.0/cluster/corosync.sls 1970-01-01
01:00:00.000000000 +0100
+++ new/habootstrap-formula-0.3.6/cluster/corosync.sls 2020-05-27
14:43:48.277337999 +0200
@@ -0,0 +1,15 @@
+{%- from "cluster/map.jinja" import cluster with context -%}
+
+customize_corosync:
+ crm.corosync_updated:
+ - name: /etc/corosync/corosync.conf
+ - data: {{ cluster.corosync|json }}
+
+corosync_service:
+ service.running:
+ - name: corosync
+ - restart: True
+ - onchanges:
+ - customize_corosync
+ - watch:
+ - customize_corosync
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/habootstrap-formula-0.3.0/cluster/defaults.yaml
new/habootstrap-formula-0.3.6/cluster/defaults.yaml
--- old/habootstrap-formula-0.3.0/cluster/defaults.yaml 2020-03-06
15:01:35.947485011 +0100
+++ new/habootstrap-formula-0.3.6/cluster/defaults.yaml 2020-05-27
14:43:48.277337999 +0200
@@ -5,4 +5,5 @@
wait_for_initialization: 20
sshkeys:
overwrite: false
- remove: []
\ No newline at end of file
+ remove: []
+ monitoring_enabled: false
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/habootstrap-formula-0.3.0/cluster/init.sls
new/habootstrap-formula-0.3.6/cluster/init.sls
--- old/habootstrap-formula-0.3.0/cluster/init.sls 2020-03-06
15:01:35.947485011 +0100
+++ new/habootstrap-formula-0.3.6/cluster/init.sls 2020-05-27
14:43:48.277337999 +0200
@@ -24,12 +24,15 @@
{% else %}
- .join
{% endif %}
+{% if cluster.corosync is defined %}
+ - .corosync
+{% endif %}
{% if host not in cluster.remove %}
- .configure_resources
{% endif %}
{% if cluster.hacluster_password is defined %}
- .hacluster_user
{% endif %}
-{% if cluster.ha_exporter is sameas true %}
+{% if cluster.monitoring_enabled %}
- .monitoring
{% endif %}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/habootstrap-formula-0.3.0/cluster/packages.sls
new/habootstrap-formula-0.3.6/cluster/packages.sls
--- old/habootstrap-formula-0.3.0/cluster/packages.sls 2020-03-06
15:01:35.947485011 +0100
+++ new/habootstrap-formula-0.3.6/cluster/packages.sls 2020-05-27
14:43:48.277337999 +0200
@@ -48,4 +48,17 @@
interval: 15
- pkgs:
- socat
+{% elif grains['cloud_provider'] == 'google-cloud-platform' %}
+{%- set python_version = 'python' if grains['pythonversion'][0] == 2 else
'python3' %}
+install_additional_packages_gcp:
+ pkg.installed:
+ - retry:
+ attempts: 3
+ interval: 15
+ - pkgs:
+ - {{ python_version }}-google-api-python-client # Needed by
gcp-vpc-move-route and fence_gce
+ - {{ python_version }}-google-auth
+ - {{ python_version }}-google-auth-httplib2
+ - {{ python_version }}-pyroute2 # Needed by gcp-vpc-move-route
+ - resolve_capabilities: true
{% endif %}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/habootstrap-formula-0.3.0/habootstrap-formula.changes
new/habootstrap-formula-0.3.6/habootstrap-formula.changes
--- old/habootstrap-formula-0.3.0/habootstrap-formula.changes 2020-03-06
15:01:35.951485011 +0100
+++ new/habootstrap-formula-0.3.6/habootstrap-formula.changes 2020-05-27
14:43:48.277337999 +0200
@@ -1,4 +1,45 @@
-------------------------------------------------------------------
+Thu May 21 10:12:17 UTC 2020 - Xabier Arbulu <[email protected]>
+
+- Version bump 0.3.6
+ * Add the option to configure the cluster properties and defaults
+ * Add the option to configure the sbd resource parameters
+ (bsc#1170702)
+
+-------------------------------------------------------------------
+Fri May 15 07:25:49 UTC 2020 - Stefano Torresi <[email protected]>
+
+- Version bump 0.3.5
+ * Change monitoring settings
+
+-------------------------------------------------------------------
+Fri Apr 17 08:10:24 UTC 2020 - Xabier Arbulu <[email protected]>
+
+- Version bump 0.3.4
+ * Autodetect GCP instance name and add it to the grains file
+ * Install the correct packages for the GCP resources
+ (bsc#1161898, bsc#1160933)
+
+-------------------------------------------------------------------
+Fri Mar 27 11:13:04 UTC 2020 - Xabier Arbulu <[email protected]>
+
+- Version bump 0.3.3
+ * Autodetect GCP instance id and add it to the grains file
+
+-------------------------------------------------------------------
+ Thu Mar 5 10:29:22 UTC 2020 - Xabier Arbulu <[email protected]>
+
+- Version bump 0.3.2
+ * Add new option to configure corosync configuration file
+
+-------------------------------------------------------------------
+Tue Mar 3 09:51:10 UTC 2020 - Xabier Arbulu <[email protected]>
+
+- Version bump 0.3.1
+ * Add the required packages to use gcp specific agents
+ (bsc#1161898, bsc#1160933)
+
+-------------------------------------------------------------------
Mon Feb 3 08:58:55 UTC 2020 - Xabier Arbulu <[email protected]>
- Version bump 0.3.0
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/habootstrap-formula-0.3.0/habootstrap-formula.spec
new/habootstrap-formula-0.3.6/habootstrap-formula.spec
--- old/habootstrap-formula-0.3.0/habootstrap-formula.spec 2020-03-06
15:01:35.951485011 +0100
+++ new/habootstrap-formula-0.3.6/habootstrap-formula.spec 2020-05-27
14:43:48.277337999 +0200
@@ -17,11 +17,9 @@
# See also http://en.opensuse.org/openSUSE:Specfile_guidelines
-%define fname cluster
-%define fdir %{_datadir}/salt-formulas
Name: habootstrap-formula
-Version: 0.3.0
+Version: 0.3.6
Group: System/Packages
Release: 0
Summary: HA cluster (crmsh) deployment salt formula
@@ -34,6 +32,10 @@
Requires: salt-shaptools
Requires: salt-formulas-configuration
+%define fname cluster
+%define fdir %{_datadir}/salt-formulas
+%define ftemplates templates
+
%description
HA cluster salt deployment formula. This formula is capable to perform
the HA cluster bootstrap actions (init, join, remove) using standalone salt
@@ -49,6 +51,7 @@
mkdir -p %{buildroot}%{fdir}/states/%{fname}
mkdir -p %{buildroot}%{fdir}/metadata/%{fname}
cp -R %{fname} %{buildroot}%{fdir}/states
+cp -R %{ftemplates} %{buildroot}%{fdir}/states/%{fname}
cp -R form.yml %{buildroot}%{fdir}/metadata/%{fname}
if [ -f metadata.yml ]
then
@@ -70,6 +73,7 @@
%dir %attr(0755, root, salt) %{fdir}/metadata
%attr(0755, root, salt) %{fdir}/states/%{fname}
+%attr(0755, root, salt) %{fdir}/states/%{fname}/%{ftemplates}
%attr(0755, root, salt) %{fdir}/metadata/%{fname}
%changelog
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/habootstrap-formula-0.3.0/pillar.example
new/habootstrap-formula-0.3.6/pillar.example
--- old/habootstrap-formula-0.3.0/pillar.example 2020-03-06
15:01:35.951485011 +0100
+++ new/habootstrap-formula-0.3.6/pillar.example 2020-05-27
14:43:48.277337999 +0200
@@ -42,6 +42,18 @@
# device:
# - /dev/by-label/sbd-disk1
# - /dev/by-label/sbd-disk2
+ # # optional: Configure sbd cluster resource. This updates the resource
stonith-sbd created if sbd is enabled
+ # # Warning: sbd configuration will be overwritten if the resource is
defined in the configure template later
+ # configure_resource:
+ # #force: False # Force commit. Use with caution, this can allow invalid
parameters in the configuration
+ # params:
+ # pcmk_delay_max: 15
+ # op:
+ # monitor:
+ # timeout: 15
+ # interval: 15
+ # meta:
+ # resource-stickiness: 3000
# optional: Install required packages to run the cluster (true by default)
# pre-configured packages sometimes exist for development purposes
@@ -50,9 +62,23 @@
# optional: ntp server
# ntp: pool.ntp.org
- # optional: enable ha_exporter by default disabled
- # ha_exporter: true
-
+ # optional: enables monitoring via ha_cluster_exporter (disabled by default)
+ # the exporter will be installed and configured in all the nodes
+ monitoring_enabled: true
+
+ # optional: corosync configuration. If the entry is not set the values set
by crmsh will be used
+ # To configure the values, just create a dictionary with the values that
have to be changed
+ # If the values exists, it will be changed, otherwise it will be added.
+ # Warning. The code doesn't check if the values make sense, it will put them
in the configuration file
+ # Here an examples
+ corosync:
+ totem:
+ token: 30000
+ interface:
+ bindnetaddr: 192.168.100.1
+ quorum:
+ expected_votes: 3
+
# optional: update hacluster password
# hacluster_password: mypassword
@@ -75,10 +101,24 @@
# optional: Configure cluster resource agents and constraints
# configure:
- # method: update
- # # optional, url or template, one of them must be used
+ # # optional, configure cluster properties and defaults. Find more
information running man pacemaker-schedulerd
+ # # add key/value entries for each specific configuration set
+ # properties:
+ # stonith-timeout: 144s
+ # stonith-enabled: true
+ # rsc_defaults:
+ # resource-stickiness: 1000
+ # migration-threshold: 5000
+ # op_defaults:
+ # timeout: 600
+ # record-pending: true
+ # # optional, url or template file path to configure the cluster with a
cluster configuration file
+ # # Warning: values in the configuration file for properties, rsc_defaults
or op_defaults have
+ # # preference over the previous data in this pillar file, so they will be
overwritten
# url: path_to_configfile
- # is_xml: False
+ # method: update # update by default
+ # is_xml: False # False by default
+ # force: False # Force commit. Use with caution, this can allow invalid
parameters in the configuration. False by default
# # optional, jinja2 template can be used to create the configuration file.
# template:
# source: path_to_template
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/habootstrap-formula-0.3.0/templates/sbd_resource.j2
new/habootstrap-formula-0.3.6/templates/sbd_resource.j2
--- old/habootstrap-formula-0.3.0/templates/sbd_resource.j2 1970-01-01
01:00:00.000000000 +0100
+++ new/habootstrap-formula-0.3.6/templates/sbd_resource.j2 2020-05-27
14:43:48.277337999 +0200
@@ -0,0 +1,24 @@
+{# context is coming from configure_sbd_resource.sls #}
+
+primitive stonith-sbd stonith:external/sbd \
+ {%- if configure.params is defined and configure.params|length>0 %}
+ params \
+ {%- for param, value in configure.params.items() %}
+ {{ param }}={{ value }} \
+ {%- endfor %}
+ {%- endif %}
+ {%- if configure.op is defined and configure.op|length>0 %}
+ {%- for op_item, op_values in configure.op.items() %}
+ op \
+ {{ op_item }} \
+ {%- for op_data, op_value in op_values.items() %}
+ {{ op_data }}={{ op_value }} \
+ {%- endfor %}
+ {%- endfor %}
+ {%- endif %}
+ {%- if configure.meta is defined and configure.meta|length>0 %}
+ {%- for meta, value in configure.meta.items() %}
+ meta \
+ {{ meta }}={{ value }} \
+ {%- endfor %}
+ {%- endif %}
