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 /playbooks | |
| 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 'playbooks')
| -rw-r--r-- | playbooks/aws/openshift-cluster/prerequisites.yml | 2 | ||||
| -rw-r--r-- | playbooks/aws/openshift-cluster/provision_sec_group.yml | 2 | ||||
| -rw-r--r-- | playbooks/common/openshift-master/config.yml | 6 |
3 files changed, 7 insertions, 3 deletions
diff --git a/playbooks/aws/openshift-cluster/prerequisites.yml b/playbooks/aws/openshift-cluster/prerequisites.yml index df77fe3bc..f5eb01b14 100644 --- a/playbooks/aws/openshift-cluster/prerequisites.yml +++ b/playbooks/aws/openshift-cluster/prerequisites.yml @@ -4,5 +4,3 @@ - include: provision_ssh_keypair.yml - include: provision_sec_group.yml - vars: - openshift_aws_node_group_type: compute diff --git a/playbooks/aws/openshift-cluster/provision_sec_group.yml b/playbooks/aws/openshift-cluster/provision_sec_group.yml index 039357adb..7d74a691a 100644 --- a/playbooks/aws/openshift-cluster/provision_sec_group.yml +++ b/playbooks/aws/openshift-cluster/provision_sec_group.yml @@ -6,7 +6,7 @@ connection: local gather_facts: no tasks: - - name: create an instance and prepare for ami + - name: create security groups include_role: name: openshift_aws tasks_from: security_group.yml diff --git a/playbooks/common/openshift-master/config.yml b/playbooks/common/openshift-master/config.yml index b359919ba..7ce0362ef 100644 --- a/playbooks/common/openshift-master/config.yml +++ b/playbooks/common/openshift-master/config.yml @@ -212,6 +212,12 @@ tasks_from: master when: openshift_use_kuryr | default(false) | bool + - name: Setup the node group config maps + include_role: + name: openshift_node_group + when: openshift_master_bootstrap_enabled | default(false) | bool + run_once: True + post_tasks: - name: Create group for deployment type group_by: key=oo_masters_deployment_type_{{ openshift.common.deployment_type }} |