diff options
| author | OpenShift Bot <eparis+openshiftbot@redhat.com> | 2017-09-11 13:37:14 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-09-11 13:37:14 -0400 |
| commit | 942ea3e1eff6f8557c52768ebe76dd1e9a5b99aa (patch) | |
| tree | d41c40877e3e83fb72ba13f1b8c43176f894177f /playbooks/aws/openshift-cluster | |
| parent | 69f03840248a0adadb38b73d9155393af9b069fb (diff) | |
| parent | 22f787280a95e159113cc594e0480d59b2642ade (diff) | |
| download | openshift-942ea3e1eff6f8557c52768ebe76dd1e9a5b99aa.tar.gz openshift-942ea3e1eff6f8557c52768ebe76dd1e9a5b99aa.tar.bz2 openshift-942ea3e1eff6f8557c52768ebe76dd1e9a5b99aa.tar.xz openshift-942ea3e1eff6f8557c52768ebe76dd1e9a5b99aa.zip | |
Merge pull request #5332 from kwoodson/amibuild_node_config
Merged by openshift-bot
Diffstat (limited to 'playbooks/aws/openshift-cluster')
| -rw-r--r-- | playbooks/aws/openshift-cluster/build_ami.yml | 11 | ||||
| -rw-r--r-- | playbooks/aws/openshift-cluster/provisioning_vars.example.yml | 2 |
2 files changed, 4 insertions, 9 deletions
diff --git a/playbooks/aws/openshift-cluster/build_ami.yml b/playbooks/aws/openshift-cluster/build_ami.yml index d3c0057b5..fc11205d8 100644 --- a/playbooks/aws/openshift-cluster/build_ami.yml +++ b/playbooks/aws/openshift-cluster/build_ami.yml @@ -63,15 +63,8 @@ - name: run the std_include include: ../../common/openshift-cluster/initialize_openshift_repos.yml -- hosts: nodes - remote_user: root - tasks: - - set_fact: - openshift_node_bootstrap: True - - - name: run openshift image preparation - include_role: - name: openshift_node +- name: install node config + include: ../../common/openshift-node/config.yml - hosts: localhost connection: local diff --git a/playbooks/aws/openshift-cluster/provisioning_vars.example.yml b/playbooks/aws/openshift-cluster/provisioning_vars.example.yml index 5a30ad3a5..28eb9c993 100644 --- a/playbooks/aws/openshift-cluster/provisioning_vars.example.yml +++ b/playbooks/aws/openshift-cluster/provisioning_vars.example.yml @@ -1,4 +1,6 @@ --- +# when creating an AMI set this option to True +# when installing the cluster, set this to False openshift_node_bootstrap: True # specify a clusterid |