diff options
author | Scott Dodson <sdodson@redhat.com> | 2016-11-08 15:34:15 -0500 |
---|---|---|
committer | GitHub <noreply@github.com> | 2016-11-08 15:34:15 -0500 |
commit | 9e90b0085b1203830164c7ea515e69236f16de76 (patch) | |
tree | f6bc352be8a8550b2676ffd8cd1e486d3e1c0a37 /playbooks/openstack/openshift-cluster/files/heat_stack_server.yaml | |
parent | a10e68b03db0e318e960a2f13f5f30ccb59b8d09 (diff) | |
download | openshift-9e90b0085b1203830164c7ea515e69236f16de76.tar.gz openshift-9e90b0085b1203830164c7ea515e69236f16de76.tar.bz2 openshift-9e90b0085b1203830164c7ea515e69236f16de76.tar.xz openshift-9e90b0085b1203830164c7ea515e69236f16de76.zip |
Revert "Revert openshift.node.nodename changes"
Diffstat (limited to 'playbooks/openstack/openshift-cluster/files/heat_stack_server.yaml')
-rw-r--r-- | playbooks/openstack/openshift-cluster/files/heat_stack_server.yaml | 24 |
1 files changed, 23 insertions, 1 deletions
diff --git a/playbooks/openstack/openshift-cluster/files/heat_stack_server.yaml b/playbooks/openstack/openshift-cluster/files/heat_stack_server.yaml index f83f2c984..435139849 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_file: user-data } + user_data: { get_resource: config } user_data_format: RAW metadata: environment: { get_param: cluster_env } @@ -128,3 +128,25 @@ 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== |