浏览代码

Don't remove node-config yaml when bootstrapping

Vadim Rutkovsky 7 年之前
父节点
当前提交
d1f9350f69
共有 2 个文件被更改,包括 1 次插入5 次删除
  1. 0 5
      roles/openshift_node/tasks/bootstrap.yml
  2. 1 0
      roles/openshift_node_group/tasks/bootstrap.yml

+ 0 - 5
roles/openshift_node/tasks/bootstrap.yml

@@ -70,11 +70,6 @@
     force: yes
     follow: no
 
-- name: Remove default node-config.yaml to allow bootstrapping config
-  file:
-    path: "/etc/origin/node/node-config.yaml"
-    state: absent
-
 - when: rpmgenerated_config.stat.exists
   block:
   - name: Remove RPM generated config files if present

+ 1 - 0
roles/openshift_node_group/tasks/bootstrap.yml

@@ -5,6 +5,7 @@
     dest: "/etc/origin/node/bootstrap-node-config.yaml"
     mode: 0600
 
+# Make sure a single master has node-config so that SDN and sync daemonsets requires it
 - name: remove existing node config
   file:
     dest: "/etc/origin/node/node-config.yaml"