Hello community,

here is the log from the commit of package habootstrap-formula for 
openSUSE:Factory checked in at 2019-06-01 09:56:57
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/habootstrap-formula (Old)
 and      /work/SRC/openSUSE:Factory/.habootstrap-formula.new.5148 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Package is "habootstrap-formula"

Sat Jun  1 09:56:57 2019 rev:2 rq:706511 version:0.1.0

Changes:
--------
--- /work/SRC/openSUSE:Factory/habootstrap-formula/habootstrap-formula.changes  
2019-05-08 15:16:42.613021172 +0200
+++ 
/work/SRC/openSUSE:Factory/.habootstrap-formula.new.5148/habootstrap-formula.changes
        2019-06-01 09:56:58.859171041 +0200
@@ -1,0 +2,5 @@
+Thu May 16 09:13:17 UTC 2019 - Xabier Arbulu Insausti <xarb...@suse.com>
+
+- Remove network repository installation 
+
+-------------------------------------------------------------------

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ habootstrap-formula.spec ++++++
--- /var/tmp/diff_new_pack.LhHURN/_old  2019-06-01 09:56:59.247170909 +0200
+++ /var/tmp/diff_new_pack.LhHURN/_new  2019-06-01 09:56:59.247170909 +0200
@@ -66,7 +66,12 @@
 
 %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
 /srv/salt/%{fname}
 
@@ -75,7 +80,12 @@
 
 %files suma
 %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
 %dir %{fdir}

++++++ habootstrap-formula-0.1.0.tar.gz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/habootstrap-formula-0.1.0/Gemfile.lock 
new/habootstrap-formula-0.1.0/Gemfile.lock
--- old/habootstrap-formula-0.1.0/Gemfile.lock  2019-04-25 12:44:50.202857633 
+0200
+++ new/habootstrap-formula-0.1.0/Gemfile.lock  2019-05-23 14:31:11.433529536 
+0200
@@ -4,21 +4,66 @@
     addressable (2.6.0)
       public_suffix (>= 2.0.2, < 4.0)
     aws-eventstream (1.0.3)
-    aws-sdk (2.11.261)
-      aws-sdk-resources (= 2.11.261)
-    aws-sdk-core (2.11.261)
-      aws-sigv4 (~> 1.0)
+    aws-partitions (1.166.0)
+    aws-sdk-cloudtrail (1.14.0)
+      aws-sdk-core (~> 3, >= 3.53.0)
+      aws-sigv4 (~> 1.1)
+    aws-sdk-cloudwatch (1.23.0)
+      aws-sdk-core (~> 3, >= 3.53.0)
+      aws-sigv4 (~> 1.1)
+    aws-sdk-cloudwatchlogs (1.20.0)
+      aws-sdk-core (~> 3, >= 3.53.0)
+      aws-sigv4 (~> 1.1)
+    aws-sdk-configservice (1.30.0)
+      aws-sdk-core (~> 3, >= 3.53.0)
+      aws-sigv4 (~> 1.1)
+    aws-sdk-core (3.53.1)
+      aws-eventstream (~> 1.0, >= 1.0.2)
+      aws-partitions (~> 1.0)
+      aws-sigv4 (~> 1.1)
       jmespath (~> 1.0)
-    aws-sdk-resources (2.11.261)
-      aws-sdk-core (= 2.11.261)
+    aws-sdk-costandusagereportservice (1.13.0)
+      aws-sdk-core (~> 3, >= 3.53.0)
+      aws-sigv4 (~> 1.1)
+    aws-sdk-ec2 (1.86.0)
+      aws-sdk-core (~> 3, >= 3.53.0)
+      aws-sigv4 (~> 1.1)
+    aws-sdk-ecs (1.40.0)
+      aws-sdk-core (~> 3, >= 3.53.0)
+      aws-sigv4 (~> 1.1)
+    aws-sdk-eks (1.19.0)
+      aws-sdk-core (~> 3, >= 3.53.0)
+      aws-sigv4 (~> 1.1)
+    aws-sdk-elasticloadbalancing (1.15.0)
+      aws-sdk-core (~> 3, >= 3.53.0)
+      aws-sigv4 (~> 1.1)
+    aws-sdk-iam (1.23.0)
+      aws-sdk-core (~> 3, >= 3.53.0)
+      aws-sigv4 (~> 1.1)
+    aws-sdk-kms (1.21.0)
+      aws-sdk-core (~> 3, >= 3.53.0)
+      aws-sigv4 (~> 1.1)
+    aws-sdk-rds (1.54.0)
+      aws-sdk-core (~> 3, >= 3.53.0)
+      aws-sigv4 (~> 1.1)
+    aws-sdk-s3 (1.40.0)
+      aws-sdk-core (~> 3, >= 3.53.0)
+      aws-sdk-kms (~> 1)
+      aws-sigv4 (~> 1.0)
+    aws-sdk-sns (1.16.0)
+      aws-sdk-core (~> 3, >= 3.53.0)
+      aws-sigv4 (~> 1.1)
+    aws-sdk-sqs (1.16.0)
+      aws-sdk-core (~> 3, >= 3.53.0)
+      aws-sigv4 (~> 1.1)
     aws-sigv4 (1.1.0)
       aws-eventstream (~> 1.0, >= 1.0.2)
     azure_graph_rbac (0.17.1)
       ms_rest_azure (~> 0.11.0)
-    azure_mgmt_key_vault (0.17.3)
-      ms_rest_azure (~> 0.11.0)
-    azure_mgmt_resources (0.17.3)
+    azure_mgmt_key_vault (0.17.4)
       ms_rest_azure (~> 0.11.0)
+    azure_mgmt_resources (0.17.5)
+      ms_rest_azure (~> 0.11.1)
     bcrypt_pbkdf (1.0.1)
     builder (3.2.3)
     coderay (1.1.2)
@@ -42,7 +87,7 @@
       http-cookie (~> 1.0.0)
     faraday_middleware (0.12.2)
       faraday (>= 0.7.4, < 1.0)
-    ffi (1.10.0)
+    ffi (1.11.1)
     google-api-client (0.23.9)
       addressable (~> 2.5, >= 2.5.1)
       googleauth (>= 0.5, < 0.7.0)
@@ -58,7 +103,7 @@
       multi_json (~> 1.11)
       os (>= 0.9, < 2.0)
       signet (~> 0.7)
-    gssapi (1.2.0)
+    gssapi (1.3.0)
       ffi (>= 1.0.1)
     gyoku (1.3.1)
       builder (>= 2.1.2)
@@ -68,13 +113,14 @@
       domain_name (~> 0.5)
     httpclient (2.8.3)
     inifile (3.0.0)
-    inspec (3.9.3)
+    inspec (4.3.2)
       addressable (~> 2.4)
       faraday (>= 0.9.0)
       faraday_middleware (~> 0.12.2)
       hashie (~> 3.4)
       htmlentities
       json (>= 1.8, < 3.0)
+      license-acceptance (>= 0.2.13, < 2.0)
       method_source (~> 0.8)
       mixlib-log
       multipart-post
@@ -89,7 +135,8 @@
       term-ansicolor
       thor (~> 0.20)
       tomlrb (~> 1.2)
-      train (~> 1.5, >= 1.7.2)
+      train (~> 2.0)
+      train-aws (~> 0.1)
       train-habitat (~> 0.1)
       tty-prompt (~> 0.17)
       tty-table (~> 0.10)
@@ -105,6 +152,11 @@
     kitchen-salt (0.6.0)
       hashie (>= 3.5)
       test-kitchen (>= 1.4)
+    license-acceptance (1.0.11)
+      pastel (~> 0.7)
+      tomlrb (~> 1.2)
+      tty-box (~> 0.3)
+      tty-prompt (~> 0.18)
     little-plugger (1.1.4)
     logging (2.2.2)
       little-plugger (~> 1.1)
@@ -114,32 +166,33 @@
     mime-types (3.2.2)
       mime-types-data (~> 3.2015)
     mime-types-data (3.2019.0331)
-    mixlib-install (3.11.12)
+    mixlib-install (3.11.18)
       mixlib-shellout
       mixlib-versioning
       thor
     mixlib-log (3.0.1)
     mixlib-shellout (2.4.4)
     mixlib-versioning (1.2.7)
-    ms_rest (0.7.3)
+    ms_rest (0.7.4)
       concurrent-ruby (~> 1.0)
       faraday (~> 0.9)
-      timeliness (~> 0.3)
-    ms_rest_azure (0.11.0)
+      timeliness (~> 0.3.10)
+    ms_rest_azure (0.11.1)
       concurrent-ruby (~> 1.0)
       faraday (~> 0.9)
       faraday-cookie_jar (~> 0.0.6)
-      ms_rest (~> 0.7.2)
+      ms_rest (~> 0.7.4)
+      unf_ext (= 0.0.7.2)
     multi_json (1.13.1)
-    multipart-post (2.0.0)
+    multipart-post (2.1.1)
     necromancer (0.4.0)
-    net-scp (1.2.1)
-      net-ssh (>= 2.6.5)
+    net-scp (2.0.0)
+      net-ssh (>= 2.6.5, < 6.0.0)
     net-ssh (5.2.0)
     net-ssh-gateway (2.0.0)
       net-ssh (>= 4.0.0)
     nori (2.6.0)
-    os (1.0.0)
+    os (1.0.1)
     parallel (1.17.0)
     parslet (1.8.2)
     pastel (0.7.2)
@@ -186,9 +239,10 @@
     strings-ansi (0.1.0)
     term-ansicolor (1.7.1)
       tins (~> 1.0)
-    test-kitchen (2.1.0)
+    test-kitchen (2.2.5)
       bcrypt_pbkdf (~> 1.0)
       ed25519 (~> 1.2)
+      license-acceptance (~> 1.0, >= 1.0.11)
       mixlib-install (~> 3.6)
       mixlib-shellout (>= 1.2, < 3.0)
       net-scp (>= 1.1, < 3.0)
@@ -199,12 +253,11 @@
       winrm-elevated (~> 1.0)
       winrm-fs (~> 1.1)
     thor (0.20.3)
-    timeliness (0.4.0)
+    timeliness (0.3.10)
     timers (4.3.0)
     tins (1.20.2)
     tomlrb (1.2.8)
-    train (1.7.6)
-      aws-sdk (~> 2)
+    train (2.1.2)
       azure_graph_rbac (~> 0.16)
       azure_mgmt_key_vault (~> 0.17)
       azure_mgmt_resources (~> 0.15)
@@ -213,13 +266,35 @@
       googleauth (~> 0.6.6)
       inifile
       json (>= 1.8, < 3.0)
-      mixlib-shellout (>= 2.0)
-      net-scp (~> 1.2)
+      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.0)
+      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-ec2 (~> 1.70)
+      aws-sdk-ecs (~> 1.30)
+      aws-sdk-eks (~> 1.9)
+      aws-sdk-elasticloadbalancing (~> 1.8)
+      aws-sdk-iam (~> 1.13)
+      aws-sdk-kms (~> 1.13)
+      aws-sdk-rds (~> 1.43)
+      aws-sdk-s3 (~> 1.30)
+      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)
+      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)
@@ -242,8 +317,8 @@
     uber (0.1.0)
     unf (0.1.4)
       unf_ext
-    unf_ext (0.0.7.6)
-    unicode-display_width (1.5.0)
+    unf_ext (0.0.7.2)
+    unicode-display_width (1.6.0)
     unicode_utils (1.4.0)
     winrm (2.3.2)
       builder (>= 2.1.2)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/habootstrap-formula-0.1.0/cluster/packages.sls 
new/habootstrap-formula-0.1.0/cluster/packages.sls
--- old/habootstrap-formula-0.1.0/cluster/packages.sls  2019-04-25 
12:44:50.202857633 +0200
+++ new/habootstrap-formula-0.1.0/cluster/packages.sls  2019-05-23 
14:31:11.433529536 +0200
@@ -10,6 +10,9 @@
 patterns-ha-ha_sles:
   pkg.installed:
     - fromrepo: {{ repo }}
+    - retry:
+        attempts: 3
+        interval: 15
 
 {% else %}
 
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/habootstrap-formula-0.1.0/cluster/sshkeys.sls 
new/habootstrap-formula-0.1.0/cluster/sshkeys.sls
--- old/habootstrap-formula-0.1.0/cluster/sshkeys.sls   2019-04-25 
12:44:50.202857633 +0200
+++ new/habootstrap-formula-0.1.0/cluster/sshkeys.sls   2019-05-23 
14:31:11.433529536 +0200
@@ -17,40 +17,46 @@
     - name: yes y | sudo ssh-keygen -f /root/.ssh/id_rsa -C 'Initial key' -N ''
 {% endif %}
 
-add_network_repo:
-  pkgrepo.managed:
-    - name: network
-    - baseurl: https://download.opensuse.org/repositories/network/SLE_12_SP3
-    - gpgautoimport: True
-
-install_sshpass:
-  pkg.installed:
-    - name: sshpass
-    - refresh: False
-    - fromrepo: network
-    - require:
-      - add_network_repo
+copy_ask_pass:
+  file.managed:
+    - name: /tmp/ssh_askpass
+    - source: salt://cluster/support/ssh_askpass
+    - user: root
+    - group: root
+    - mode: 755
 
 copy_ssh_pub:
   cmd.run:
-    - name: sshpass -p '{{ password }}' scp -o StrictHostKeyChecking=no -o 
UserKnownHostsFile=/dev/null
+    - name: setsid scp -o StrictHostKeyChecking=no -o 
UserKnownHostsFile=/dev/null
             /root/.ssh/id_rsa.pub root@{{ cluster.init }}:/root/.ssh/{{ 
grains['host'] }}_id_rsa.pub
+    - env:
+      - SSH_ASKPASS: /tmp/ssh_askpass
+      - DISPLAY: :0
+      - PASS: {{ password }}
     - require:
-      - install_sshpass
+      - copy_ask_pass
 
 authorize_key:
   cmd.run:
-    - name: sshpass -p '{{ password }}' ssh -T root@{{ cluster.init }} -o 
StrictHostKeyChecking=no
+    - name: setsid ssh -T root@{{ cluster.init }} -o StrictHostKeyChecking=no
             'cat /root/.ssh/{{ grains['host'] }}_id_rsa.pub >> 
/root/.ssh/authorized_keys'
-    - unless: sshpass -p '{{ password }}' ssh -T root@{{ cluster.init }}
+    - unless: setsid ssh -T root@{{ cluster.init }} -o StrictHostKeyChecking=no
               'grep /root/.ssh/{{ grains['host'] }}_id_rsa.pub -f 
/root/.ssh/authorized_keys'
+    - env:
+      - SSH_ASKPASS: /tmp/ssh_askpass
+      - DISPLAY: :0
+      - PASS: {{ password }}
     - require:
       - copy_ssh_pub
 
 rm_ssh_pub:
   cmd.run:
-    - name: sshpass -p '{{ password }}' ssh -T root@{{ cluster.init }} -o 
StrictHostKeyChecking=no
+    - name: setsid ssh -T root@{{ cluster.init }} -o StrictHostKeyChecking=no
             'rm /root/.ssh/{{ grains['host'] }}_id_rsa.pub'
+    - env:
+      - SSH_ASKPASS: /tmp/ssh_askpass
+      - DISPLAY: :0
+      - PASS: {{ password }}
     - require:
       - copy_ssh_pub
 
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' 
old/habootstrap-formula-0.1.0/cluster/support/ssh_askpass 
new/habootstrap-formula-0.1.0/cluster/support/ssh_askpass
--- old/habootstrap-formula-0.1.0/cluster/support/ssh_askpass   1970-01-01 
01:00:00.000000000 +0100
+++ new/habootstrap-formula-0.1.0/cluster/support/ssh_askpass   2019-05-23 
14:31:11.433529536 +0200
@@ -0,0 +1,2 @@
+#!/bin/bash
+echo "$PASS"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' 
old/habootstrap-formula-0.1.0/habootstrap-formula.changes 
new/habootstrap-formula-0.1.0/habootstrap-formula.changes
--- old/habootstrap-formula-0.1.0/habootstrap-formula.changes   2019-04-25 
12:44:50.202857633 +0200
+++ new/habootstrap-formula-0.1.0/habootstrap-formula.changes   2019-05-23 
14:31:11.437527662 +0200
@@ -1,4 +1,9 @@
 -------------------------------------------------------------------
+Thu May 16 09:13:17 UTC 2019 - Xabier Arbulu Insausti <xarb...@suse.com>
+
+- Remove network repository installation 
+
+-------------------------------------------------------------------
 Thu Apr 25 12:26:43 UTC 2019 - Diego Vinicius Akechi <dake...@suse.com>
 
 - Changed requires from salt-saphana to salt-shaptools.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/habootstrap-formula-0.1.0/habootstrap-formula.spec 
new/habootstrap-formula-0.1.0/habootstrap-formula.spec
--- old/habootstrap-formula-0.1.0/habootstrap-formula.spec      2019-04-25 
12:44:50.202857633 +0200
+++ new/habootstrap-formula-0.1.0/habootstrap-formula.spec      2019-05-23 
14:31:11.437527662 +0200
@@ -66,7 +66,12 @@
 
 %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
 /srv/salt/%{fname}
 
@@ -75,7 +80,12 @@
 
 %files suma
 %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
 %dir %{fdir}


Reply via email to