summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKenny Woodson <kwoodson@redhat.com>2018-02-08 11:09:11 -0500
committerGitHub <noreply@github.com>2018-02-08 11:09:11 -0500
commit5f056317c44486bd38ed58aba865189b1d0b4f64 (patch)
tree14b7e993a8e325026e42d5c9a48db8c076ad8f15
parent58b32c510225d6f9d8b9c716dac5eb1c857f328c (diff)
parente1b286b111ead690be70b8916a4d17b0789140a6 (diff)
downloadopenshift-5f056317c44486bd38ed58aba865189b1d0b4f64.tar.gz
openshift-5f056317c44486bd38ed58aba865189b1d0b4f64.tar.bz2
openshift-5f056317c44486bd38ed58aba865189b1d0b4f64.tar.xz
openshift-5f056317c44486bd38ed58aba865189b1d0b4f64.zip
Merge pull request #7057 from ashcrow/remove-master-from-ami-node-bootstrap
openshift_node: Remove master from aws node building
-rw-r--r--roles/openshift_node/defaults/main.yml2
-rw-r--r--roles/openshift_node/tasks/bootstrap.yml4
2 files changed, 3 insertions, 3 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: