15 files changed, 77 insertions, 43 deletions
diff --git a/roles/container_runtime/defaults/main.yml b/roles/container_runtime/defaults/main.yml
index bd96965ac..d7eb8663f 100644
--- a/roles/container_runtime/defaults/main.yml
+++ b/roles/container_runtime/defaults/main.yml
@@ -59,6 +59,7 @@ docker_default_storage_path: /var/lib/docker
 # Set local versions of facts that must be in json format for container-daemon.json
 # NOTE: When jinja2.9+ is used the container-daemon.json file can move to using tojson
 l_docker_log_options: "{{ l2_docker_log_options | to_json }}"
+l_docker_log_options_dict: "{{ l2_docker_log_options | oo_list_to_dict | to_json }}"
 l_docker_additional_registries: "{{ l2_docker_additional_registries | to_json }}"
 l_docker_blocked_registries: "{{ l2_docker_blocked_registries | to_json }}"
 l_docker_insecure_registries: "{{ l2_docker_insecure_registries | to_json }}"
@@ -81,6 +82,7 @@ l_insecure_crio_registries: "{{ '\"{}\"'.format('\", \"'.join(l2_docker_insecure
 l_crio_registries: "{{ l2_docker_additional_registries + ['docker.io'] }}"
 l_additional_crio_registries: "{{ '\"{}\"'.format('\", \"'.join(l_crio_registries)) }}"
 
+
 openshift_crio_image_tag_default: "latest"
 
 l_crt_crio_image_tag_dict:
@@ -127,3 +129,5 @@ l_docker_image_tag: "{{ l_crt_docker_image_tag_dict[openshift_deployment_type] }
 
 l_docker_image_default: "{{ l_docker_image_prepend }}/{{ openshift_docker_service_name }}:{{ l_docker_image_tag }}"
 l_docker_image: "{{ openshift_docker_systemcontainer_image_override | default(l_docker_image_default) }}"
+
+l_is_node_system_container: "{{ (openshift_use_node_system_container | default(openshift_use_system_containers | default(false)) | bool) }}"
diff --git a/roles/container_runtime/tasks/systemcontainer_crio.yml b/roles/container_runtime/tasks/systemcontainer_crio.yml
index 5ea7df650..61f122f3c 100644
--- a/roles/container_runtime/tasks/systemcontainer_crio.yml
+++ b/roles/container_runtime/tasks/systemcontainer_crio.yml
@@ -4,7 +4,7 @@
   fail: msg='Cannot use CRI-O with node configured as a Docker container'
   when:
     - openshift.common.is_containerized | bool
-    - not openshift.common.is_node_system_container | bool
+    - not l_is_node_system_container | bool
 
 - include_tasks: common/pre.yml
 
diff --git a/roles/container_runtime/templates/daemon.json b/roles/container_runtime/templates/daemon.json
index 383963bd3..1a72d812a 100644
--- a/roles/container_runtime/templates/daemon.json
+++ b/roles/container_runtime/templates/daemon.json
@@ -5,10 +5,10 @@
     "disable-legacy-registry": false,
     "exec-opts": ["native.cgroupdriver=systemd"],
     "insecure-registries": {{ l_docker_insecure_registries }},
-{% if openshift_docker_log_driver is defined  %}
+{% if openshift_docker_log_driver  %}
     "log-driver": "{{ openshift_docker_log_driver }}",
 {%- endif %}
-    "log-opts": {{ l_docker_log_options }},
+    "log-opts": {{ l_docker_log_options_dict }},
     "runtimes": {
 	"oci": {
 	    "path": "/usr/libexec/docker/docker-runc-current"
diff --git a/roles/openshift_health_checker/HOWTO_CHECKS.md b/roles/openshift_health_checker/HOWTO_CHECKS.md
index 6c5662a4e..94961f2d4 100644
--- a/roles/openshift_health_checker/HOWTO_CHECKS.md
+++ b/roles/openshift_health_checker/HOWTO_CHECKS.md
@@ -12,7 +12,7 @@ Checks are typically implemented as two parts:
 
 The checks are called from Ansible playbooks via the `openshift_health_check`
 action plugin. See
-[playbooks/byo/openshift-preflight/check.yml](../../playbooks/byo/openshift-preflight/check.yml)
+[playbooks/openshift-checks/pre-install.yml](../../playbooks/openshift-checks/pre-install.yml)
 for an example.
 
 The action plugin dynamically discovers all checks and executes only those
diff --git a/roles/openshift_hosted/tasks/registry.yml b/roles/openshift_hosted/tasks/registry.yml
index de302c740..429f0c514 100644
--- a/roles/openshift_hosted/tasks/registry.yml
+++ b/roles/openshift_hosted/tasks/registry.yml
@@ -126,7 +126,7 @@
     selector: "{{ openshift_hosted_registry_selector }}"
     replicas: "{{ openshift_hosted_registry_replicas | default(l_default_replicas) }}"
     service_account: "{{ openshift_hosted_registry_serviceaccount }}"
-    images: "{{ penshift_hosted_registry_registryurl }}"
+    images: "{{ openshift_hosted_registry_registryurl }}"
     env_vars: "{{ openshift_hosted_registry_env_vars }}"
     volume_mounts: "{{ openshift_hosted_registry_volumes }}"
     edits: "{{ openshift_hosted_registry_edits }}"
diff --git a/roles/openshift_logging_elasticsearch/templates/es.j2 b/roles/openshift_logging_elasticsearch/templates/es.j2
index 0bfa9e85b..bf04094a3 100644
--- a/roles/openshift_logging_elasticsearch/templates/es.j2
+++ b/roles/openshift_logging_elasticsearch/templates/es.j2
@@ -9,6 +9,7 @@ metadata:
     logging-infra: "{{logging_component}}"
 spec:
   replicas: {{es_replicas|default(1)}}
+  revisionHistoryLimit: 0
   selector:
     provider: openshift
     component: "{{component}}"
diff --git a/roles/openshift_management/README.md b/roles/openshift_management/README.md
index 96de82669..974d9781a 100644
--- a/roles/openshift_management/README.md
+++ b/roles/openshift_management/README.md
@@ -164,14 +164,14 @@ away.
 If you want to install CFME/MIQ at the same time you install your
 OCP/Origin cluster, ensure that `openshift_management_install_management` is set
 to `true` in your inventory. Call the standard
-`playbooks/byo/config.yml` playbook to begin the cluster and CFME/MIQ
+`playbooks/deploy_cluster.yml` playbook to begin the cluster and CFME/MIQ
 installation.
 
 If you are installing CFME/MIQ on an *already provisioned cluster*
 then you can call the CFME/MIQ playbook directly:
 
 ```
-$ ansible-playbook -v -i <YOUR_INVENTORY> playbooks/byo/openshift-management/config.yml
+$ ansible-playbook -v -i <YOUR_INVENTORY> playbooks/openshift-management/config.yml
 ```
 
 *Note: Use `miq-template` in the following examples for ManageIQ installs*
@@ -489,7 +489,7 @@ This playbook will:
 
 
 ```
-$ ansible-playbook -v -i <YOUR_INVENTORY> playbooks/byo/openshift-management/add_container_provider.yml
+$ ansible-playbook -v -i <YOUR_INVENTORY> playbooks/openshift-management/add_container_provider.yml
 ```
 
 ## Multiple Providers
@@ -567,7 +567,7 @@ the config file path.
 
 ```
 $ ansible-playbook -v -e container_providers_config=/tmp/cp.yml \
-      playbooks/byo/openshift-management/add_many_container_providers.yml
+      playbooks/openshift-management/add_many_container_providers.yml
 ```
 
 Afterwards you will find two new container providers in your
@@ -579,7 +579,7 @@ to see an overview.
 This role includes a playbook to uninstall and erase the CFME/MIQ
 installation:
 
-* `playbooks/byo/openshift-management/uninstall.yml`
+* `playbooks/openshift-management/uninstall.yml`
 
 NFS export definitions and data stored on NFS exports are not
 automatically removed. You are urged to manually erase any data from
diff --git a/roles/openshift_management/defaults/main.yml b/roles/openshift_management/defaults/main.yml
index e768961ce..b5e234b7f 100644
--- a/roles/openshift_management/defaults/main.yml
+++ b/roles/openshift_management/defaults/main.yml
@@ -88,7 +88,7 @@ openshift_management_storage_nfs_local_hostname: false
 # name and password AND are trying to use integration scripts.
 #
 # For example, adding this cluster as a container provider,
-# playbooks/byo/openshift-management/add_container_provider.yml
+# playbooks/openshift-management/add_container_provider.yml
 openshift_management_username: admin
 openshift_management_password: smartvm
 
diff --git a/roles/openshift_node/tasks/main.yml b/roles/openshift_node/tasks/main.yml
index d9f3e920d..32c5f495f 100644
--- a/roles/openshift_node/tasks/main.yml
+++ b/roles/openshift_node/tasks/main.yml
@@ -44,6 +44,15 @@
 - name: include node installer
   include_tasks: install.yml
 
+- name: Restart cri-o
+  systemd:
+    name: cri-o
+    enabled: yes
+    state: restarted
+  when: openshift_use_crio
+  register: task_result
+  failed_when: task_result|failed and 'could not find the requested service' not in task_result.msg|lower
+
 - name: restart NetworkManager to ensure resolv.conf is present
   systemd:
     name: NetworkManager
diff --git a/roles/openshift_version/defaults/main.yml b/roles/openshift_version/defaults/main.yml
index 4adf04e90..354699637 100644
--- a/roles/openshift_version/defaults/main.yml
+++ b/roles/openshift_version/defaults/main.yml
@@ -6,3 +6,5 @@ openshift_service_type_dict:
   openshift-enterprise: atomic-openshift
 
 openshift_service_type: "{{ openshift_service_type_dict[openshift_deployment_type] }}"
+
+openshift_use_crio_only: False
diff --git a/roles/openshift_version/meta/main.yml b/roles/openshift_version/meta/main.yml
index 5d7683120..d0ad4b7d2 100644
--- a/roles/openshift_version/meta/main.yml
+++ b/roles/openshift_version/meta/main.yml
@@ -13,3 +13,4 @@ galaxy_info:
   - cloud
 dependencies:
 - role: lib_utils
+- role: openshift_facts
diff --git a/roles/rhel_subscribe/README.md b/roles/rhel_subscribe/README.md
new file mode 100644
index 000000000..15eaf4f30
--- /dev/null
+++ b/roles/rhel_subscribe/README.md
@@ -0,0 +1,29 @@
+RHEL Subscribe
+==============
+
+Subscribes the RHEL servers and add the OpenShift enterprise repos.
+
+Role variables
+--------------
+
+### `rhsub_user`
+
+Username for the subscription-manager.
+
+### `rhsub_pass`
+
+Password for the subscription-manager.
+
+### `rhsub_pool`
+
+Name of the pool to attach (optional).
+
+### `rhsub_server`
+
+Custom hostname for the Satellite server (optional).
+
+### `openshift_release`
+
+Version for the OpenShift Enterprise repositories.
+
+Example: `3.6`
diff --git a/roles/rhel_subscribe/defaults/main.yml b/roles/rhel_subscribe/defaults/main.yml
new file mode 100644
index 000000000..80b2ab919
--- /dev/null
+++ b/roles/rhel_subscribe/defaults/main.yml
@@ -0,0 +1,2 @@
+---
+rhsub_pool: 'Red Hat OpenShift Container Platform, Premium*'
diff --git a/roles/rhel_subscribe/tasks/enterprise.yml b/roles/rhel_subscribe/tasks/enterprise.yml
index fa74c9953..8acdfb969 100644
--- a/roles/rhel_subscribe/tasks/enterprise.yml
+++ b/roles/rhel_subscribe/tasks/enterprise.yml
@@ -1,25 +1,18 @@
 ---
-- name: Disable all repositories
-  command: subscription-manager repos --disable="*"
-
-- set_fact:
-    default_ose_version: '3.6'
-  when: deployment_type == 'openshift-enterprise'
-
 - set_fact:
-    ose_version: "{{ lookup('env', 'ose_version') | default(default_ose_version, True) }}"
-
-- fail:
-    msg: "{{ ose_version }} is not a valid version for {{ deployment_type }} deployment type"
+    openshift_release: "{{ openshift_release[1:] }}"
   when:
-    - deployment_type == 'openshift-enterprise'
-    - ose_version not in ['3.1', '3.2', '3.3', '3.4', '3.5', '3.6'] )
+  - openshift_release is defined
+  - openshift_release[0] == 'v'
+
+- name: Disable all repositories
+  command: subscription-manager repos --disable="*"
 
 - name: Enable RHEL repositories
   command: subscription-manager repos \
                --enable="rhel-7-server-rpms" \
                --enable="rhel-7-server-extras-rpms" \
-               --enable="rhel-7-server-ose-{{ ose_version }}-rpms" \
+               --enable="rhel-7-server-ose-{{ (openshift_release | default('')).split('.')[0:2] | join('.') }}-rpms" \
                --enable="rhel-7-fast-datapath-rpms"
   register: subscribe_repos
   until: subscribe_repos | succeeded
diff --git a/roles/rhel_subscribe/tasks/main.yml b/roles/rhel_subscribe/tasks/main.yml
index f83cf9157..3466b7e44 100644
--- a/roles/rhel_subscribe/tasks/main.yml
+++ b/roles/rhel_subscribe/tasks/main.yml
@@ -3,23 +3,17 @@
 #       to make it able to attach to a pool
 #       to make it able to enable repositories
 
-- set_fact:
-    rhel_subscription_pool: "{{ lookup('env', 'rhel_subscription_pool') | default(rhsub_pool | default('Red Hat OpenShift Container Platform, Premium*')) }}"
-    rhel_subscription_user: "{{ lookup('env', 'rhel_subscription_user') | default(rhsub_user | default(omit, True)) }}"
-    rhel_subscription_pass: "{{ lookup('env', 'rhel_subscription_pass') | default(rhsub_pass | default(omit, True)) }}"
-    rhel_subscription_server: "{{ lookup('env', 'rhel_subscription_server') | default(rhsub_server | default(omit, True)) }}"
-
 - fail:
     msg: "This role is only supported for Red Hat hosts"
   when: ansible_distribution != 'RedHat'
 
 - fail:
-    msg: Either rhsub_user or the rhel_subscription_user env variable are required for this role.
-  when: rhel_subscription_user is not defined
+    msg: The rhsub_user variable is required for this role.
+  when: rhsub_user is not defined or not rhsub_user
 
 - fail:
-    msg: Either rhsub_pass or the rhel_subscription_pass env variable are required for this role.
-  when: rhel_subscription_pass is not defined
+    msg: The rhsub_pass variable is required for this role.
+  when: rhsub_pass is not defined or not rhsub_pass
 
 - name: Detecting Atomic Host Operating System
   stat:
@@ -27,10 +21,10 @@
   register: ostree_booted
 
 - name: Satellite preparation
-  command: "rpm -Uvh http://{{ rhel_subscription_server }}/pub/katello-ca-consumer-latest.noarch.rpm"
+  command: "rpm -Uvh http://{{ rhsub_server }}/pub/katello-ca-consumer-latest.noarch.rpm"
   args:
     creates: /etc/rhsm/ca/katello-server-ca.pem
-  when: rhel_subscription_server is defined and rhel_subscription_server
+  when: rhsub_server is defined and rhsub_server
 
 - name: Install Red Hat Subscription manager
   yum:
@@ -41,26 +35,26 @@
 
 - name: RedHat subscriptions
   redhat_subscription:
-    username: "{{ rhel_subscription_user }}"
-    password: "{{ rhel_subscription_pass }}"
+    username: "{{ rhsub_user }}"
+    password: "{{ rhsub_pass }}"
   register: rh_subscription
   until: rh_subscription | succeeded
 
 - name: Retrieve the OpenShift Pool ID
-  command: subscription-manager list --available --matches="{{ rhel_subscription_pool }}" --pool-only
+  command: subscription-manager list --available --matches="{{ rhsub_pool }}" --pool-only
   register: openshift_pool_id
   until: openshift_pool_id | succeeded
   changed_when: False
 
 - name: Determine if OpenShift Pool Already Attached
-  command: subscription-manager list --consumed --matches="{{ rhel_subscription_pool }}" --pool-only
+  command: subscription-manager list --consumed --matches="{{ rhsub_pool }}" --pool-only
   register: openshift_pool_attached
   until: openshift_pool_attached | succeeded
   changed_when: False
   when: openshift_pool_id.stdout == ''
 
 - fail:
-    msg: "Unable to find pool matching {{ rhel_subscription_pool }} in available or consumed pools"
+    msg: "Unable to find pool matching {{ rhsub_pool }} in available or consumed pools"
   when: openshift_pool_id.stdout == '' and openshift_pool_attached is defined and openshift_pool_attached.stdout == ''
 
 - name: Attach to OpenShift Pool
@@ -71,5 +65,4 @@
 
 - include_tasks: enterprise.yml
   when:
-  - deployment_type == 'openshift-enterprise'
   - not ostree_booted.stat.exists | bool