From 858afb085dab78018f90ff17871b83c1dd9ba5bd Mon Sep 17 00:00:00 2001
From: Clayton Coleman <ccoleman@redhat.com>
Date: Sun, 5 Nov 2017 01:03:05 -0400
Subject: Revert "Bootstrap enhancements."

---
 .../tasks/create_config.yml                        | 32 ----------------------
 .../tasks/standard.yml                             | 12 --------
 2 files changed, 44 deletions(-)
 delete mode 100644 roles/openshift_node_bootstrap_configmap/tasks/create_config.yml
 delete mode 100644 roles/openshift_node_bootstrap_configmap/tasks/standard.yml

(limited to 'roles/openshift_node_bootstrap_configmap/tasks')

diff --git a/roles/openshift_node_bootstrap_configmap/tasks/create_config.yml b/roles/openshift_node_bootstrap_configmap/tasks/create_config.yml
deleted file mode 100644
index 05080daa4..000000000
--- a/roles/openshift_node_bootstrap_configmap/tasks/create_config.yml
+++ /dev/null
@@ -1,32 +0,0 @@
----
-- name: create a temp dir for this work
-  command: mktemp -d /tmp/openshift_node_config-XXXXXX
-  register: mktempout
-  run_once: true
-
-- name: create node config template
-  template:
-    src: node-config.yaml.j2
-    dest: "{{ mktempout.stdout }}/node-config.yaml"
-
-- name: "specialize the generated configs for {{ openshift_node_bootstrap_configmap_name }}"
-  yedit:
-    content:
-    src: "{{ mktempout.stdout }}/node-config.yaml"
-    edits: "{{ openshift_node_bootstrap_configmap_edits }}"
-  when: openshift_node_bootstrap_configmap_edits|length > 0
-  run_once: true
-
-- name: create node-config.yaml configmap
-  oc_configmap:
-    name: "{{ openshift_node_bootstrap_configmap_name }}"
-    namespace: "{{ openshift_node_bootstrap_configmap_namespace }}"
-    from_file:
-      node-config.yaml: "{{ mktempout.stdout }}/node-config.yaml"
-  run_once: true
-
-- name: remove templated files
-  file:
-    dest: "{{ mktempout.stdout }}/"
-    state: absent
-  run_once: true
diff --git a/roles/openshift_node_bootstrap_configmap/tasks/standard.yml b/roles/openshift_node_bootstrap_configmap/tasks/standard.yml
deleted file mode 100644
index 637d7c7fc..000000000
--- a/roles/openshift_node_bootstrap_configmap/tasks/standard.yml
+++ /dev/null
@@ -1,12 +0,0 @@
----
-- name: Build an infra node configmap
-  include: create_config.yml
-  vars:
-    openshift_node_bootstrap_configmap_name: node-config-infra
-  static: true
-
-- name: Build an infra node configmap
-  include: create_config.yml
-  vars:
-    openshift_node_bootstrap_configmap_name: node-config-compute
-  static: true
-- 
cgit v1.2.3