diff options
author | Devan Goodwin <dgoodwin@redhat.com> | 2016-05-30 12:55:50 -0300 |
---|---|---|
committer | Devan Goodwin <dgoodwin@redhat.com> | 2016-05-30 12:55:50 -0300 |
commit | f24cc239bcd10d51427a751044b73d1c6470b9b2 (patch) | |
tree | ee5beb65f650c1c76466acb1da11f999504e958b /playbooks/openstack/openshift-cluster/files | |
parent | 265daf6b65206fc17ad35e682640477d08efbc43 (diff) | |
parent | 4b734695abf9ca112c9ad3be33f03fcd1a1e7abf (diff) | |
download | openshift-f24cc239bcd10d51427a751044b73d1c6470b9b2.tar.gz openshift-f24cc239bcd10d51427a751044b73d1c6470b9b2.tar.bz2 openshift-f24cc239bcd10d51427a751044b73d1c6470b9b2.tar.xz openshift-f24cc239bcd10d51427a751044b73d1c6470b9b2.zip |
Merge remote-tracking branch 'upstream/master' into upgrade33
Diffstat (limited to 'playbooks/openstack/openshift-cluster/files')
-rw-r--r-- | playbooks/openstack/openshift-cluster/files/heat_stack.yaml | 8 |
1 files changed, 7 insertions, 1 deletions
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 |