Hello community,
here is the log from the commit of package habootstrap-formula for
openSUSE:Factory checked in at 2019-11-13 13:29:05
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/habootstrap-formula (Old)
and /work/SRC/openSUSE:Factory/.habootstrap-formula.new.2990 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "habootstrap-formula"
Wed Nov 13 13:29:05 2019 rev:5 rq:748022 version:0.2.9
Changes:
--------
--- /work/SRC/openSUSE:Factory/habootstrap-formula/habootstrap-formula.changes
2019-07-13 14:00:51.650889502 +0200
+++
/work/SRC/openSUSE:Factory/.habootstrap-formula.new.2990/habootstrap-formula.changes
2019-11-13 13:29:07.363747557 +0100
@@ -1,0 +2,47 @@
+Wed Oct 30 16:14:32 UTC 2019 - Xabier Arbulu <[email protected]>
+
+- Version bump 0.2.9
+ * Fix issue with file permissions during package installation in
+ /usr/share/salt-formulas (0755, root, salt)
+ (boo#1142306)
+
+-------------------------------------------------------------------
+Wed Oct 16 01:26:50 UTC 2019 - Xabier Arbulu <[email protected]>
+
+- Version bump 0.2.8
+ *Add customizable timeout to the join process and rename join_timer to
+ wait_for_initialization
+
+-------------------------------------------------------------------
+Wed Sep 18 07:51:22 UTC 2019 - Dario Maiocchi <[email protected]>
+
+- remove and replace hawk-apiserver with prometheus-ha_cluster_exporter pkg
+
+-------------------------------------------------------------------
+Wed Sep 4 07:04:48 UTC 2019 - Xabier Arbulu Insausti <[email protected]>
+
+- Update the pkg.info_available call to avoid repositories refresh as
+ it may cause errors
+- Add packages and ha_exporter options to the SUMA form.yml file
+
+-------------------------------------------------------------------
+Sun Aug 25 17:58:31 UTC 2019 - Ayoub Belarbi <[email protected]>
+
+- Version bump 0.2.6
+ * Fix typo in Pillar attribute name
+
+-------------------------------------------------------------------
+Wed Aug 21 08:19:30 UTC 2019 - Ayoub Belarbi <[email protected]>
+
+- Version bump 0.2.5
+ * Add HA monitoring to the formula
+
+-------------------------------------------------------------------
+Mon Jul 22 08:29:00 UTC 2019 - Xabier Arbulu Insausti <[email protected]>
+
+- Version bump 0.2.4
+ * Fix issue with file permissions during package installation in
+ /usr/share/salt-formulas
+ (boo#1142306)
+
+-------------------------------------------------------------------
@@ -79 +125,0 @@
-
Old:
----
habootstrap-formula-0.2.3.tar.gz
New:
----
habootstrap-formula-0.2.9.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ habootstrap-formula.spec ++++++
--- /var/tmp/diff_new_pack.nP16S5/_old 2019-11-13 13:29:07.779747993 +0100
+++ /var/tmp/diff_new_pack.nP16S5/_new 2019-11-13 13:29:07.779747993 +0100
@@ -21,7 +21,7 @@
%define fdir %{_datadir}/salt-formulas
Name: habootstrap-formula
-Version: 0.2.3
+Version: 0.2.9
Group: System/Packages
Release: 0
Summary: HA cluster (crmsh) deployment salt formula
@@ -32,11 +32,7 @@
BuildRoot: %{_tmppath}/%{name}-%{version}-build
BuildArch: noarch
Requires: salt-shaptools
-
-# On SLE/Leap 15-SP1 and TW requires the new salt-formula configuration
location.
-%if ! (0%{?sle_version:1} && 0%{?sle_version} < 150100)
-Requires: salt-standalone-formulas-configuration
-%endif
+Requires: salt-formulas-configuration
%description
HA cluster salt deployment formula. This formula is capable to perform
@@ -50,15 +46,6 @@
%install
-# before SUMA 4.0/15-SP1, install on the standard Salt Location.
-%if 0%{?sle_version:1} && 0%{?sle_version} < 150100
-
-mkdir -p %{buildroot}/srv/salt/
-cp -R %{fname} %{buildroot}/srv/salt
-
-%else
-
-# On SUMA 4.0/15-SP1, a single shared directory will be used.
mkdir -p %{buildroot}%{fdir}/states/%{fname}
mkdir -p %{buildroot}%{fdir}/metadata/%{fname}
cp -R %{fname} %{buildroot}%{fdir}/states
@@ -68,9 +55,6 @@
cp -R metadata.yml %{buildroot}%{fdir}/metadata/%{fname}
fi
-%endif
-
-%if 0%{?sle_version:1} && 0%{?sle_version} < 150100
%files
%defattr(-,root,root,-)
@@ -80,26 +64,12 @@
%doc README.md
%license LICENSE
%endif
-/srv/salt/%{fname}
-%dir %attr(0755, root, salt) /srv/salt
+%dir %attr(0755, root, salt) %{fdir}
+%dir %attr(0755, root, salt) %{fdir}/states
+%dir %attr(0755, root, salt) %{fdir}/metadata
-%else
-
-%files
-%defattr(-,root,root,-)
-%doc README.md
-%license LICENSE
-%dir %{fdir}
-%dir %{fdir}/states
-%dir %{fdir}/metadata
-%{fdir}/states/%{fname}
-%{fdir}/metadata/%{fname}
-
-%dir %attr(0750, root, salt) %{fdir}
-%dir %attr(0750, root, salt) %{fdir}/states
-%dir %attr(0750, root, salt) %{fdir}/metadata
-
-%endif
+%attr(0755, root, salt) %{fdir}/states/%{fname}
+%attr(0755, root, salt) %{fdir}/metadata/%{fname}
%changelog
++++++ habootstrap-formula-0.2.3.tar.gz -> habootstrap-formula-0.2.9.tar.gz
++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/habootstrap-formula-0.2.3/Gemfile.lock
new/habootstrap-formula-0.2.9/Gemfile.lock
--- old/habootstrap-formula-0.2.3/Gemfile.lock 2019-07-08 17:41:39.462190939
+0200
+++ new/habootstrap-formula-0.2.9/Gemfile.lock 2019-11-12 17:21:33.756093999
+0100
@@ -1,78 +1,150 @@
GEM
remote: https://rubygems.org/
specs:
- addressable (2.6.0)
- public_suffix (>= 2.0.2, < 4.0)
+ addressable (2.7.0)
+ public_suffix (>= 2.0.2, < 5.0)
aws-eventstream (1.0.3)
- aws-partitions (1.184.0)
+ aws-partitions (1.237.0)
+ aws-sdk-apigateway (1.36.0)
+ aws-sdk-core (~> 3, >= 3.71.0)
+ aws-sigv4 (~> 1.1)
+ aws-sdk-apigatewayv2 (1.14.0)
+ aws-sdk-core (~> 3, >= 3.71.0)
+ aws-sigv4 (~> 1.1)
+ aws-sdk-athena (1.21.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-cloudformation (1.24.0)
- aws-sdk-core (~> 3, >= 3.58.0)
+ aws-sdk-budgets (1.27.0)
+ aws-sdk-core (~> 3, >= 3.71.0)
+ aws-sigv4 (~> 1.1)
+ aws-sdk-cloudformation (1.27.0)
+ aws-sdk-core (~> 3, >= 3.71.0)
+ aws-sigv4 (~> 1.1)
+ aws-sdk-cloudhsm (1.19.0)
+ aws-sdk-core (~> 3, >= 3.71.0)
aws-sigv4 (~> 1.1)
- aws-sdk-cloudtrail (1.16.0)
- aws-sdk-core (~> 3, >= 3.58.0)
+ aws-sdk-cloudhsmv2 (1.19.0)
+ aws-sdk-core (~> 3, >= 3.71.0)
aws-sigv4 (~> 1.1)
- aws-sdk-cloudwatch (1.25.0)
- aws-sdk-core (~> 3, >= 3.58.0)
+ aws-sdk-cloudtrail (1.19.0)
+ aws-sdk-core (~> 3, >= 3.71.0)
aws-sigv4 (~> 1.1)
- aws-sdk-cloudwatchlogs (1.23.0)
- aws-sdk-core (~> 3, >= 3.58.0)
+ aws-sdk-cloudwatch (1.30.0)
+ aws-sdk-core (~> 3, >= 3.71.0)
aws-sigv4 (~> 1.1)
- aws-sdk-configservice (1.32.0)
- aws-sdk-core (~> 3, >= 3.58.0)
+ aws-sdk-cloudwatchlogs (1.26.0)
+ aws-sdk-core (~> 3, >= 3.71.0)
aws-sigv4 (~> 1.1)
- aws-sdk-core (3.59.0)
+ aws-sdk-codecommit (1.29.0)
+ aws-sdk-core (~> 3, >= 3.71.0)
+ aws-sigv4 (~> 1.1)
+ aws-sdk-codedeploy (1.27.0)
+ aws-sdk-core (~> 3, >= 3.71.0)
+ aws-sigv4 (~> 1.1)
+ aws-sdk-codepipeline (1.26.0)
+ aws-sdk-core (~> 3, >= 3.71.0)
+ aws-sigv4 (~> 1.1)
+ aws-sdk-configservice (1.38.0)
+ aws-sdk-core (~> 3, >= 3.71.0)
+ aws-sigv4 (~> 1.1)
+ aws-sdk-core (3.76.0)
aws-eventstream (~> 1.0, >= 1.0.2)
- aws-partitions (~> 1.0)
+ aws-partitions (~> 1, >= 1.228.0)
aws-sigv4 (~> 1.1)
jmespath (~> 1.0)
- aws-sdk-costandusagereportservice (1.15.0)
- aws-sdk-core (~> 3, >= 3.58.0)
+ aws-sdk-costandusagereportservice (1.18.0)
+ aws-sdk-core (~> 3, >= 3.71.0)
+ aws-sigv4 (~> 1.1)
+ aws-sdk-dynamodb (1.37.0)
+ aws-sdk-core (~> 3, >= 3.71.0)
aws-sigv4 (~> 1.1)
- aws-sdk-dynamodb (1.33.0)
- aws-sdk-core (~> 3, >= 3.58.0)
+ aws-sdk-ec2 (1.115.0)
+ aws-sdk-core (~> 3, >= 3.71.0)
aws-sigv4 (~> 1.1)
- aws-sdk-ec2 (1.99.0)
- aws-sdk-core (~> 3, >= 3.58.0)
+ aws-sdk-ecr (1.23.0)
+ aws-sdk-core (~> 3, >= 3.71.0)
aws-sigv4 (~> 1.1)
- aws-sdk-ecr (1.19.0)
- aws-sdk-core (~> 3, >= 3.58.0)
+ aws-sdk-ecs (1.52.0)
+ aws-sdk-core (~> 3, >= 3.71.0)
aws-sigv4 (~> 1.1)
- aws-sdk-ecs (1.43.0)
- aws-sdk-core (~> 3, >= 3.58.0)
+ aws-sdk-eks (1.27.0)
+ aws-sdk-core (~> 3, >= 3.71.0)
aws-sigv4 (~> 1.1)
- aws-sdk-eks (1.23.0)
- aws-sdk-core (~> 3, >= 3.58.0)
+ aws-sdk-elasticache (1.29.0)
+ aws-sdk-core (~> 3, >= 3.71.0)
aws-sigv4 (~> 1.1)
- aws-sdk-elasticloadbalancing (1.17.0)
- aws-sdk-core (~> 3, >= 3.58.0)
+ aws-sdk-elasticbeanstalk (1.26.0)
+ aws-sdk-core (~> 3, >= 3.71.0)
aws-sigv4 (~> 1.1)
- aws-sdk-elasticloadbalancingv2 (1.32.0)
- aws-sdk-core (~> 3, >= 3.58.0)
+ aws-sdk-elasticloadbalancing (1.19.0)
+ aws-sdk-core (~> 3, >= 3.71.0)
aws-sigv4 (~> 1.1)
- aws-sdk-iam (1.27.0)
- aws-sdk-core (~> 3, >= 3.58.0)
+ aws-sdk-elasticloadbalancingv2 (1.35.0)
+ aws-sdk-core (~> 3, >= 3.71.0)
aws-sigv4 (~> 1.1)
- aws-sdk-kms (1.23.0)
- aws-sdk-core (~> 3, >= 3.58.0)
+ aws-sdk-elasticsearchservice (1.28.0)
+ aws-sdk-core (~> 3, >= 3.71.0)
+ aws-sigv4 (~> 1.1)
+ aws-sdk-firehose (1.23.0)
+ aws-sdk-core (~> 3, >= 3.71.0)
+ aws-sigv4 (~> 1.1)
+ aws-sdk-iam (1.31.0)
+ aws-sdk-core (~> 3, >= 3.71.0)
+ aws-sigv4 (~> 1.1)
+ aws-sdk-kafka (1.15.0)
+ aws-sdk-core (~> 3, >= 3.71.0)
+ aws-sigv4 (~> 1.1)
+ aws-sdk-kinesis (1.20.0)
+ aws-sdk-core (~> 3, >= 3.71.0)
+ aws-sigv4 (~> 1.1)
+ aws-sdk-kms (1.25.0)
+ aws-sdk-core (~> 3, >= 3.71.0)
+ aws-sigv4 (~> 1.1)
+ aws-sdk-lambda (1.31.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.62.0)
- aws-sdk-core (~> 3, >= 3.58.0)
+ aws-sdk-rds (1.70.0)
+ aws-sdk-core (~> 3, >= 3.71.0)
+ aws-sigv4 (~> 1.1)
+ aws-sdk-redshift (1.33.0)
+ aws-sdk-core (~> 3, >= 3.71.0)
+ aws-sigv4 (~> 1.1)
+ aws-sdk-route53 (1.30.0)
+ aws-sdk-core (~> 3, >= 3.71.0)
+ aws-sigv4 (~> 1.1)
+ aws-sdk-route53domains (1.18.0)
+ aws-sdk-core (~> 3, >= 3.71.0)
+ aws-sigv4 (~> 1.1)
+ aws-sdk-route53resolver (1.11.0)
+ aws-sdk-core (~> 3, >= 3.71.0)
aws-sigv4 (~> 1.1)
- aws-sdk-s3 (1.45.0)
- aws-sdk-core (~> 3, >= 3.58.0)
+ aws-sdk-s3 (1.53.0)
+ aws-sdk-core (~> 3, >= 3.71.0)
aws-sdk-kms (~> 1)
aws-sigv4 (~> 1.1)
- aws-sdk-sns (1.18.0)
- aws-sdk-core (~> 3, >= 3.58.0)
+ aws-sdk-securityhub (1.14.0)
+ aws-sdk-core (~> 3, >= 3.71.0)
aws-sigv4 (~> 1.1)
- aws-sdk-sqs (1.18.0)
- aws-sdk-core (~> 3, >= 3.58.0)
+ aws-sdk-ses (1.27.0)
+ aws-sdk-core (~> 3, >= 3.71.0)
+ aws-sigv4 (~> 1.1)
+ aws-sdk-sms (1.17.0)
+ aws-sdk-core (~> 3, >= 3.71.0)
+ aws-sigv4 (~> 1.1)
+ aws-sdk-sns (1.20.0)
+ aws-sdk-core (~> 3, >= 3.71.0)
+ aws-sigv4 (~> 1.1)
+ aws-sdk-sqs (1.23.1)
+ aws-sdk-core (~> 3, >= 3.71.0)
+ aws-sigv4 (~> 1.1)
+ aws-sdk-ssm (1.59.0)
+ aws-sdk-core (~> 3, >= 3.71.0)
aws-sigv4 (~> 1.1)
aws-sigv4 (1.1.0)
aws-eventstream (~> 1.0, >= 1.0.2)
@@ -80,10 +152,30 @@
ms_rest_azure (~> 0.11.0)
azure_mgmt_key_vault (0.17.4)
ms_rest_azure (~> 0.11.0)
- azure_mgmt_resources (0.17.5)
+ azure_mgmt_resources (0.17.7)
ms_rest_azure (~> 0.11.1)
bcrypt_pbkdf (1.0.1)
builder (3.2.3)
+ chef-config (15.4.45)
+ addressable
+ fuzzyurl
+ mixlib-config (>= 2.2.12, < 4.0)
+ mixlib-shellout (>= 2.0, < 4.0)
+ tomlrb (~> 1.2)
+ chef-core (0.0.6)
+ chef-telemetry
+ mixlib-log
+ pastel
+ r18n-desktop
+ train-core (~> 2.0, >= 2.0.12)
+ tty-color
+ tty-cursor
+ tty-spinner
+ chef-telemetry (0.1.8)
+ chef-config
+ concurrent-ruby (~> 1.0)
+ ffi-yajl (~> 2.2)
+ http (~> 2.2)
coderay (1.1.2)
concurrent-ruby (1.1.5)
declarative (0.0.10)
@@ -95,17 +187,20 @@
domain_name (0.5.20190701)
unf (>= 0.0.5, < 1.0.0)
ed25519 (1.2.4)
- equatable (0.5.0)
- erubis (2.7.0)
- excon (0.64.0)
- faraday (0.15.4)
+ equatable (0.6.1)
+ erubi (1.9.0)
+ excon (0.68.0)
+ faraday (0.17.0)
multipart-post (>= 1.2, < 3)
faraday-cookie_jar (0.0.6)
faraday (>= 0.7.4)
http-cookie (~> 1.0.0)
faraday_middleware (0.12.2)
faraday (>= 0.7.4, < 1.0)
- ffi (1.11.1)
+ ffi (1.11.2)
+ ffi-yajl (2.3.1)
+ libyajl2 (~> 1.2)
+ fuzzyurl (0.9.0)
google-api-client (0.23.9)
addressable (~> 2.5, >= 2.5.1)
googleauth (>= 0.5, < 0.7.0)
@@ -127,12 +222,20 @@
builder (>= 2.1.2)
hashie (3.6.0)
htmlentities (4.3.4)
+ http (2.2.2)
+ addressable (~> 2.3)
+ http-cookie (~> 1.0)
+ http-form_data (~> 1.0.1)
+ http_parser.rb (~> 0.6.0)
http-cookie (1.0.3)
domain_name (~> 0.5)
+ http-form_data (1.0.3)
+ http_parser.rb (0.6.0)
httpclient (2.8.3)
inifile (3.0.0)
- inspec (4.6.9)
+ inspec (4.18.24)
addressable (~> 2.4)
+ chef-core (~> 0.0)
faraday (>= 0.9.0)
faraday_middleware (~> 0.12.2)
hashie (~> 3.4)
@@ -145,7 +248,7 @@
parallel (~> 1.9)
parslet (~> 1.5)
pry (~> 0)
- rspec (~> 3)
+ rspec (~> 3.0, < 3.9)
rspec-its (~> 1.2)
rubyzip (~> 1.2, >= 1.2.2)
semverse
@@ -153,9 +256,10 @@
term-ansicolor
thor (~> 0.20)
tomlrb (~> 1.2)
- train (~> 2.0)
+ train (~> 3.0)
train-aws (~> 0.1)
train-habitat (~> 0.1)
+ train-winrm (~> 0.2)
tty-prompt (~> 0.17)
tty-table (~> 0.10)
jmespath (1.4.0)
@@ -165,13 +269,14 @@
jwt (2.2.1)
kitchen-docker (2.9.0)
test-kitchen (>= 1.0.0)
- kitchen-inspec (1.1.0)
+ kitchen-inspec (1.3.1)
hashie (~> 3.4)
inspec (>= 1.47, < 5.0)
test-kitchen (>= 1.6, < 3)
kitchen-salt (0.6.0)
hashie (>= 3.5)
test-kitchen (>= 1.4)
+ libyajl2 (1.2.0)
license-acceptance (1.0.13)
pastel (~> 0.7)
tomlrb (~> 1.2)
@@ -181,17 +286,19 @@
logging (2.2.2)
little-plugger (~> 1.1)
multi_json (~> 1.10)
- memoist (0.16.0)
+ memoist (0.16.1)
method_source (0.9.2)
- mime-types (3.2.2)
+ mime-types (3.3)
mime-types-data (~> 3.2015)
- mime-types-data (3.2019.0331)
- mixlib-install (3.11.18)
+ mime-types-data (3.2019.1009)
+ mixlib-config (3.0.1)
+ tomlrb
+ mixlib-install (3.11.21)
mixlib-shellout
mixlib-versioning
thor
mixlib-log (3.0.1)
- mixlib-shellout (2.4.4)
+ mixlib-shellout (3.0.7)
mixlib-versioning (1.2.7)
ms_rest (0.7.4)
concurrent-ruby (~> 1.0)
@@ -203,9 +310,9 @@
faraday-cookie_jar (~> 0.0.6)
ms_rest (~> 0.7.4)
unf_ext (= 0.0.7.2)
- multi_json (1.13.1)
+ multi_json (1.14.1)
multipart-post (2.1.1)
- necromancer (0.4.0)
+ necromancer (0.5.0)
net-scp (2.0.0)
net-ssh (>= 2.6.5, < 6.0.0)
net-ssh (5.2.0)
@@ -213,15 +320,18 @@
net-ssh (>= 4.0.0)
nori (2.6.0)
os (1.0.1)
- parallel (1.17.0)
+ parallel (1.18.0)
parslet (1.8.2)
- pastel (0.7.2)
- equatable (~> 0.5.0)
- tty-color (~> 0.4.0)
+ pastel (0.7.3)
+ equatable (~> 0.6)
+ tty-color (~> 0.5)
pry (0.12.2)
coderay (~> 1.1.0)
method_source (~> 0.9.0)
- public_suffix (3.1.1)
+ public_suffix (4.0.1)
+ r18n-core (3.2.0)
+ r18n-desktop (3.2.0)
+ r18n-core (= 3.2.0)
representable (3.0.4)
declarative (< 0.1.0)
declarative-option (< 0.2.0)
@@ -233,38 +343,38 @@
rspec-mocks (~> 3.8.0)
rspec-core (3.8.2)
rspec-support (~> 3.8.0)
- rspec-expectations (3.8.4)
+ rspec-expectations (3.8.6)
diff-lcs (>= 1.2.0, < 2.0)
rspec-support (~> 3.8.0)
rspec-its (1.3.0)
rspec-core (>= 3.0.0)
rspec-expectations (>= 3.0.0)
- rspec-mocks (3.8.1)
+ rspec-mocks (3.8.2)
diff-lcs (>= 1.2.0, < 2.0)
rspec-support (~> 3.8.0)
- rspec-support (3.8.2)
+ rspec-support (3.8.3)
rubyntlm (0.6.2)
- rubyzip (1.2.3)
+ rubyzip (1.3.0)
semverse (3.0.0)
- signet (0.11.0)
+ signet (0.12.0)
addressable (~> 2.3)
faraday (~> 0.9)
jwt (>= 1.5, < 3.0)
multi_json (~> 1.10)
sslshake (1.3.0)
- strings (0.1.5)
+ strings (0.1.6)
strings-ansi (~> 0.1)
unicode-display_width (~> 1.5)
unicode_utils (~> 1.4)
strings-ansi (0.1.0)
term-ansicolor (1.7.1)
tins (~> 1.0)
- test-kitchen (2.2.5)
+ test-kitchen (2.3.4)
bcrypt_pbkdf (~> 1.0)
ed25519 (~> 1.2)
license-acceptance (~> 1.0, >= 1.0.11)
mixlib-install (~> 3.6)
- mixlib-shellout (>= 1.2, < 3.0)
+ mixlib-shellout (>= 1.2, < 4.0)
net-scp (>= 1.1, < 3.0)
net-ssh (>= 2.9, < 6.0)
net-ssh-gateway (>= 1.2, < 3.0)
@@ -274,10 +384,9 @@
winrm-fs (~> 1.1)
thor (0.20.3)
timeliness (0.3.10)
- timers (4.3.0)
- tins (1.21.0)
+ tins (1.22.0)
tomlrb (1.2.8)
- train (2.1.13)
+ train (3.1.4)
azure_graph_rbac (~> 0.16)
azure_mgmt_key_vault (~> 0.17)
azure_mgmt_resources (~> 0.15)
@@ -289,14 +398,21 @@
mixlib-shellout (>= 2.0, < 4.0)
net-scp (>= 1.2, < 3.0)
net-ssh (>= 2.9, < 6.0)
- winrm (~> 2.0)
- winrm-fs (~> 1.0)
- train-aws (0.1.6)
+ train-aws (0.1.12)
+ aws-sdk-apigateway (~> 1)
+ aws-sdk-apigatewayv2 (~> 1)
+ aws-sdk-athena (~> 1)
aws-sdk-autoscaling (~> 1.22.0)
+ aws-sdk-budgets (~> 1)
aws-sdk-cloudformation (~> 1)
+ aws-sdk-cloudhsm (~> 1)
+ aws-sdk-cloudhsmv2 (~> 1)
aws-sdk-cloudtrail (~> 1.8)
aws-sdk-cloudwatch (~> 1.13)
aws-sdk-cloudwatchlogs (~> 1.13)
+ aws-sdk-codecommit (~> 1)
+ aws-sdk-codedeploy (~> 1)
+ aws-sdk-codepipeline (~> 1)
aws-sdk-configservice (~> 1.21)
aws-sdk-core (~> 3.0)
aws-sdk-costandusagereportservice (~> 1.6)
@@ -305,65 +421,89 @@
aws-sdk-ecr (~> 1.18)
aws-sdk-ecs (~> 1.30)
aws-sdk-eks (~> 1.9)
+ aws-sdk-elasticache (~> 1)
+ aws-sdk-elasticbeanstalk (~> 1)
aws-sdk-elasticloadbalancing (~> 1.8)
aws-sdk-elasticloadbalancingv2 (~> 1)
+ aws-sdk-elasticsearchservice (~> 1)
+ aws-sdk-firehose (~> 1)
aws-sdk-iam (~> 1.13)
+ aws-sdk-kafka (~> 1)
+ aws-sdk-kinesis (~> 1)
aws-sdk-kms (~> 1.13)
+ aws-sdk-lambda (~> 1)
aws-sdk-organizations (~> 1.17.0)
aws-sdk-rds (~> 1.43)
+ aws-sdk-redshift (~> 1)
+ aws-sdk-route53 (~> 1)
+ aws-sdk-route53domains (~> 1)
+ aws-sdk-route53resolver (~> 1)
aws-sdk-s3 (~> 1.30)
+ aws-sdk-securityhub (~> 1)
+ aws-sdk-ses (~> 1)
+ aws-sdk-sms (~> 1)
aws-sdk-sns (~> 1.9)
aws-sdk-sqs (~> 1.10)
- train (~> 2.0)
- train-habitat (0.1.1)
- train (>= 1.7.5, < 3.0)
- tty-box (0.3.0)
+ aws-sdk-ssm (~> 1)
+ train-core (2.1.19)
+ json (>= 1.8, < 3.0)
+ mixlib-shellout (>= 2.0, < 4.0)
+ net-scp (>= 1.2, < 3.0)
+ net-ssh (>= 2.9, < 6.0)
+ winrm (~> 2.0)
+ winrm-fs (~> 1.0)
+ train-habitat (0.2.12)
+ train-winrm (0.2.5)
+ winrm (~> 2.0)
+ winrm-fs (~> 1.0)
+ tty-box (0.5.0)
pastel (~> 0.7.2)
- strings (~> 0.1.4)
- tty-cursor (~> 0.6.0)
- tty-color (0.4.3)
- tty-cursor (0.6.1)
- tty-prompt (0.18.1)
- necromancer (~> 0.4.0)
+ strings (~> 0.1.6)
+ tty-cursor (~> 0.7)
+ tty-color (0.5.0)
+ tty-cursor (0.7.0)
+ tty-prompt (0.19.0)
+ necromancer (~> 0.5.0)
pastel (~> 0.7.0)
- timers (~> 4.0)
- tty-cursor (~> 0.6.0)
- tty-reader (~> 0.5.0)
- tty-reader (0.5.0)
- tty-cursor (~> 0.6.0)
- tty-screen (~> 0.6.4)
+ tty-reader (~> 0.6.0)
+ tty-reader (0.6.0)
+ tty-cursor (~> 0.7)
+ tty-screen (~> 0.7)
wisper (~> 2.0.0)
- tty-screen (0.6.5)
- tty-table (0.10.0)
- equatable (~> 0.5.0)
- necromancer (~> 0.4.0)
+ tty-screen (0.7.0)
+ tty-spinner (0.9.1)
+ tty-cursor (~> 0.7)
+ tty-table (0.11.0)
+ equatable (~> 0.6)
+ necromancer (~> 0.5)
pastel (~> 0.7.2)
- strings (~> 0.1.0)
- tty-screen (~> 0.6.4)
+ strings (~> 0.1.5)
+ tty-screen (~> 0.7)
uber (0.1.0)
unf (0.1.4)
unf_ext
unf_ext (0.0.7.2)
unicode-display_width (1.6.0)
unicode_utils (1.4.0)
- winrm (2.3.2)
+ winrm (2.3.3)
builder (>= 2.1.2)
- erubis (~> 2.7)
+ erubi (~> 1.8)
gssapi (~> 1.2)
gyoku (~> 1.0)
httpclient (~> 2.2, >= 2.2.0.2)
logging (>= 1.6.1, < 3.0)
nori (~> 2.0)
rubyntlm (~> 0.6.0, >= 0.6.1)
- winrm-elevated (1.1.1)
+ winrm-elevated (1.1.2)
+ erubi (~> 1.8)
winrm (~> 2.0)
winrm-fs (~> 1.0)
- winrm-fs (1.3.2)
- erubis (~> 2.7)
+ winrm-fs (1.3.3)
+ erubi (~> 1.8)
logging (>= 1.6.1, < 3.0)
rubyzip (~> 1.1)
winrm (~> 2.0)
- wisper (2.0.0)
+ wisper (2.0.1)
PLATFORMS
ruby
@@ -375,4 +515,4 @@
test-kitchen
BUNDLED WITH
- 1.17.3
+ 2.0.1
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/habootstrap-formula-0.2.3/README.md
new/habootstrap-formula-0.2.9/README.md
--- old/habootstrap-formula-0.2.3/README.md 2019-07-08 17:41:39.462190939
+0200
+++ new/habootstrap-formula-0.2.9/README.md 2019-11-12 17:21:33.756093999
+0100
@@ -107,6 +107,6 @@
> Note: The current solution is to query **hawk** status. This doesn't exactly
> represent the state of **pacemaker** (hawk initialization is independent).
-> Increasing the `join_timer` to wait pacemaker may help in some cases.
+> Increasing the `wait_for_initialization` to wait pacemaker may help in some
cases.
TODO: Replace to query **hawk** by checking **pacemaker** directly.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/habootstrap-formula-0.2.3/ci/validate-formula.sh
new/habootstrap-formula-0.2.9/ci/validate-formula.sh
--- old/habootstrap-formula-0.2.3/ci/validate-formula.sh 1970-01-01
01:00:00.000000000 +0100
+++ new/habootstrap-formula-0.2.9/ci/validate-formula.sh 2019-11-12
17:21:33.756093999 +0100
@@ -0,0 +1,105 @@
+#! /bin/bash
+
+# this script is intended to be executed via PRs travis CI
+set -e
+
+## this will generate the pillar
+function generate_cluster_pillar {
+ METHOD="$1"
+ cat > test/pillar/cluster.sls <<EOF
+ cluster:
+ name: 'hacluster'
+ $METHOD
+ remove: ['hana03']
+ interface: 'eth1'
+ watchdog:
+ module: softdog
+ device: /dev/watchdog
+ sbd:
+ device: '/dev/vdc'
+ ntp: pool.ntp.org
+ sshkeys:
+ overwrite: true
+ password: linux
+ resource_agents:
+ - SAPHanaSR
+ configure:
+ method: update
+ template:
+ source: /srv/salt/hana/templates/scale_up_resources.j2
+ parameters:
+ sid: prd
+ instance: 00
+ virtual_ip: 192.168.107.50
+ virtual_ip_mask: 24
+ platform: libvirt
+ prefer_takeover: true
+ auto_register: false
+EOF
+}
+
+
+
+echo "==========================================="
+echo " generating pillar and top.sls conf files "
+echo "==========================================="
+
+generate_cluster_pillar "init: 'hana01'"
+cat > top.sls <<EOF
+base:
+ '*':
+ - cluster
+EOF
+
+echo "top.sls and pillar --> DONE"
+echo
+
+
+echo "==========================================="
+echo "Using primary host - Running init"
+echo "==========================================="
+
+cat >grains <<EOF
+host: hana01
+EOF
+
+cat >minion <<EOF
+root_dir: $PWD
+id: travis
+EOF
+
+sudo salt-call state.show_highstate --local --file-root=./ --config-dir=.
--pillar-root=test/pillar --retcode-passthrough -l debug
+
+echo
+echo "==========================================="
+echo " Using secondary host - Running join "
+echo "==========================================="
+
+generate_cluster_pillar "init: 'hana01'"
+cat >grains <<EOF
+host: hana02
+EOF
+
+cat >minion <<EOF
+root_dir: $PWD
+id: travis
+EOF
+
+sudo salt-call state.show_highstate --local --file-root=./ --config-dir=.
--pillar-root=test/pillar --retcode-passthrough -l debug
+
+echo
+echo "==========================================="
+echo " Using third host - Running remove "
+echo "==========================================="
+
+generate_cluster_pillar "init: 'hana01'"
+cat >grains <<EOF
+host: hana03
+EOF
+
+cat >minion <<EOF
+root_dir: $PWD
+id: travis
+EOF
+
+sudo salt-call state.show_highstate --local --file-root=./ --config-dir=.
--pillar-root=test/pillar --retcode-passthrough -l debug
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/habootstrap-formula-0.2.3/cluster/defaults.yaml
new/habootstrap-formula-0.2.9/cluster/defaults.yaml
--- old/habootstrap-formula-0.2.3/cluster/defaults.yaml 2019-07-08
17:41:39.462190939 +0200
+++ new/habootstrap-formula-0.2.9/cluster/defaults.yaml 2019-11-12
17:21:33.756093999 +0100
@@ -1,3 +1,5 @@
cluster:
name: hacluster
install_packages: true
+ join_timeout: 60
+ wait_for_initialization: 20
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/habootstrap-formula-0.2.3/cluster/init.sls
new/habootstrap-formula-0.2.9/cluster/init.sls
--- old/habootstrap-formula-0.2.3/cluster/init.sls 2019-07-08
17:41:39.462190939 +0200
+++ new/habootstrap-formula-0.2.9/cluster/init.sls 2019-11-12
17:21:33.756093999 +0100
@@ -27,3 +27,6 @@
{% else %}
- .join
{% endif %}
+{% if cluster.ha_exporter is sameas true %}
+ - .monitoring
+{% endif %}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/habootstrap-formula-0.2.3/cluster/join.sls
new/habootstrap-formula-0.2.9/cluster/join.sls
--- old/habootstrap-formula-0.2.3/cluster/join.sls 2019-07-08
17:41:39.462190939 +0200
+++ new/habootstrap-formula-0.2.9/cluster/join.sls 2019-11-12
17:21:33.756093999 +0100
@@ -6,11 +6,11 @@
- request_interval: 5
- status: 200
- verify_ssl: false
- - wait_for: 60
+ - wait_for: {{ cluster.join_timeout }}
wait-for-total-initialization:
cmd.run:
- - name: 'sleep {{ cluster.join_timer|default(20) }}'
+ - name: 'sleep {{ cluster.wait_for_initialization }}'
- require:
- wait-for-cluster
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/habootstrap-formula-0.2.3/cluster/monitoring.sls
new/habootstrap-formula-0.2.9/cluster/monitoring.sls
--- old/habootstrap-formula-0.2.3/cluster/monitoring.sls 1970-01-01
01:00:00.000000000 +0100
+++ new/habootstrap-formula-0.2.9/cluster/monitoring.sls 2019-11-12
17:21:33.756093999 +0100
@@ -0,0 +1,11 @@
+prometheus_ha_cluster_exporter:
+ pkg.installed:
+ - name: prometheus-ha_cluster_exporter
+
+ha_cluster_exporter_service:
+ service.running:
+ - name: prometheus-ha_cluster_exporter
+ - enable: True
+ - restart: True
+ - require:
+ - pkg: prometheus_ha_cluster_exporter
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/habootstrap-formula-0.2.3/cluster/packages.sls
new/habootstrap-formula-0.2.9/cluster/packages.sls
--- old/habootstrap-formula-0.2.3/cluster/packages.sls 2019-07-08
17:41:39.462190939 +0200
+++ new/habootstrap-formula-0.2.9/cluster/packages.sls 2019-11-12
17:21:33.756093999 +0100
@@ -1,12 +1,15 @@
#required packages to install HA cluster
+{%- from "cluster/map.jinja" import cluster with context -%}
+
{% set pattern_available = 1 %}
{% if grains['os_family'] == 'Suse' %}
{% set pattern_available = salt['cmd.retcode']('zypper search
patterns-ha-ha_sles') %}
{% endif %}
{% if pattern_available == 0 %}
-{% set repo =
salt['pkg.info_available']('patterns-ha-ha_sles')['patterns-ha-ha_sles']['repository']
%}
+# refresh is disabled to avoid errors during the call
+{% set repo = salt['pkg.info_available']('patterns-ha-ha_sles',
refresh=False)['patterns-ha-ha_sles']['repository'] %}
patterns-ha-ha_sles:
pkg.installed:
- fromrepo: {{ repo }}
@@ -22,8 +25,17 @@
attempts: 3
interval: 15
- pkgs:
+ - corosync
- crmsh
+ - csync2
+ - drbd
+ - drbd-utils
+ - fence-agents
- ha-cluster-bootstrap
- hawk2
+ - hawk-apiserver
+ - pacemaker
+ - resource-agents
+ - sbd
{% endif %}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/habootstrap-formula-0.2.3/cluster/pre_validation.sls
new/habootstrap-formula-0.2.9/cluster/pre_validation.sls
--- old/habootstrap-formula-0.2.3/cluster/pre_validation.sls 2019-07-08
17:41:39.462190939 +0200
+++ new/habootstrap-formula-0.2.9/cluster/pre_validation.sls 2019-11-12
17:21:33.756093999 +0100
@@ -14,3 +14,9 @@
{% endif %}
{% endif %}
{% endif %}
+
+{# Check HA exporter #}
+{% if cluster.add_exporter is defined and cluster.add_exporter == false %}
+ {% do cluster.pop('ha_exporter') %}
+{% endif %}
+{# Check HA exporter finish #}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/habootstrap-formula-0.2.3/form.yml
new/habootstrap-formula-0.2.9/form.yml
--- old/habootstrap-formula-0.2.3/form.yml 2019-07-08 17:41:39.462190939
+0200
+++ new/habootstrap-formula-0.2.9/form.yml 2019-11-12 17:21:33.756093999
+0100
@@ -2,9 +2,16 @@
$name: Cluster
$type: namespace
+ install_packages:
+ $name: Install required packages
+ $type: boolean
+ $default: true
+ $help: Install all required packages from currently existing repositories
+
name:
$name: Cluster name
$default: hacluster
+ $optional: false
init:
$name: First node
@@ -18,7 +25,11 @@
interface:
$type: text
$default: wlan0
- $optional: false
+ $optional: true
+
+ admin_ip:
+ $type: text
+ $optional: true
ntp:
$type: text
@@ -143,3 +154,18 @@
value:
$name: Parameter value
$optional: true
+
+ add_exporter:
+ $name: Add HA cluster metrics exporter
+ $type: boolean
+ $default: false
+ $help: Mark if you want add the HA cluster metrics exporter
+ ha_exporter:
+ $name: HA cluster metrics exporter
+ $optional: true
+ $visibleIf: .add_exporter == true
+ $type: group
+ exposition_port:
+ $name: HA cluster exporter (hawk-apiserver) exposition port
+ $type: text
+ $optional: true
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/habootstrap-formula-0.2.3/habootstrap-formula.changes
new/habootstrap-formula-0.2.9/habootstrap-formula.changes
--- old/habootstrap-formula-0.2.3/habootstrap-formula.changes 2019-07-08
17:41:39.462190939 +0200
+++ new/habootstrap-formula-0.2.9/habootstrap-formula.changes 2019-11-12
17:21:33.756093999 +0100
@@ -1,4 +1,51 @@
-------------------------------------------------------------------
+Wed Oct 30 16:14:32 UTC 2019 - Xabier Arbulu <[email protected]>
+
+- Version bump 0.2.9
+ * Fix issue with file permissions during package installation in
+ /usr/share/salt-formulas (0755, root, salt)
+ (boo#1142306)
+
+-------------------------------------------------------------------
+Wed Oct 16 01:26:50 UTC 2019 - Xabier Arbulu <[email protected]>
+
+- Version bump 0.2.8
+ *Add customizable timeout to the join process and rename join_timer to
+ wait_for_initialization
+
+-------------------------------------------------------------------
+Wed Sep 18 07:51:22 UTC 2019 - Dario Maiocchi <[email protected]>
+
+- remove and replace hawk-apiserver with prometheus-ha_cluster_exporter pkg
+
+-------------------------------------------------------------------
+Wed Sep 4 07:04:48 UTC 2019 - Xabier Arbulu Insausti <[email protected]>
+
+- Update the pkg.info_available call to avoid repositories refresh as
+ it may cause errors
+- Add packages and ha_exporter options to the SUMA form.yml file
+
+-------------------------------------------------------------------
+Sun Aug 25 17:58:31 UTC 2019 - Ayoub Belarbi <[email protected]>
+
+- Version bump 0.2.6
+ * Fix typo in Pillar attribute name
+
+-------------------------------------------------------------------
+Wed Aug 21 08:19:30 UTC 2019 - Ayoub Belarbi <[email protected]>
+
+- Version bump 0.2.5
+ * Add HA monitoring to the formula
+
+-------------------------------------------------------------------
+Mon Jul 22 08:29:00 UTC 2019 - Xabier Arbulu Insausti <[email protected]>
+
+- Version bump 0.2.4
+ * Fix issue with file permissions during package installation in
+ /usr/share/salt-formulas
+ (boo#1142306)
+
+-------------------------------------------------------------------
Fri Jul 5 12:24:40 UTC 2019 - Dario Maiocchi <[email protected]>
- Make pkg.install more resilient, allowing retries during install
@@ -76,4 +123,3 @@
Thu Sep 6 12:37:13 UTC 2018 - [email protected]
- Initial version
-
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/habootstrap-formula-0.2.3/habootstrap-formula.spec
new/habootstrap-formula-0.2.9/habootstrap-formula.spec
--- old/habootstrap-formula-0.2.3/habootstrap-formula.spec 2019-07-08
17:41:39.462190939 +0200
+++ new/habootstrap-formula-0.2.9/habootstrap-formula.spec 2019-11-12
17:21:33.756093999 +0100
@@ -21,7 +21,7 @@
%define fdir %{_datadir}/salt-formulas
Name: habootstrap-formula
-Version: 0.2.3
+Version: 0.2.9
Group: System/Packages
Release: 0
Summary: HA cluster (crmsh) deployment salt formula
@@ -32,11 +32,7 @@
BuildRoot: %{_tmppath}/%{name}-%{version}-build
BuildArch: noarch
Requires: salt-shaptools
-
-# On SLE/Leap 15-SP1 and TW requires the new salt-formula configuration
location.
-%if ! (0%{?sle_version:1} && 0%{?sle_version} < 150100)
-Requires: salt-standalone-formulas-configuration
-%endif
+Requires: salt-formulas-configuration
%description
HA cluster salt deployment formula. This formula is capable to perform
@@ -50,15 +46,6 @@
%install
-# before SUMA 4.0/15-SP1, install on the standard Salt Location.
-%if 0%{?sle_version:1} && 0%{?sle_version} < 150100
-
-mkdir -p %{buildroot}/srv/salt/
-cp -R %{fname} %{buildroot}/srv/salt
-
-%else
-
-# On SUMA 4.0/15-SP1, a single shared directory will be used.
mkdir -p %{buildroot}%{fdir}/states/%{fname}
mkdir -p %{buildroot}%{fdir}/metadata/%{fname}
cp -R %{fname} %{buildroot}%{fdir}/states
@@ -68,9 +55,6 @@
cp -R metadata.yml %{buildroot}%{fdir}/metadata/%{fname}
fi
-%endif
-
-%if 0%{?sle_version:1} && 0%{?sle_version} < 150100
%files
%defattr(-,root,root,-)
@@ -80,26 +64,12 @@
%doc README.md
%license LICENSE
%endif
-/srv/salt/%{fname}
-%dir %attr(0755, root, salt) /srv/salt
+%dir %attr(0755, root, salt) %{fdir}
+%dir %attr(0755, root, salt) %{fdir}/states
+%dir %attr(0755, root, salt) %{fdir}/metadata
-%else
-
-%files
-%defattr(-,root,root,-)
-%doc README.md
-%license LICENSE
-%dir %{fdir}
-%dir %{fdir}/states
-%dir %{fdir}/metadata
-%{fdir}/states/%{fname}
-%{fdir}/metadata/%{fname}
-
-%dir %attr(0750, root, salt) %{fdir}
-%dir %attr(0750, root, salt) %{fdir}/states
-%dir %attr(0750, root, salt) %{fdir}/metadata
-
-%endif
+%attr(0755, root, salt) %{fdir}/states/%{fname}
+%attr(0755, root, salt) %{fdir}/metadata/%{fname}
%changelog
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/habootstrap-formula-0.2.3/pillar.example
new/habootstrap-formula-0.2.9/pillar.example
--- old/habootstrap-formula-0.2.3/pillar.example 2019-07-08
17:41:39.462190939 +0200
+++ new/habootstrap-formula-0.2.9/pillar.example 2019-11-12
17:21:33.756093999 +0100
@@ -26,7 +26,10 @@
# optional: Time in seconds between hawk service is available in the first
# node and join command is executed (20s by default)
- # join_timer: 20
+ # wait_for_initialization: 20
+
+ # optional: Timeout in seconds to join to the cluster
+ # join_timeout: 60
# optional: Configure a virtual IP resource in cluster
# admin_ip: 10.20.30.40
@@ -43,6 +46,9 @@
# optional: ntp server
# ntp: pool.ntp.org
+ # optional: enable ha_exporter by default disabled
+ ha_exporter: true
+
# optional: Authorize ssh connection from nodes to willing to join
# ssheys:
# # Overwrite current keys
