Merge pull request #1574 from unfetter-discover/rc-0.3.11

RC 0.3.11 into master

Author: mpmmasterpeace

.travis.yml

@@ -0,0 +1,17 @@
+sudo: true
+language: python
+cache: pip
+python:
+  - "3.6"
+
+before_install:
+  - sudo apt-get update
+  - sudo apt-get install -y swig
+  - sudo apt-get install -y libpulse-dev
+install:
+  - 'cd ansible'
+  - 'pip install pipenv'
+  - 'pipenv install'
+script:
+  - 'ansible-lint *.yml'
+#  - 'ansible-playbook deploy-dev.yml'

ansible/.gitignore

@@ -9,3 +9,7 @@ backup/*
 
 roles/gateway/files/conf.d/default.conf
 roles/gateway/files/ui-dist/
+
+host_vars/*
+!host_vars/demo-file.yml
+src/*

ansible/Pipfile

@@ -5,3 +5,6 @@ name = "pypi"
 
 [packages]
 docker-py = "*"
+boto3 = "*"
+boto = "*"
+ansible-lint = "*"

ansible/Pipfile.lock

@@ -1,2 +1,3 @@
 [defaults]
 inventory = hosts.ini
+host_key_check = False

ansible/ansible.cfg

@@ -1,25 +1,19 @@
----
 ####################################################################################
 #  This playbook only builds the docker images locally
 #
 ####################################################################################
 
-
-- name: Build the Docker images only.  Do not 
+- name: Build the Docker images only.
   hosts: build
   tasks:
-  - name: Iterate over group variables
-    debug:
-      var: item
-    with_items: "{{ hostvars | to_nice_json }}"           
-  - name: Start running the commands
-    import_tasks: discover-tasks.yml
-  - include_role:
-      name: gateway
-      tasks_from: task-build-release
-    vars:
-       gateway_tag: "{{ docker_tag }}"
-
-
-
-
+    - name: Iterate over group variables
+      debug:
+        var: item
+      with_items: "{{ hostvars | to_nice_json }}"
+    - name: Start running the commands
+      import_tasks: discover-tasks.yml
+    - include_role:
+        name: gateway
+        tasks_from: task-build-release
+      vars:
+        gateway_tag: "{{ docker_tag }}"

ansible/build-prod.yml

@@ -1,18 +1,13 @@
----
 ####################################################################################
-#  This playbook only builds in dev mode.  
+#  This playbook only builds in dev mode.
 #
 ####################################################################################
 
-
 - name: Build Playbook
   hosts: dev
   tasks:
-                   
   - name: Start running the commands
     import_tasks: discover-tasks.yml
     vars:
-      - run_action: true
-      - build_action: local
-
-
+    - run_action: true
+    - build_action: local

ansible/deploy-dev.yml

@@ -1,4 +1,3 @@
----
 ####################################################################################
 #  This playbook manages the target hosts and calls "discover-tasks.yml" workhorse
 #  playbook.
@@ -8,11 +7,9 @@
 #
 ####################################################################################
 
-- name: Build Playbook
+- name: Deploy Playbook
   hosts: deployed
 
   tasks:
   - name: Start running the commands
     import_tasks: discover-tasks.yml
-
-