summaryrefslogtreecommitdiffstats
path: root/roles/openshift_node
diff options
context:
space:
mode:
Diffstat (limited to 'roles/openshift_node')
-rw-r--r--roles/openshift_node/defaults/main.yml2
-rw-r--r--roles/openshift_node/tasks/bootstrap.yml4
-rw-r--r--roles/openshift_node/tasks/upgrade.yml2
3 files changed, 4 insertions, 4 deletions
diff --git a/roles/openshift_node/defaults/main.yml b/roles/openshift_node/defaults/main.yml
index 9f887891b..64ab07bb5 100644
--- a/roles/openshift_node/defaults/main.yml
+++ b/roles/openshift_node/defaults/main.yml
@@ -112,7 +112,7 @@ l_is_openvswitch_system_container: "{{ (openshift_use_openvswitch_system_contain
openshift_image_tag: ''
default_r_openshift_node_image_prep_packages:
-- "{{ openshift_service_type }}-master"
+#- "{{ openshift_service_type }}-master"
- "{{ openshift_service_type }}-node"
- "{{ openshift_service_type }}-docker-excluder"
- "{{ openshift_service_type }}-sdn-ovs"
diff --git a/roles/openshift_node/tasks/bootstrap.yml b/roles/openshift_node/tasks/bootstrap.yml
index 1a6f209e0..f9f042eeb 100644
--- a/roles/openshift_node/tasks/bootstrap.yml
+++ b/roles/openshift_node/tasks/bootstrap.yml
@@ -43,13 +43,13 @@
# line: "{% raw %}ExecStart=/usr/bin/openshift start node --bootstrap --kubeconfig=${KUBECONFIG} $OPTIONS{% endraw %}"
# regexp: "^ExecStart=.*"
-- name: "disable {{ openshift_service_type }}-node and {{ openshift_service_type }}-master services"
+- name: "disable {{ openshift_service_type }}-node" # and {{ openshift_service_type }}-master services"
systemd:
name: "{{ item }}"
enabled: no
with_items:
- "{{ openshift_service_type }}-node.service"
- - "{{ openshift_service_type }}-master.service"
+# - "{{ openshift_service_type }}-master.service"
- name: Check for RPM generated config marker file .config_managed
stat:
diff --git a/roles/openshift_node/tasks/upgrade.yml b/roles/openshift_node/tasks/upgrade.yml
index 02e417937..c5121c5b2 100644
--- a/roles/openshift_node/tasks/upgrade.yml
+++ b/roles/openshift_node/tasks/upgrade.yml
@@ -13,7 +13,7 @@
include_tasks: upgrade/stop_services.yml
# Ensure actually install latest package.
-- name: download docker upgrade rpm
+- name: install docker upgrade rpm
command: "{{ ansible_pkg_mgr }} install -C -y docker{{ '-' + docker_version }}"
register: result
until: result is succeeded