diff options
| author | Jason DeTiberus <jdetiber@redhat.com> | 2016-04-29 17:23:24 -0400 |
|---|---|---|
| committer | Jason DeTiberus <jdetiber@redhat.com> | 2016-05-05 21:23:19 -0400 |
| commit | 3b0ef37a385f1a8510d1b2bc2b024ee8ea0f510e (patch) | |
| tree | ba61265bf615b50e68a769a114675b0a724ffc72 /playbooks/openstack/openshift-cluster/files | |
| parent | 7669dc981239c8401ef4971856f00c329c09fe6c (diff) | |
| download | openshift-3b0ef37a385f1a8510d1b2bc2b024ee8ea0f510e.tar.gz openshift-3b0ef37a385f1a8510d1b2bc2b024ee8ea0f510e.tar.bz2 openshift-3b0ef37a385f1a8510d1b2bc2b024ee8ea0f510e.tar.xz openshift-3b0ef37a385f1a8510d1b2bc2b024ee8ea0f510e.zip | |
openstack_fixes
- move openstack user-data content into heat template
Diffstat (limited to 'playbooks/openstack/openshift-cluster/files')
| -rw-r--r-- | playbooks/openstack/openshift-cluster/files/heat_stack.yaml | 8 | ||||
| -rw-r--r-- | playbooks/openstack/openshift-cluster/files/user-data | 13 |
2 files changed, 7 insertions, 14 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 diff --git a/playbooks/openstack/openshift-cluster/files/user-data b/playbooks/openstack/openshift-cluster/files/user-data deleted file mode 100644 index eb65f7cec..000000000 --- a/playbooks/openstack/openshift-cluster/files/user-data +++ /dev/null @@ -1,13 +0,0 @@ -#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 - content: | - Defaults:openshift !requiretty |