Update openshift package names

roles/openshift_node40/defaults/main.yml

@@ -10,11 +10,6 @@ ign_file: "/tmp/bootstrap.ign"
 pull_secret: "{{ files_dir }}/pull-secret"
 tls_verify: false
 
-openshift_service_type_dict:
-  origin: origin
-  openshift-enterprise: atomic-openshift
-openshift_service_type: "{{ openshift_service_type_dict[openshift_deployment_type] }}"
-
 openshift_node_install_packages:
   # Packages from old init/base_packages
   - iproute

roles/openshift_node40/tasks/install.yml

@@ -1,5 +1,5 @@
 ---
-- name: Install openshift packages
+- name: Install openshift support packages
   package:
     name: "{{ openshift_node_install_packages | join(',') }}"
     update_cache: true
@@ -18,6 +18,5 @@
   poll: 30
   vars:
     l_node_packages:
-    - "{{ openshift_service_type }}-node"
-    - "{{ openshift_service_type }}-clients"
-    - "{{ openshift_service_type }}-hyperkube"
+    - openshift-clients
+    - openshift-hyperkube