diff options
| author | Kenny Woodson <kwoodson@redhat.com> | 2017-11-08 15:51:17 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-11-08 15:51:17 -0500 |
| commit | a7172e8482124feeccf07671fc8263a79fc281a0 (patch) | |
| tree | 1838759eba169d41807ec7ed2e0dd319269210ae /roles/openshift_aws/templates | |
| parent | 52d2eb56e3198ed83c7c9a912aa22919e2180985 (diff) | |
| parent | 8757073d8509a6301b70ff66383d84416bdd78cb (diff) | |
| download | openshift-a7172e8482124feeccf07671fc8263a79fc281a0.tar.gz openshift-a7172e8482124feeccf07671fc8263a79fc281a0.tar.bz2 openshift-a7172e8482124feeccf07671fc8263a79fc281a0.tar.xz openshift-a7172e8482124feeccf07671fc8263a79fc281a0.zip | |
Merge pull request #6016 from kwoodson/bootstrap_enhancements-v3
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 76aebdcea..a8c7f9a95 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: {{ openshift_aws_node_group_type }} -{% if openshift_aws_node_group_type != 'master' %} + openshift_group_type: {{ launch_config_item.key }} +{% if launch_config_item.key != '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 openshift_aws_node_group_type != 'master' %} +{% if launch_config_item.key != '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 %} |