Hello community, here is the log from the commit of package habootstrap-formula for openSUSE:Factory checked in at 2019-07-04 15:43:22 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/habootstrap-formula (Old) and /work/SRC/openSUSE:Factory/.habootstrap-formula.new.4615 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "habootstrap-formula" Thu Jul 4 15:43:22 2019 rev:3 rq:713173 version:0.2.2 Changes: -------- --- /work/SRC/openSUSE:Factory/habootstrap-formula/habootstrap-formula.changes 2019-06-01 09:56:58.859171041 +0200 +++ /work/SRC/openSUSE:Factory/.habootstrap-formula.new.4615/habootstrap-formula.changes 2019-07-04 15:43:23.758120881 +0200 @@ -1,0 +2,27 @@ +Tue Jul 2 11:18:50 UTC 2019 - Diego Vinicius Akechi <dake...@suse.com> + +- Version bump 0.2.2 + * Change the salt-formula directories permissions to 0750 to avoid + conflicts with the package salt-standalone-formulas-configuration. + + * Correct the required package name to + salt-standalone-formulas-configuration + +------------------------------------------------------------------- +Tue Jun 11 11:40:06 UTC 2019 - Xabier Arbulu Insausti <xarb...@suse.com> + +- Create package version 0.2.1 with fixed spec files. Now the package + is available in all SLE12 and SLE15 versions (boo#1137989, jsc#SLE-4031) + +------------------------------------------------------------------- +Fri May 31 13:14:43 UTC 2019 - Diego Vinicius Akechi <dake...@suse.com> + +- Version bump 0.2.0 + * Include the salt-formulas-configuration dependency on + SLE/Leap 15-SP1 and higher. This package configures the shared salt + formulas location (/usr/share/salt-formulas) to be used by SUMA 4.0 + or salt in standalone mode. + * Drops the habootstrap-formula-suma package, as the forms metadata + will be available only on SUMA 4.0 using the shared location. + +------------------------------------------------------------------- Old: ---- habootstrap-formula-0.1.0.tar.gz New: ---- habootstrap-formula-0.2.2.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ habootstrap-formula.spec ++++++ --- /var/tmp/diff_new_pack.TOxBk6/_old 2019-07-04 15:43:24.318121756 +0200 +++ /var/tmp/diff_new_pack.TOxBk6/_new 2019-07-04 15:43:24.318121756 +0200 @@ -18,12 +18,12 @@ # See also http://en.opensuse.org/openSUSE:Specfile_guidelines %define fname cluster -%define fdir %{_datadir}/susemanager/formulas +%define fdir %{_datadir}/salt-formulas Name: habootstrap-formula -Version: 0.1.0 +Version: 0.2.2 Group: System/Packages -Release: 1 +Release: 0 Summary: HA cluster (crmsh) deployment salt formula License: Apache-2.0 @@ -33,17 +33,15 @@ 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 %description -HA cluster (crmsh) deployment salt formula - -# package to deploy on SUMA specific path. -%package suma -Summary: HA cluster (crmsh) deployment salt formula (SUMA specific) -Requires: salt-shaptools - -%description suma -HA Cluster Bootstrap Salt Formula for SUSE Manager. Used to configure a basic HA cluster. +HA cluster salt deployment formula. This formula is capable to perform +the HA cluster bootstrap actions (init, join, remove) using standalone salt +or via SUSE Manager formulas with forms, available on SUSE Manager 4.0. %prep %setup -q @@ -51,10 +49,16 @@ %build %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 -# SUMA Specific +%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 @@ -64,39 +68,38 @@ cp -R metadata.yml %{buildroot}%{fdir}/metadata/%{fname} fi +%endif + +%if 0%{?sle_version:1} && 0%{?sle_version} < 150100 + %files %defattr(-,root,root,-) -# %license macro is not available on older releases -%if 0%{?sle_version} <= 120300 -%doc LICENSE +%if 0%{?sle_version} < 120300 +%doc README.md LICENSE %else +%doc README.md %license LICENSE %endif -%doc README.md /srv/salt/%{fname} %dir %attr(0755, root, salt) /srv/salt +%else -%files suma +%files %defattr(-,root,root,-) -# %license macro is not available on older releases -%if 0%{?sle_version} <= 120300 -%doc LICENSE -%else -%license LICENSE -%endif %doc README.md -%dir %{_datadir}/susemanager +%license LICENSE %dir %{fdir} %dir %{fdir}/states %dir %{fdir}/metadata %{fdir}/states/%{fname} %{fdir}/metadata/%{fname} -%dir %attr(0755, root, salt) %{_datadir}/susemanager -%dir %attr(0755, root, salt) %{fdir} -%dir %attr(0755, root, salt) %{fdir}/states -%dir %attr(0755, root, salt) %{fdir}/metadata +%dir %attr(0750, root, salt) %{fdir} +%dir %attr(0750, root, salt) %{fdir}/states +%dir %attr(0750, root, salt) %{fdir}/metadata + +%endif %changelog ++++++ habootstrap-formula-0.1.0.tar.gz -> habootstrap-formula-0.2.2.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/habootstrap-formula-0.1.0/Gemfile.lock new/habootstrap-formula-0.2.2/Gemfile.lock --- old/habootstrap-formula-0.1.0/Gemfile.lock 2019-05-23 14:31:11.433529536 +0200 +++ new/habootstrap-formula-0.2.2/Gemfile.lock 2019-07-03 10:01:25.553980874 +0200 @@ -4,57 +4,75 @@ addressable (2.6.0) public_suffix (>= 2.0.2, < 4.0) aws-eventstream (1.0.3) - aws-partitions (1.166.0) - aws-sdk-cloudtrail (1.14.0) - aws-sdk-core (~> 3, >= 3.53.0) + aws-partitions (1.184.0) + aws-sdk-autoscaling (1.22.0) + aws-sdk-core (~> 3, >= 3.52.1) aws-sigv4 (~> 1.1) - aws-sdk-cloudwatch (1.23.0) - aws-sdk-core (~> 3, >= 3.53.0) + aws-sdk-cloudformation (1.24.0) + aws-sdk-core (~> 3, >= 3.58.0) aws-sigv4 (~> 1.1) - aws-sdk-cloudwatchlogs (1.20.0) - aws-sdk-core (~> 3, >= 3.53.0) + aws-sdk-cloudtrail (1.16.0) + aws-sdk-core (~> 3, >= 3.58.0) aws-sigv4 (~> 1.1) - aws-sdk-configservice (1.30.0) - aws-sdk-core (~> 3, >= 3.53.0) + aws-sdk-cloudwatch (1.25.0) + aws-sdk-core (~> 3, >= 3.58.0) aws-sigv4 (~> 1.1) - aws-sdk-core (3.53.1) + aws-sdk-cloudwatchlogs (1.23.0) + aws-sdk-core (~> 3, >= 3.58.0) + aws-sigv4 (~> 1.1) + aws-sdk-configservice (1.32.0) + aws-sdk-core (~> 3, >= 3.58.0) + aws-sigv4 (~> 1.1) + aws-sdk-core (3.58.0) aws-eventstream (~> 1.0, >= 1.0.2) aws-partitions (~> 1.0) aws-sigv4 (~> 1.1) jmespath (~> 1.0) - aws-sdk-costandusagereportservice (1.13.0) - aws-sdk-core (~> 3, >= 3.53.0) + aws-sdk-costandusagereportservice (1.15.0) + aws-sdk-core (~> 3, >= 3.58.0) aws-sigv4 (~> 1.1) - aws-sdk-ec2 (1.86.0) - aws-sdk-core (~> 3, >= 3.53.0) + aws-sdk-dynamodb (1.33.0) + aws-sdk-core (~> 3, >= 3.58.0) aws-sigv4 (~> 1.1) - aws-sdk-ecs (1.40.0) - aws-sdk-core (~> 3, >= 3.53.0) + aws-sdk-ec2 (1.98.0) + aws-sdk-core (~> 3, >= 3.58.0) aws-sigv4 (~> 1.1) - aws-sdk-eks (1.19.0) - aws-sdk-core (~> 3, >= 3.53.0) + aws-sdk-ecr (1.19.0) + aws-sdk-core (~> 3, >= 3.58.0) aws-sigv4 (~> 1.1) - aws-sdk-elasticloadbalancing (1.15.0) - aws-sdk-core (~> 3, >= 3.53.0) + aws-sdk-ecs (1.43.0) + aws-sdk-core (~> 3, >= 3.58.0) aws-sigv4 (~> 1.1) - aws-sdk-iam (1.23.0) - aws-sdk-core (~> 3, >= 3.53.0) + aws-sdk-eks (1.23.0) + aws-sdk-core (~> 3, >= 3.58.0) aws-sigv4 (~> 1.1) - aws-sdk-kms (1.21.0) - aws-sdk-core (~> 3, >= 3.53.0) + aws-sdk-elasticloadbalancing (1.17.0) + aws-sdk-core (~> 3, >= 3.58.0) aws-sigv4 (~> 1.1) - aws-sdk-rds (1.54.0) - aws-sdk-core (~> 3, >= 3.53.0) + aws-sdk-elasticloadbalancingv2 (1.32.0) + aws-sdk-core (~> 3, >= 3.58.0) aws-sigv4 (~> 1.1) - aws-sdk-s3 (1.40.0) - aws-sdk-core (~> 3, >= 3.53.0) - aws-sdk-kms (~> 1) + aws-sdk-iam (1.27.0) + aws-sdk-core (~> 3, >= 3.58.0) + aws-sigv4 (~> 1.1) + aws-sdk-kms (1.23.0) + aws-sdk-core (~> 3, >= 3.58.0) + aws-sigv4 (~> 1.1) + aws-sdk-organizations (1.17.0) + aws-sdk-core (~> 3, >= 3.39.0) aws-sigv4 (~> 1.0) - aws-sdk-sns (1.16.0) - aws-sdk-core (~> 3, >= 3.53.0) + aws-sdk-rds (1.61.0) + aws-sdk-core (~> 3, >= 3.58.0) aws-sigv4 (~> 1.1) - aws-sdk-sqs (1.16.0) - aws-sdk-core (~> 3, >= 3.53.0) + aws-sdk-s3 (1.44.0) + aws-sdk-core (~> 3, >= 3.58.0) + aws-sdk-kms (~> 1) + aws-sigv4 (~> 1.1) + aws-sdk-sns (1.18.0) + aws-sdk-core (~> 3, >= 3.58.0) + aws-sigv4 (~> 1.1) + aws-sdk-sqs (1.18.0) + aws-sdk-core (~> 3, >= 3.58.0) aws-sigv4 (~> 1.1) aws-sigv4 (1.1.0) aws-eventstream (~> 1.0, >= 1.0.2) @@ -113,13 +131,13 @@ domain_name (~> 0.5) httpclient (2.8.3) inifile (3.0.0) - inspec (4.3.2) + inspec (4.6.9) addressable (~> 2.4) faraday (>= 0.9.0) faraday_middleware (~> 0.12.2) hashie (~> 3.4) htmlentities - json (>= 1.8, < 3.0) + json-schema (~> 2.8) license-acceptance (>= 0.2.13, < 2.0) method_source (~> 0.8) mixlib-log @@ -142,7 +160,9 @@ tty-table (~> 0.10) jmespath (1.4.0) json (2.2.0) - jwt (2.1.0) + json-schema (2.8.1) + addressable (>= 2.4) + jwt (2.2.1) kitchen-docker (2.9.0) test-kitchen (>= 1.0.0) kitchen-inspec (1.1.0) @@ -152,7 +172,7 @@ kitchen-salt (0.6.0) hashie (>= 3.5) test-kitchen (>= 1.4) - license-acceptance (1.0.11) + license-acceptance (1.0.13) pastel (~> 0.7) tomlrb (~> 1.2) tty-box (~> 0.3) @@ -201,7 +221,7 @@ pry (0.12.2) coderay (~> 1.1.0) method_source (~> 0.9.0) - public_suffix (3.0.3) + public_suffix (3.1.1) representable (3.0.4) declarative (< 0.1.0) declarative-option (< 0.2.0) @@ -211,20 +231,20 @@ rspec-core (~> 3.8.0) rspec-expectations (~> 3.8.0) rspec-mocks (~> 3.8.0) - rspec-core (3.8.0) + rspec-core (3.8.2) rspec-support (~> 3.8.0) - rspec-expectations (3.8.3) + rspec-expectations (3.8.4) 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.0) + rspec-mocks (3.8.1) diff-lcs (>= 1.2.0, < 2.0) rspec-support (~> 3.8.0) - rspec-support (3.8.0) + rspec-support (3.8.2) rubyntlm (0.6.2) - rubyzip (1.2.2) + rubyzip (1.2.3) semverse (3.0.0) signet (0.11.0) addressable (~> 2.3) @@ -255,9 +275,9 @@ thor (0.20.3) timeliness (0.3.10) timers (4.3.0) - tins (1.20.2) + tins (1.20.3) tomlrb (1.2.8) - train (2.1.2) + train (2.1.13) azure_graph_rbac (~> 0.16) azure_mgmt_key_vault (~> 0.17) azure_mgmt_resources (~> 0.15) @@ -271,19 +291,25 @@ net-ssh (>= 2.9, < 6.0) winrm (~> 2.0) winrm-fs (~> 1.0) - train-aws (0.1.0) + train-aws (0.1.6) + aws-sdk-autoscaling (~> 1.22.0) + aws-sdk-cloudformation (~> 1) aws-sdk-cloudtrail (~> 1.8) aws-sdk-cloudwatch (~> 1.13) aws-sdk-cloudwatchlogs (~> 1.13) aws-sdk-configservice (~> 1.21) aws-sdk-core (~> 3.0) aws-sdk-costandusagereportservice (~> 1.6) + aws-sdk-dynamodb (~> 1.31) aws-sdk-ec2 (~> 1.70) + aws-sdk-ecr (~> 1.18) aws-sdk-ecs (~> 1.30) aws-sdk-eks (~> 1.9) aws-sdk-elasticloadbalancing (~> 1.8) + aws-sdk-elasticloadbalancingv2 (~> 1) aws-sdk-iam (~> 1.13) aws-sdk-kms (~> 1.13) + aws-sdk-organizations (~> 1.17.0) aws-sdk-rds (~> 1.43) aws-sdk-s3 (~> 1.30) aws-sdk-sns (~> 1.9) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/habootstrap-formula-0.1.0/README.md new/habootstrap-formula-0.2.2/README.md --- old/habootstrap-formula-0.1.0/README.md 2019-05-23 14:31:11.433529536 +0200 +++ new/habootstrap-formula-0.2.2/README.md 2019-07-03 10:01:25.553980874 +0200 @@ -101,3 +101,12 @@ zypper in libvirt systemctl start libvirtd ``` + +### Known issues +* Failure running [join-the-cluster](./cluster/join.sls): + +> 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. + +TODO: Replace to query **hawk** by checking **pacemaker** directly. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/habootstrap-formula-0.1.0/cluster/join.sls new/habootstrap-formula-0.2.2/cluster/join.sls --- old/habootstrap-formula-0.1.0/cluster/join.sls 2019-05-23 14:31:11.433529536 +0200 +++ new/habootstrap-formula-0.2.2/cluster/join.sls 2019-07-03 10:01:25.553980874 +0200 @@ -10,7 +10,7 @@ wait-for-total-initialization: cmd.run: - - name: 'sleep {{ cluster.join_timer|default(5) }}' + - name: 'sleep {{ cluster.join_timer|default(20) }}' - require: - wait-for-cluster diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/habootstrap-formula-0.1.0/habootstrap-formula.changes new/habootstrap-formula-0.2.2/habootstrap-formula.changes --- old/habootstrap-formula-0.1.0/habootstrap-formula.changes 2019-05-23 14:31:11.437527662 +0200 +++ new/habootstrap-formula-0.2.2/habootstrap-formula.changes 2019-07-03 10:01:25.553980874 +0200 @@ -1,7 +1,34 @@ ------------------------------------------------------------------- +Tue Jul 2 11:18:50 UTC 2019 - Diego Vinicius Akechi <dake...@suse.com> + +- Version bump 0.2.2 + * Change the salt-formula directories permissions to 0750 to avoid + conflicts with the package salt-standalone-formulas-configuration. + + * Correct the required package name to + salt-standalone-formulas-configuration + +------------------------------------------------------------------- +Tue Jun 11 11:40:06 UTC 2019 - Xabier Arbulu Insausti <xarb...@suse.com> + +- Create package version 0.2.1 with fixed spec files. Now the package + is available in all SLE12 and SLE15 versions (boo#1137989, jsc#SLE-4031) + +------------------------------------------------------------------- +Fri May 31 13:14:43 UTC 2019 - Diego Vinicius Akechi <dake...@suse.com> + +- Version bump 0.2.0 + * Include the salt-formulas-configuration dependency on + SLE/Leap 15-SP1 and higher. This package configures the shared salt + formulas location (/usr/share/salt-formulas) to be used by SUMA 4.0 + or salt in standalone mode. + * Drops the habootstrap-formula-suma package, as the forms metadata + will be available only on SUMA 4.0 using the shared location. + +------------------------------------------------------------------- Thu May 16 09:13:17 UTC 2019 - Xabier Arbulu Insausti <xarb...@suse.com> -- Remove network repository installation +- Remove network repository installation ------------------------------------------------------------------- Thu Apr 25 12:26:43 UTC 2019 - Diego Vinicius Akechi <dake...@suse.com> @@ -44,4 +71,4 @@ Thu Sep 6 12:37:13 UTC 2018 - kgronl...@suse.com - Initial version - + diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/habootstrap-formula-0.1.0/habootstrap-formula.spec new/habootstrap-formula-0.2.2/habootstrap-formula.spec --- old/habootstrap-formula-0.1.0/habootstrap-formula.spec 2019-05-23 14:31:11.437527662 +0200 +++ new/habootstrap-formula-0.2.2/habootstrap-formula.spec 2019-07-03 10:01:25.553980874 +0200 @@ -18,12 +18,12 @@ # See also http://en.opensuse.org/openSUSE:Specfile_guidelines %define fname cluster -%define fdir %{_datadir}/susemanager/formulas +%define fdir %{_datadir}/salt-formulas Name: habootstrap-formula -Version: 0.1.0 +Version: 0.2.2 Group: System/Packages -Release: 1 +Release: 0 Summary: HA cluster (crmsh) deployment salt formula License: Apache-2.0 @@ -33,17 +33,15 @@ 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 %description -HA cluster (crmsh) deployment salt formula - -# package to deploy on SUMA specific path. -%package suma -Summary: HA cluster (crmsh) deployment salt formula (SUMA specific) -Requires: salt-shaptools - -%description suma -HA Cluster Bootstrap Salt Formula for SUSE Manager. Used to configure a basic HA cluster. +HA cluster salt deployment formula. This formula is capable to perform +the HA cluster bootstrap actions (init, join, remove) using standalone salt +or via SUSE Manager formulas with forms, available on SUSE Manager 4.0. %prep %setup -q @@ -51,10 +49,16 @@ %build %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 -# SUMA Specific +%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 @@ -64,39 +68,38 @@ cp -R metadata.yml %{buildroot}%{fdir}/metadata/%{fname} fi +%endif + +%if 0%{?sle_version:1} && 0%{?sle_version} < 150100 + %files %defattr(-,root,root,-) -# %license macro is not available on older releases -%if 0%{?sle_version} <= 120300 -%doc LICENSE +%if 0%{?sle_version} < 120300 +%doc README.md LICENSE %else +%doc README.md %license LICENSE %endif -%doc README.md /srv/salt/%{fname} %dir %attr(0755, root, salt) /srv/salt +%else -%files suma +%files %defattr(-,root,root,-) -# %license macro is not available on older releases -%if 0%{?sle_version} <= 120300 -%doc LICENSE -%else -%license LICENSE -%endif %doc README.md -%dir %{_datadir}/susemanager +%license LICENSE %dir %{fdir} %dir %{fdir}/states %dir %{fdir}/metadata %{fdir}/states/%{fname} %{fdir}/metadata/%{fname} -%dir %attr(0755, root, salt) %{_datadir}/susemanager -%dir %attr(0755, root, salt) %{fdir} -%dir %attr(0755, root, salt) %{fdir}/states -%dir %attr(0755, root, salt) %{fdir}/metadata +%dir %attr(0750, root, salt) %{fdir} +%dir %attr(0750, root, salt) %{fdir}/states +%dir %attr(0750, root, salt) %{fdir}/metadata + +%endif %changelog diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/habootstrap-formula-0.1.0/pillar.example new/habootstrap-formula-0.2.2/pillar.example --- old/habootstrap-formula-0.1.0/pillar.example 2019-05-23 14:31:11.437527662 +0200 +++ new/habootstrap-formula-0.2.2/pillar.example 2019-07-03 10:01:25.553980874 +0200 @@ -25,8 +25,8 @@ # unicast: True # optional: Time in seconds between hawk service is available in the first - # node and join command is executed (5s by default) - # join_timer: 5 + # node and join command is executed (20s by default) + # join_timer: 20 # optional: Configure a virtual IP resource in cluster # admin_ip: 10.20.30.40