tools fix

Author: Marcin Przepiorowski

tools/compile_template.j2

@@ -8,6 +8,12 @@ export DXLOC={{ dxout }}
 
 PP={{ pploc }}
 
+{% if ansible_os_family == "Solaris" %}
+export SSLLIBS="-l /opt/csw/lib/libcrypto.so.1.0.0 -l /opt/csw/lib/libssl.so"
+{% else %}
+export SSLLIBS="-l /usr/lib64/libcrypto.so.10 -l /usr/lib64/libssl.so"
+{% endif %}
+
 rm -rf $DXLOC
 mkdir $DXLOC
 
@@ -17,16 +23,16 @@ for i in dx_*.pl ; do
     name=${i%.pl}
     echo Compiling $name;
     {% if openssl is defined %}
-    $PP -u -l /usr/lib64/libcrypto.so.10 -l /usr/lib64/libssl.so  -I {{ dxloc }}/lib/ -M Crypt::Blowfish  -F Crypto=dbutils\.pm$ -M Filter::Crypto::Decrypt -o $DXLOC/$name $i
+    $PP -u $SSLLIBS -I {{ dxloc }}/lib/ -M Crypt::Blowfish  -F Crypto=dbutils\.pm$ -M Filter::Crypto::Decrypt -o $DXLOC/$name $i
     {% else %}
     $PP -u -I {{ dxloc }}/lib/ -M Crypt::Blowfish  -F Crypto=dbutils\.pm$ -M Filter::Crypto::Decrypt -o $DXLOC/$name $i
     {% endif %}
 done
 
 {% if openssl is defined %}
-$PP -u -l /usr/lib64/libcrypto.so.10 -l /usr/lib64/libssl.so -I {{dxloc}}/lib/ -M Text::CSV_PP  -M Crypt::Blowfish  -F Crypto=dbutils\.pm$ -M Filter::Crypto::Decrypt  -o $DXLOC/dx_ctl_users dx_ctl_users.pl
-$PP -u -l /usr/lib64/libcrypto.so.10 -l /usr/lib64/libssl.so -M List::MoreUtils::PP -I {{dxloc}}/lib -M Crypt::Blowfish -F Crypto=dbutils\.pm$ -M Filter::Crypto::Decrypt  -o $DXLOC/dx_get_replication dx_get_replication.pl
-$PP -u -l /usr/lib64/libcrypto.so.10 -l /usr/lib64/libssl.so -M List::MoreUtils::PP -I {{dxloc}}/lib -M Crypt::Blowfish -F Crypto=dbutils\.pm$ -M Filter::Crypto::Decrypt  -o $DXLOC/dx_ctl_replication dx_ctl_replication.pl
+$PP -u $SSLLIBS -I {{dxloc}}/lib/ -M Text::CSV_PP  -M Crypt::Blowfish  -F Crypto=dbutils\.pm$ -M Filter::Crypto::Decrypt  -o $DXLOC/dx_ctl_users dx_ctl_users.pl
+$PP -u $SSLLIBS -M List::MoreUtils::PP -I {{dxloc}}/lib -M Crypt::Blowfish -F Crypto=dbutils\.pm$ -M Filter::Crypto::Decrypt  -o $DXLOC/dx_get_replication dx_get_replication.pl
+$PP -u $SSLLIBS -M List::MoreUtils::PP -I {{dxloc}}/lib -M Crypt::Blowfish -F Crypto=dbutils\.pm$ -M Filter::Crypto::Decrypt  -o $DXLOC/dx_ctl_replication dx_ctl_replication.pl
 {% else %}
 $PP -u -I {{dxloc}}/lib/ -M Text::CSV_PP  -M Crypt::Blowfish  -F Crypto=dbutils\.pm$ -M Filter::Crypto::Decrypt  -o $DXLOC/dx_ctl_users dx_ctl_users.pl
 $PP -u -M List::MoreUtils::PP -I {{dxloc}}/lib -M Crypt::Blowfish -F Crypto=dbutils\.pm$ -M Filter::Crypto::Decrypt  -o $DXLOC/dx_get_replication dx_get_replication.pl
@@ -61,7 +67,7 @@ pwd
 rm -rf dxtoolkit2-$1-{{ system }}-*.tar.gz
 {% if openssl is defined %}
   tar cvf dxtoolkit2-$1-{{ system }}-openssl.tar dxtoolkit2
-  gzip dxtoolkit2-$1-{{ system }}-openssl.tar 
+  gzip dxtoolkit2-$1-{{ system }}-openssl.tar
 {% else %}
   tar cvf dxtoolkit2-$1-{{ system }}.tar dxtoolkit2
   gzip dxtoolkit2-$1-{{ system }}.tar

tools/dxt.yml

@@ -2,7 +2,7 @@
  - hosts: all
 
    tasks:
-     - name: Install CPAN 
+     - name: Install CPAN
        sudo: yes
        environment:
         PATH: "/usr/local/bin:/usr/local/bin:/bin:/usr/bin:/usr/local/sbin:/usr/sbin:/sbin"
@@ -20,7 +20,7 @@
          - "LWP::UserAgent"
          - "Net::SSLeay"
          - "IO::Socket::SSL"
-         - "LWP::Protocol::https"  
+         - "LWP::Protocol::https"
          - "Filter::Crypto::Decrypt"
          - "PAR::Packer"
          - "Term::ReadKey"
@@ -29,44 +29,46 @@
      - name: dxtoolkit dirs
        file: name={{ item }} state=directory
        with_items:
-         - "{{ dxout }}" 
-         - "{{ dxloc }}/bin" 
+         - "{{ dxout }}"
+         - "{{ dxloc }}/bin"
 
-     - name: cleanup dx scripts 
+     - name: cleanup dx scripts
        shell: rm -f {{ dxloc }}/bin/dx_*.pl
 
-     - name: dxtoolkit sync 
+     - name: dxtoolkit sync
        synchronize: src=/mnt/c/Users/pioro/Documents/oss_delphix/dxtoolkit/{{ item }} dest={{ dxloc }}
        with_items:
          - "bin"
          - "lib"
 
      - name: no dx_syslog support
        when: no_dx_syslog == True
-       file:     
-         state: absent     
-         path: "{{ dxloc }}/bin/dx_syslog.pl" 
+       file:
+         state: absent
+         path: "{{ dxloc }}/bin/dx_syslog.pl"
 
      - name: put password
        synchronize: src=dbutils.pm dest={{ dxloc }}/lib/dbutils.pm
 
+     - name: aa
+       debug:
+         var: ansible_os_family
+
      - name: create script
-       template: src=/mnt/c/Users/pioro/Documents/oss_delphix/dxtoolkit/tools/compile_template.j2 dest="{{ dxloc }}/bin/compile.sh" mode=755
+       template: src=compile_template.j2 dest="{{ dxloc }}/bin/compile.sh" mode=755 force=yes
 
      - name: compile
-       shell: "{{dxloc}}/bin/compile.sh {{dxversion}}" 
+       shell: "{{dxloc}}/bin/compile.sh {{dxversion}}"
        args:
         chdir: "{{ dxloc }}/bin/"
        register: output
-       failed_when: "'ERROR' in output.stdout" 
-    
-     - name: get toolkit 
+       failed_when: "'ERROR' in output.stdout"
+
+     - name: get toolkit
        fetch: src={{ dxtar }}/dxtoolkit2-{{ dxversion }}-{{ system }}.tar.gz dest=/mnt/c/Users/pioro/Documents/oss_delphix/dxtoolkit/tools flat=yes
 
      - name: cleanup temp
        shell: rm -rf /u02/tmp/par*
 
      - name: cleanup file
-       shell: rm -rf "{{ dxtar }}/dxtoolkit2-{{ dxversion }}-{{ system }}.tar.gz"  
-
-
+       shell: rm -rf "{{ dxtar }}/dxtoolkit2-{{ dxversion }}-{{ system }}.tar.gz"

tools/dxt_git.yml

@@ -2,7 +2,7 @@
  - hosts: all
 
    vars:
-      dxloc: "/home/delphix/github"
+      #dxloc: "/home/delphix/github"
       temp: "{{ dxversion | default('HEAD') }}"
       gittag: "{% if temp != 'HEAD' %} v{{ temp }} {% else %} {{ temp }}{% endif %}"
 

tools/dxt_one.yml

@@ -15,6 +15,14 @@
      - debug:
          msg: "{{ dxout }}"
 
+     - set_fact:
+         outname: "dxtoolkit2-{{ temp }}-{{ system }}.tar.gz"
+       when: openssl is not defined
+
+     - set_fact:
+         outname: "dxtoolkit2-{{ temp }}-{{ system }}-openssl.tar.gz"
+       when: openssl is defined
+
      - name: Find dxtoolkit executable files
        find:
         paths: "{{ dxloc }}/bin"
@@ -40,14 +48,17 @@
 
      - name: delete a output file
        file:
-        path: "{{ dxtar }}/dxtoolkit2-{{ temp }}-{{ system }}.tar.gz"
+        path: "{{ dxtar }}/{{ outname }}"
         state: absent
 
      - name: create an archive
        archive:
-        dest: "{{ dxtar }}/dxtoolkit2-{{ temp }}-{{ system }}.tar.gz"
+        dest: "{{ dxtar }}/{{ outname }}"
         format: gz
         path: "{{ dxout }}"
 
      - name: get toolkit
-       fetch: src={{ dxtar }}/dxtoolkit2-{{ temp }}-{{ system }}.tar.gz dest=/mnt/c/Users/pioro/Documents/oss_delphix/dxtoolkit/tools/ flat=yes
+       fetch:
+         src: "{{ dxtar }}/{{ outname }}"
+         dest: "/mnt/c/Users/pioro/Documents/oss_delphix/dxtoolkit/tools/"
+         flat: yes