From 0cd7191cd788d2e6b0ec8d3c5f52562433ed8a13 Mon Sep 17 00:00:00 2001
From: Scott Dodson <sdodson@redhat.com>
Date: Mon, 7 Nov 2016 16:38:42 -0500
Subject: Revert "Fix the nodeName of the OpenShift nodes on OpenStack"

This reverts commit aaaf82ba6032d0b1e9c36a39a7eda25b8c5f4b84.
---
 .../openshift-cluster/files/heat_stack_server.yaml | 24 +---------------------
 1 file changed, 1 insertion(+), 23 deletions(-)

(limited to 'playbooks/openstack/openshift-cluster/files/heat_stack_server.yaml')

diff --git a/playbooks/openstack/openshift-cluster/files/heat_stack_server.yaml b/playbooks/openstack/openshift-cluster/files/heat_stack_server.yaml
index 435139849..f83f2c984 100644
--- a/playbooks/openstack/openshift-cluster/files/heat_stack_server.yaml
+++ b/playbooks/openstack/openshift-cluster/files/heat_stack_server.yaml
@@ -107,7 +107,7 @@ resources:
       flavor:    { get_param: flavor }
       networks:
         - port:  { get_resource: port }
-      user_data: { get_resource: config }
+      user_data: { get_file: user-data }
       user_data_format: RAW
       metadata:
         environment: { get_param: cluster_env }
@@ -128,25 +128,3 @@ resources:
     properties:
       floating_network: { get_param: floating_network }
       port_id: { get_resource: port }
-
-  config:
-    type: OS::Heat::CloudConfig
-    properties:
-      cloud_config:
-        disable_root: true
-
-        hostname: { get_param: name }
-
-        system_info:
-          default_user:
-            name: openshift
-            sudo: ["ALL=(ALL) NOPASSWD: ALL"]
-
-        write_files:
-          - path: /etc/sudoers.d/00-openshift-no-requiretty
-            permissions: 440
-            # content: Defaults:openshift !requiretty
-            # Encoded in base64 to be sure that we do not forget the trailing newline or
-            # sudo will not be able to parse that file
-            encoding: b64
-            content: RGVmYXVsdHM6b3BlbnNoaWZ0ICFyZXF1aXJldHR5Cg==
-- 
cgit v1.2.3