diff options
| author | Clayton Coleman <ccoleman@redhat.com> | 2017-11-05 01:25:30 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-11-05 01:25:30 -0400 |
| commit | bbea54dca12e8796764629b88c1faf596b2f5840 (patch) | |
| tree | a577663c65a6eba7ec60e00e2ae0e023359e143e /roles/openshift_aws/templates | |
| parent | 76f4f47c2fac8f2c1df8bf300069116f0dcfbf0e (diff) | |
| parent | 858afb085dab78018f90ff17871b83c1dd9ba5bd (diff) | |
| download | openshift-bbea54dca12e8796764629b88c1faf596b2f5840.tar.gz openshift-bbea54dca12e8796764629b88c1faf596b2f5840.tar.bz2 openshift-bbea54dca12e8796764629b88c1faf596b2f5840.tar.xz openshift-bbea54dca12e8796764629b88c1faf596b2f5840.zip | |
Merge pull request #6015 from openshift/revert-6006-elb-v2
Revert "Bootstrap enhancements."
Diffstat (limited to 'roles/openshift_aws/templates')
| -rw-r--r-- | roles/openshift_aws/templates/user_data.j2 | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/roles/openshift_aws/templates/user_data.j2 b/roles/openshift_aws/templates/user_data.j2 index a8c7f9a95..76aebdcea 100644 --- a/roles/openshift_aws/templates/user_data.j2 +++ b/roles/openshift_aws/templates/user_data.j2 @@ -7,8 +7,8 @@ write_files: owner: 'root:root' permissions: '0640' content: | - openshift_group_type: {{ launch_config_item.key }} -{% if launch_config_item.key != 'master' %} + openshift_group_type: {{ openshift_aws_node_group_type }} +{% if openshift_aws_node_group_type != 'master' %} - path: /etc/origin/node/bootstrap.kubeconfig owner: 'root:root' permissions: '0640' @@ -19,7 +19,7 @@ runcmd: {% if openshift_aws_node_run_bootstrap_startup %} - [ ansible-playbook, /root/openshift_bootstrap/bootstrap.yml] {% endif %} -{% if launch_config_item.key != 'master' %} +{% if openshift_aws_node_group_type != 'master' %} - [ systemctl, enable, {% if openshift_deployment_type == 'openshift-enterprise' %}atomic-openshift{% else %}origin{% endif %}-node] - [ systemctl, start, {% if openshift_deployment_type == 'openshift-enterprise' %}atomic-openshift{% else %}origin{% endif %}-node] {% endif %} |