3 files changed, 27 insertions, 41 deletions
diff --git a/roles/contiv_facts/tasks/fedora-install.yml b/roles/contiv_facts/tasks/fedora-install.yml
index 932ff091a..b8239a636 100644
--- a/roles/contiv_facts/tasks/fedora-install.yml
+++ b/roles/contiv_facts/tasks/fedora-install.yml
@@ -11,9 +11,9 @@
   retries: 5
   delay: 10
   environment:
-    https_proxy: "{{ https_proxy }}"
-    http_proxy: "{{ http_proxy }}"
-    no_proxy: "{{ no_proxy }}"
+    https_proxy: "{{ contiv_https_proxy }}"
+    http_proxy: "{{ contiv_http_proxy }}"
+    no_proxy: "{{ contiv_no_proxy }}"
 
 - name: Install libselinux-python
   command: dnf install {{ item }} -y
@@ -21,6 +21,6 @@
     - python-dnf
     - libselinux-python
   environment:
-    https_proxy: "{{ https_proxy }}"
-    http_proxy: "{{ http_proxy }}"
-    no_proxy: "{{ no_proxy }}"
+    https_proxy: "{{ contiv_https_proxy }}"
+    http_proxy: "{{ contiv_http_proxy }}"
+    no_proxy: "{{ contiv_no_proxy }}"
diff --git a/roles/contiv_facts/tasks/main.yml b/roles/contiv_facts/tasks/main.yml
index ced04759d..11f1e1369 100644
--- a/roles/contiv_facts/tasks/main.yml
+++ b/roles/contiv_facts/tasks/main.yml
@@ -4,42 +4,28 @@
   register: distro
   check_mode: no
 
-- name: Init the is_coreos fact
+- name: Init the contiv_is_coreos fact
   set_fact:
-    is_coreos: false
+    contiv_is_coreos: false
 
-- name: Set the is_coreos fact
+- name: Set the contiv_is_coreos fact
   set_fact:
-    is_coreos: true
+    contiv_is_coreos: true
   when: "'CoreOS' in distro.stdout"
 
-- name: Set docker config file directory
-  set_fact:
-    docker_config_dir: "/etc/sysconfig"
-
-- name: Override docker config file directory for Debian
-  set_fact:
-    docker_config_dir: "/etc/default"
-  when: ansible_distribution == "Debian" or ansible_distribution == "Ubuntu"
-
-- name: Create config file directory
-  file:
-    path: "{{ docker_config_dir }}"
-    state: directory
-
 - name: Set the bin directory path for CoreOS
   set_fact:
-    bin_dir: "/opt/bin"
-  when: is_coreos
+    contiv_bin_dir: "/opt/bin"
+  when: contiv_is_coreos
 
 - name: Create the directory used to store binaries
   file:
-    path: "{{ bin_dir }}"
+    path: "{{ contiv_bin_dir }}"
     state: directory
 
 - name: Create Ansible temp directory
   file:
-    path: "{{ ansible_temp_dir }}"
+    path: "{{ contiv_ansible_temp_dir }}"
     state: directory
 
 - name: Determine if has rpm
@@ -48,26 +34,26 @@
   changed_when: false
   check_mode: no
 
-- name: Init the has_rpm fact
+- name: Init the contiv_has_rpm fact
   set_fact:
-    has_rpm: false
+    contiv_has_rpm: false
 
-- name: Set the has_rpm fact
+- name: Set the contiv_has_rpm fact
   set_fact:
-    has_rpm: true
+    contiv_has_rpm: true
   when: s.stat.exists
 
-- name: Init the has_firewalld fact
+- name: Init the contiv_has_firewalld fact
   set_fact:
-    has_firewalld: false
+    contiv_has_firewalld: false
 
-- name: Init the has_iptables fact
+- name: Init the contiv_has_iptables fact
   set_fact:
-    has_iptables: false
+    contiv_has_iptables: false
 
 # collect information about what packages are installed
 - include_tasks: rpm.yml
-  when: has_rpm
+  when: contiv_has_rpm
 
 - include_tasks: fedora-install.yml
   when: not openshift_is_atomic and ansible_distribution == "Fedora"
diff --git a/roles/contiv_facts/tasks/rpm.yml b/roles/contiv_facts/tasks/rpm.yml
index d12436f96..dc6c5d3b7 100644
--- a/roles/contiv_facts/tasks/rpm.yml
+++ b/roles/contiv_facts/tasks/rpm.yml
@@ -13,9 +13,9 @@
   failed_when: false
   check_mode: no
 
-- name: Set the has_firewalld fact
+- name: Set the contiv_has_firewalld fact
   set_fact:
-    has_firewalld: true
+    contiv_has_firewalld: true
   when: s.rc == 0 and ss.rc == 0
 
 - name: Determine if iptables-services installed
@@ -25,7 +25,7 @@
   failed_when: false
   check_mode: no
 
-- name: Set the has_iptables fact
+- name: Set the contiv_has_iptables fact
   set_fact:
-    has_iptables: true
+    contiv_has_iptables: true
   when: s.rc == 0