diff options
author | Scott Dodson <sdodson@redhat.com> | 2016-11-08 10:23:43 -0500 |
---|---|---|
committer | GitHub <noreply@github.com> | 2016-11-08 10:23:43 -0500 |
commit | 399d4b93cbff1ad98d332ae05302455d0b3c98e1 (patch) | |
tree | 4bacee1bbee196895d00270b5265fbb86b01e8ad /playbooks/openstack/openshift-cluster/files/heat_stack_server.yaml | |
parent | 011f3d38f288f209db094777eadbcc304629c15b (diff) | |
parent | 0cd7191cd788d2e6b0ec8d3c5f52562433ed8a13 (diff) | |
download | openshift-399d4b93cbff1ad98d332ae05302455d0b3c98e1.tar.gz openshift-399d4b93cbff1ad98d332ae05302455d0b3c98e1.tar.bz2 openshift-399d4b93cbff1ad98d332ae05302455d0b3c98e1.tar.xz openshift-399d4b93cbff1ad98d332ae05302455d0b3c98e1.zip |
Merge pull request #2751 from sdodson/BZ1388253
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, 1 insertions, 23 deletions
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== |