From 3b0ef37a385f1a8510d1b2bc2b024ee8ea0f510e Mon Sep 17 00:00:00 2001
From: Jason DeTiberus <jdetiber@redhat.com>
Date: Fri, 29 Apr 2016 17:23:24 -0400
Subject: openstack_fixes

- move openstack user-data content into heat template
---
 playbooks/openstack/openshift-cluster/files/heat_stack.yaml | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

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

diff --git a/playbooks/openstack/openshift-cluster/files/heat_stack.yaml b/playbooks/openstack/openshift-cluster/files/heat_stack.yaml
index 2f05c3adc..1d54a9c39 100644
--- a/playbooks/openstack/openshift-cluster/files/heat_stack.yaml
+++ b/playbooks/openstack/openshift-cluster/files/heat_stack.yaml
@@ -591,11 +591,17 @@ resources:
     type: OS::Heat::MultipartMime
     properties:
       parts:
-        - config: { get_file: user-data }
         - config:
             str_replace:
               template: |
                 #cloud-config
+                disable_root: true
+
+                system_info:
+                  default_user:
+                    name: openshift
+                    sudo: ["ALL=(ALL) NOPASSWD: ALL"]
+
                 write_files:
                   - path: /etc/sudoers.d/00-openshift-no-requiretty
                     permissions: 440
-- 
cgit v1.2.3