fw fix

pillar/installer.sls

-admin_pass: '12345678'
+admin_pass: Dejo12Cuccos
 admin_user: admin
 admin_user: admin
 amqp:
 amqp:
   host: 127.0.0.1
   host: 127.0.0.1

salt/fwdriver/configuration.sls

@@ -9,7 +9,7 @@ include:
     - group: {{ pillar['fwdriver']['user'] }}
     - group: {{ pillar['fwdriver']['user'] }}
     - mode: 700
     - mode: 700
 
 
-{% if grains['os_family'] == 'RedHat' or grains['os'] == 'Debian' %} 
+{% if pillar['init_type'] == 'systemd' %}
 /etc/systemd/system/firewall.service:
 /etc/systemd/system/firewall.service:
   file.managed:
   file.managed:
     - user: root
     - user: root
@@ -55,7 +55,7 @@ include:
     - user: {{ pillar['fwdriver']['user'] }}
     - user: {{ pillar['fwdriver']['user'] }}
     - group: {{ pillar['fwdriver']['user'] }}
     - group: {{ pillar['fwdriver']['user'] }}
 
 
-{% if grains['os_family'] != 'RedHat' and grains['os'] != 'Debian' %}
+{% if pillar['init_type'] == 'systemd' %}
 /etc/init.d/isc-dhcp-server:
 /etc/init.d/isc-dhcp-server:
   file.symlink:
   file.symlink:
     - target: /lib/init/upstart-job
     - target: /lib/init/upstart-job
@@ -77,7 +77,7 @@ include:
     - source: salt://fwdriver/files/sudoers
     - source: salt://fwdriver/files/sudoers
 
 
 
 
-{% if grains['os_family'] == 'RedHat' or grains['os'] == 'Debian' %}
+{% if pillar['init_type'] == 'systemd' %}
 systemd-sysctl:
 systemd-sysctl:
   cmd.run:
   cmd.run:
     - name: /bin/systemctl restart systemd-sysctl
     - name: /bin/systemctl restart systemd-sysctl

salt/fwdriver/init.sls

@@ -9,18 +9,18 @@ firewall:
       {% if grains['os_family'] == 'RedHat' %}
       {% if grains['os_family'] == 'RedHat' %}
       - zlib-devel
       - zlib-devel
       - python-virtualenvwrapper
       - python-virtualenvwrapper
-      - python-devel
+      - python3devel
       - libmemcached-devel
       - libmemcached-devel
-      - python2-pip
+      - python3-pip
       - dhcp
       - dhcp
       {% else  %}
       {% else  %}
       - zlib1g-dev
       - zlib1g-dev
       - virtualenvwrapper
       - virtualenvwrapper
-      - python-dev
+      - python3-dev
       - libmemcached-dev
       - libmemcached-dev
       - openvswitch-switch
       - openvswitch-switch
-      - python-pip
-      {% if grains['os'] != 'Debian' %}
+      - python3-pip
+      {% if grains['os_family'] != 'Debian' %}
       {# No such package in Debian Jessie! #}
       {# No such package in Debian Jessie! #}
       - openvswitch-controller
       - openvswitch-controller
       {% endif %}
       {% endif %}
@@ -39,7 +39,8 @@ firewall:
   user:
   user:
     - present
     - present
     - name: {{ pillar['fwdriver']['user'] }}
     - name: {{ pillar['fwdriver']['user'] }}
-    - gid_from_name: True
+    - shell: /bin/bash
+    - usergroup: True
   service:
   service:
     - enabled
     - enabled
     - require:
     - require:

salt/fwdriver/virtualenv.sls

 virtualenv_fwdriver:
 virtualenv_fwdriver:
   virtualenv.managed:
   virtualenv.managed:
+    - python: /usr/bin/python3
     - name: /home/{{ pillar['fwdriver']['user'] }}/.virtualenvs/fw
     - name: /home/{{ pillar['fwdriver']['user'] }}/.virtualenvs/fw
-    - requirements: /home/{{ pillar['fwdriver']['user'] }}/fwdriver/requirements.txt
+    - requirements: /home/{{ pillar['fwdriver']['user'] }}/fwdriver/requirements/{{ pillar['deployment_type'] }}.txt
     - user: {{ pillar['fwdriver']['user'] }}
     - user: {{ pillar['fwdriver']['user'] }}
     - no_chown: true
     - no_chown: true
+    - require:
+      - git: gitrepo_fwdriver
+      - virtualenv: virtualenv_fwdriver_install_first
+
+virtualenv_fwdriver_install_first:
+  virtualenv.managed:
+    - python: /usr/bin/python3
+    - name: /home/{{ pillar['fwdriver']['user'] }}/.virtualenvs/fw
+    - requirements: /home/{{ pillar['fwdriver']['user'] }}/fwdriver/requirements/install_first.txt
+    - user: {{ pillar['fwdriver']['user'] }}
+    - no_chown: true
+