Hello community, here is the log from the commit of package habootstrap-formula for openSUSE:Factory checked in at 2020-01-14 21:10:03 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/habootstrap-formula (Old) and /work/SRC/openSUSE:Factory/.habootstrap-formula.new.6675 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "habootstrap-formula" Tue Jan 14 21:10:03 2020 rev:7 rq:764262 version:0.2.10 Changes: -------- --- /work/SRC/openSUSE:Factory/habootstrap-formula/habootstrap-formula.changes 2019-12-05 17:38:46.265364963 +0100 +++ /work/SRC/openSUSE:Factory/.habootstrap-formula.new.6675/habootstrap-formula.changes 2020-01-14 21:13:35.302937492 +0100 @@ -1,0 +2,21 @@ +Mon Dec 16 09:33:20 UTC 2019 - Xabier Arbulu <xarb...@suse.com> + +- Add automatic cloud detection + +------------------------------------------------------------------- +Wed Dec 11 15:55:33 UTC 2019 - Xabier Arbulu <xarb...@suse.com> + +- Add option to set multiple sbd disks to the cluster + +------------------------------------------------------------------- +Wed Dec 11 12:13:43 UTC 2019 - Xabier Arbulu <xarb...@suse.com> + +- Move the cluster configure part to a new state to be executed + even when joining executions. + +------------------------------------------------------------------- +Wed Dec 11 09:46:41 UTC 2019 - Xabier Arbulu <xarb...@suse.com> + +- Add option to update hacluster user password + +------------------------------------------------------------------- @@ -4 +25,2 @@ -- Install 'socat' package on the Azure platform +- Version bump 0.2.10 + * Install 'socat' package on the Azure platform ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ habootstrap-formula-0.2.10.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/habootstrap-formula-0.2.10/Gemfile.lock new/habootstrap-formula-0.2.10/Gemfile.lock --- old/habootstrap-formula-0.2.10/Gemfile.lock 2019-12-04 16:22:53.271335999 +0100 +++ new/habootstrap-formula-0.2.10/Gemfile.lock 2019-12-19 13:11:02.245712922 +0100 @@ -1,7 +1,7 @@ GEM remote: https://rubygems.org/ specs: - activesupport (5.2.4) + activesupport (5.2.4.1) concurrent-ruby (~> 1.0, >= 1.0.2) i18n (>= 0.7, < 2) minitest (~> 5.1) @@ -9,11 +9,11 @@ addressable (2.7.0) public_suffix (>= 2.0.2, < 5.0) aws-eventstream (1.0.3) - aws-partitions (1.250.0) + aws-partitions (1.257.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-apigatewayv2 (1.15.0) aws-sdk-core (~> 3, >= 3.71.0) aws-sigv4 (~> 1.1) aws-sdk-athena (1.22.0) @@ -55,7 +55,7 @@ aws-sdk-configservice (1.40.0) aws-sdk-core (~> 3, >= 3.71.0) aws-sigv4 (~> 1.1) - aws-sdk-core (3.84.0) + aws-sdk-core (3.86.0) aws-eventstream (~> 1.0, >= 1.0.2) aws-partitions (~> 1, >= 1.239.0) aws-sigv4 (~> 1.1) @@ -66,13 +66,13 @@ aws-sdk-dynamodb (1.41.0) aws-sdk-core (~> 3, >= 3.71.0) aws-sigv4 (~> 1.1) - aws-sdk-ec2 (1.123.0) + aws-sdk-ec2 (1.127.0) aws-sdk-core (~> 3, >= 3.71.0) aws-sigv4 (~> 1.1) aws-sdk-ecr (1.23.0) aws-sdk-core (~> 3, >= 3.71.0) aws-sigv4 (~> 1.1) - aws-sdk-ecs (1.54.0) + aws-sdk-ecs (1.55.0) aws-sdk-core (~> 3, >= 3.71.0) aws-sigv4 (~> 1.1) aws-sdk-eks (1.29.0) @@ -99,16 +99,16 @@ aws-sdk-iam (1.32.0) aws-sdk-core (~> 3, >= 3.71.0) aws-sigv4 (~> 1.1) - aws-sdk-kafka (1.15.0) + aws-sdk-kafka (1.16.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.26.0) + aws-sdk-kms (1.27.0) aws-sdk-core (~> 3, >= 3.71.0) aws-sigv4 (~> 1.1) - aws-sdk-lambda (1.33.0) + aws-sdk-lambda (1.34.0) aws-sdk-core (~> 3, >= 3.71.0) aws-sigv4 (~> 1.1) aws-sdk-organizations (1.17.0) @@ -129,8 +129,8 @@ aws-sdk-route53resolver (1.11.0) aws-sdk-core (~> 3, >= 3.71.0) aws-sigv4 (~> 1.1) - aws-sdk-s3 (1.58.0) - aws-sdk-core (~> 3, >= 3.77.0) + aws-sdk-s3 (1.60.0) + aws-sdk-core (~> 3, >= 3.83.0) aws-sdk-kms (~> 1) aws-sigv4 (~> 1.1) aws-sdk-securityhub (1.14.0) @@ -148,7 +148,7 @@ aws-sdk-sqs (1.23.1) aws-sdk-core (~> 3, >= 3.71.0) aws-sigv4 (~> 1.1) - aws-sdk-ssm (1.65.0) + aws-sdk-ssm (1.67.0) aws-sdk-core (~> 3, >= 3.71.0) aws-sigv4 (~> 1.1) aws-sigv4 (1.1.0) @@ -162,7 +162,20 @@ azure_mgmt_security (0.18.0) ms_rest_azure (~> 0.11.1) bcrypt_pbkdf (1.0.1) - builder (3.2.3) + builder (3.2.4) + chef-config (15.6.10) + addressable + chef-utils (= 15.6.10) + fuzzyurl + mixlib-config (>= 2.2.12, < 4.0) + mixlib-shellout (>= 2.0, < 4.0) + tomlrb (~> 1.2) + chef-telemetry (1.0.2) + chef-config + concurrent-ruby (~> 1.0) + ffi-yajl (~> 2.2) + http (~> 2.2) + chef-utils (15.6.10) coderay (1.1.2) concurrent-ruby (1.1.5) declarative (0.0.10) @@ -176,15 +189,18 @@ ed25519 (1.2.4) equatable (0.6.1) erubi (1.9.0) - excon (0.70.0) + excon (0.71.1) faraday (0.17.1) 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_middleware (0.13.1) faraday (>= 0.7.4, < 1.0) ffi (1.11.3) + ffi-yajl (2.3.1) + libyajl2 (~> 1.2) + fuzzyurl (0.9.0) google-api-client (0.34.1) addressable (~> 2.5, >= 2.5.1) googleauth (~> 0.9) @@ -206,16 +222,24 @@ 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) i18n (1.7.0) concurrent-ruby (~> 1.0) inifile (3.0.0) - inspec (4.18.39) + inspec (4.18.51) addressable (~> 2.4) + chef-telemetry (~> 1.0) faraday (>= 0.9.0) - faraday_middleware (~> 0.12.2) + faraday_middleware (~> 0.12) hashie (~> 3.4) htmlentities json-schema (~> 2.8) @@ -226,7 +250,7 @@ parallel (~> 1.9) parslet (~> 1.5) pry (~> 0) - rspec (~> 3.0, < 3.9) + rspec (~> 3.9) rspec-its (~> 1.2) rubyzip (~> 1.2, >= 1.2.2) semverse @@ -241,7 +265,7 @@ tty-prompt (~> 0.17) tty-table (~> 0.10) jmespath (1.4.0) - json (2.2.0) + json (2.3.0) json-schema (2.8.1) addressable (>= 2.4) jwt (2.2.1) @@ -254,6 +278,7 @@ 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) @@ -263,11 +288,13 @@ logging (2.2.2) little-plugger (~> 1.1) multi_json (~> 1.10) - memoist (0.16.1) + memoist (0.16.2) method_source (0.9.2) mini_mime (1.0.2) minitest (5.13.0) - mixlib-install (3.11.21) + mixlib-config (3.0.5) + tomlrb + mixlib-install (3.11.24) mixlib-shellout mixlib-versioning thor @@ -308,22 +335,22 @@ declarative-option (< 0.2.0) uber (< 0.2.0) retriable (3.1.2) - rspec (3.8.0) - rspec-core (~> 3.8.0) - rspec-expectations (~> 3.8.0) - rspec-mocks (~> 3.8.0) - rspec-core (3.8.2) - rspec-support (~> 3.8.0) - rspec-expectations (3.8.6) + rspec (3.9.0) + rspec-core (~> 3.9.0) + rspec-expectations (~> 3.9.0) + rspec-mocks (~> 3.9.0) + rspec-core (3.9.0) + rspec-support (~> 3.9.0) + rspec-expectations (3.9.0) diff-lcs (>= 1.2.0, < 2.0) - rspec-support (~> 3.8.0) + rspec-support (~> 3.9.0) rspec-its (1.3.0) rspec-core (>= 3.0.0) rspec-expectations (>= 3.0.0) - rspec-mocks (3.8.2) + rspec-mocks (3.9.0) diff-lcs (>= 1.2.0, < 2.0) - rspec-support (~> 3.8.0) - rspec-support (3.8.3) + rspec-support (~> 3.9.0) + rspec-support (3.9.0) rubyntlm (0.6.2) rubyzip (1.3.0) semverse (3.0.0) @@ -358,7 +385,7 @@ timeliness (0.3.10) tins (1.22.2) tomlrb (1.2.9) - train (3.2.0) + train (3.2.5) activesupport (~> 5.2.3) azure_graph_rbac (~> 0.16) azure_mgmt_key_vault (~> 0.17) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/habootstrap-formula-0.2.10/ci/_modules/crm.py new/habootstrap-formula-0.2.10/ci/_modules/crm.py --- old/habootstrap-formula-0.2.10/ci/_modules/crm.py 1970-01-01 01:00:00.000000000 +0100 +++ new/habootstrap-formula-0.2.10/ci/_modules/crm.py 2019-12-19 13:11:02.245712922 +0100 @@ -0,0 +1,5 @@ +def detect_cloud(): + ''' + Mock detect_cloud method for CI + ''' + return 'microsoft-azure' diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/habootstrap-formula-0.2.10/ci/validate-formula.sh new/habootstrap-formula-0.2.10/ci/validate-formula.sh --- old/habootstrap-formula-0.2.10/ci/validate-formula.sh 2019-12-04 16:22:53.271335999 +0100 +++ new/habootstrap-formula-0.2.10/ci/validate-formula.sh 2019-12-19 13:11:02.245712922 +0100 @@ -23,6 +23,7 @@ password: linux resource_agents: - SAPHanaSR + hacluster_password: mypassword configure: method: update template: @@ -68,9 +69,9 @@ id: travis EOF -sudo salt-call state.show_highstate --local --file-root=./ --config-dir=. --pillar-root=test/pillar --retcode-passthrough -l debug +sudo salt-call state.show_highstate --local --file-root=./ --config-dir=. --pillar-root=test/pillar --module-dirs=ci/_modules --retcode-passthrough -l debug -echo +echo echo "===========================================" echo " Using secondary host - Running join " echo "===========================================" @@ -85,7 +86,7 @@ id: travis EOF -sudo salt-call state.show_highstate --local --file-root=./ --config-dir=. --pillar-root=test/pillar --retcode-passthrough -l debug +sudo salt-call state.show_highstate --local --file-root=./ --config-dir=. --pillar-root=test/pillar --module-dirs=ci/_modules --retcode-passthrough -l debug echo echo "===========================================" @@ -102,4 +103,4 @@ id: travis EOF -sudo salt-call state.show_highstate --local --file-root=./ --config-dir=. --pillar-root=test/pillar --retcode-passthrough -l debug \ No newline at end of file +sudo salt-call state.show_highstate --local --file-root=./ --config-dir=. --pillar-root=test/pillar --module-dirs=ci/_modules --retcode-passthrough -l debug diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/habootstrap-formula-0.2.10/cluster/cloud_detection.sls new/habootstrap-formula-0.2.10/cluster/cloud_detection.sls --- old/habootstrap-formula-0.2.10/cluster/cloud_detection.sls 1970-01-01 01:00:00.000000000 +0100 +++ new/habootstrap-formula-0.2.10/cluster/cloud_detection.sls 2019-12-19 13:11:02.245712922 +0100 @@ -0,0 +1,3 @@ +# crmsh must exist to run crm.detect_cloud +{% do salt['pkg.install'](name='crmsh') %} +{% do salt['grains.set']('cloud_provider', salt['crm.detect_cloud']()) %} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/habootstrap-formula-0.2.10/cluster/configure_resources.sls new/habootstrap-formula-0.2.10/cluster/configure_resources.sls --- old/habootstrap-formula-0.2.10/cluster/configure_resources.sls 1970-01-01 01:00:00.000000000 +0100 +++ new/habootstrap-formula-0.2.10/cluster/configure_resources.sls 2019-12-19 13:11:02.245712922 +0100 @@ -0,0 +1,30 @@ +{%- from "cluster/map.jinja" import cluster with context -%} +{% set host = grains['host'] %} + +{% if cluster.configure is defined %} +{% set url = none %} +{% if cluster.configure.template is defined %} +{% set url = cluster.configure.template.destination|default('/tmp/cluster.config') %} +{{ url }}: + file.managed: + - source: {{ cluster.configure.template.source }} + - user: root + - group: root + - mode: 644 + - template: jinja +{% endif %} + +configure-the-cluster: + crm.cluster_configured: + - name: {{ cluster.configure.method }} + - url: {{ cluster.configure.url|default(url) }} + {% if cluster.configure.is_xml is defined %} + - is_xml: {{ cluster.configure.is_xml }} + {% endif %} + - require: + {% if cluster.init == host %} + - bootstrap-the-cluster + {% else %} + - join-the-cluster + {% endif %} +{% endif %} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/habootstrap-formula-0.2.10/cluster/create.sls new/habootstrap-formula-0.2.10/cluster/create.sls --- old/habootstrap-formula-0.2.10/cluster/create.sls 2019-12-04 16:22:53.271335999 +0100 +++ new/habootstrap-formula-0.2.10/cluster/create.sls 2019-12-19 13:11:02.245712922 +0100 @@ -20,34 +20,10 @@ {% if cluster.sbd is defined %} - sbd: True {% if cluster.sbd.device is defined %} - - sbd_dev: {{ cluster.sbd.device }} + - sbd_dev: {{ cluster.sbd.device|json }} {% endif %} {% endif %} -{% if cluster.configure is defined %} -{% set url = none %} -{% if cluster.configure.template is defined %} -{% set url = cluster.configure.template.destination|default('/tmp/cluster.config') %} -{{ url }}: - file.managed: - - source: {{ cluster.configure.template.source }} - - user: root - - group: root - - mode: 644 - - template: jinja -{% endif %} - -configure-the-cluster: - crm.cluster_configured: - - name: {{ cluster.configure.method }} - - url: {{ cluster.configure.url|default(url) }} - {% if cluster.configure.is_xml is defined %} - - is_xml: {{ cluster.configure.is_xml }} - {% endif %} - - require: - - bootstrap-the-cluster -{% endif %} - hawk: service.running: - enable: True diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/habootstrap-formula-0.2.10/cluster/defaults.yaml new/habootstrap-formula-0.2.10/cluster/defaults.yaml --- old/habootstrap-formula-0.2.10/cluster/defaults.yaml 2019-12-04 16:22:53.271335999 +0100 +++ new/habootstrap-formula-0.2.10/cluster/defaults.yaml 2019-12-19 13:11:02.245712922 +0100 @@ -3,3 +3,4 @@ install_packages: true join_timeout: 60 wait_for_initialization: 20 + remove: [] diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/habootstrap-formula-0.2.10/cluster/hacluster_user.sls new/habootstrap-formula-0.2.10/cluster/hacluster_user.sls --- old/habootstrap-formula-0.2.10/cluster/hacluster_user.sls 1970-01-01 01:00:00.000000000 +0100 +++ new/habootstrap-formula-0.2.10/cluster/hacluster_user.sls 2019-12-19 13:11:02.245712922 +0100 @@ -0,0 +1,12 @@ +{% from "cluster/map.jinja" import cluster with context %} +{% set host = grains['host'] %} + +{% if cluster.remove is not defined or host not in cluster.remove %} +update_hacluster_password: + user.present: + - name: hacluster + - password: {{ cluster.hacluster_password }} + - hash_password: True + - require: + - hawk +{% endif %} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/habootstrap-formula-0.2.10/cluster/init.sls new/habootstrap-formula-0.2.10/cluster/init.sls --- old/habootstrap-formula-0.2.10/cluster/init.sls 2019-12-04 16:22:53.271335999 +0100 +++ new/habootstrap-formula-0.2.10/cluster/init.sls 2019-12-19 13:11:02.245712922 +0100 @@ -3,6 +3,7 @@ include: - .pre_validation + - .cloud_detection {% if cluster.install_packages is sameas true %} - .packages {% endif %} @@ -22,11 +23,17 @@ {% endif %} {% if cluster.init == host %} - .create -{% elif cluster.remove is defined and host in cluster.remove %} +{% elif host in cluster.remove %} - .remove {% else %} - .join {% 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 %} - .monitoring {% endif %} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/habootstrap-formula-0.2.10/cluster/packages.sls new/habootstrap-formula-0.2.10/cluster/packages.sls --- old/habootstrap-formula-0.2.10/cluster/packages.sls 2019-12-04 16:22:53.271335999 +0100 +++ new/habootstrap-formula-0.2.10/cluster/packages.sls 2019-12-19 13:11:02.245712922 +0100 @@ -40,11 +40,12 @@ {% endif %} -# socat utility required only for Azure platform +{% if grains['cloud_provider'] == 'microsoft-azure' %} install_additional_packages_azure: pkg.installed: - retry: attempts: 3 interval: 15 - pkgs: - - socat \ No newline at end of file + - socat +{% endif %} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/habootstrap-formula-0.2.10/habootstrap-formula.changes new/habootstrap-formula-0.2.10/habootstrap-formula.changes --- old/habootstrap-formula-0.2.10/habootstrap-formula.changes 2019-12-04 16:22:53.271335999 +0100 +++ new/habootstrap-formula-0.2.10/habootstrap-formula.changes 2019-12-19 13:11:02.245712922 +0100 @@ -1,7 +1,29 @@ ------------------------------------------------------------------- +Mon Dec 16 09:33:20 UTC 2019 - Xabier Arbulu <xarb...@suse.com> + +- Add automatic cloud detection + +------------------------------------------------------------------- +Wed Dec 11 15:55:33 UTC 2019 - Xabier Arbulu <xarb...@suse.com> + +- Add option to set multiple sbd disks to the cluster + +------------------------------------------------------------------- +Wed Dec 11 12:13:43 UTC 2019 - Xabier Arbulu <xarb...@suse.com> + +- Move the cluster configure part to a new state to be executed + even when joining executions. + +------------------------------------------------------------------- +Wed Dec 11 09:46:41 UTC 2019 - Xabier Arbulu <xarb...@suse.com> + +- Add option to update hacluster user password + +------------------------------------------------------------------- Thu Nov 28 19:17:37 UTC 2019 - Simranpal Singh <simranpal.si...@suse.com> -- Install 'socat' package on the Azure platform +- Version bump 0.2.10 + * Install 'socat' package on the Azure platform ------------------------------------------------------------------- Wed Oct 30 16:14:32 UTC 2019 - Xabier Arbulu <xarb...@suse.com> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/habootstrap-formula-0.2.10/pillar.example new/habootstrap-formula-0.2.10/pillar.example --- old/habootstrap-formula-0.2.10/pillar.example 2019-12-04 16:22:53.271335999 +0100 +++ new/habootstrap-formula-0.2.10/pillar.example 2019-12-19 13:11:02.245712922 +0100 @@ -38,6 +38,10 @@ # sbd: # # optional: Configure an SBD device # device: /dev/by-label/sbd-disk + # # multiple disks can be set using a list + # device: + # - /dev/by-label/sbd-disk1 + # - /dev/by-label/sbd-disk2 # optional: Install required packages to run the cluster (true by default) # pre-configured packages sometimes exist for development purposes @@ -49,6 +53,9 @@ # optional: enable ha_exporter by default disabled ha_exporter: true + # optional: update hacluster password + hacluster_password: mypassword + # optional: Authorize ssh connection from nodes to willing to join # ssheys: # # Overwrite current keys