diff options
| author | Kenny Woodson <kwoodson@redhat.com> | 2017-10-28 20:46:44 -0400 |
|---|---|---|
| committer | Kenny Woodson <kwoodson@redhat.com> | 2017-11-08 10:01:08 -0500 |
| commit | 8757073d8509a6301b70ff66383d84416bdd78cb (patch) | |
| tree | c4eef61dc19e5dc80a3b1b159b2b9f5e72ba826b /playbooks | |
| parent | adb5c51666dfe7c6b93c7bd7c87b339ef2a27f5b (diff) | |
| download | openshift-8757073d8509a6301b70ff66383d84416bdd78cb.tar.gz openshift-8757073d8509a6301b70ff66383d84416bdd78cb.tar.bz2 openshift-8757073d8509a6301b70ff66383d84416bdd78cb.tar.xz openshift-8757073d8509a6301b70ff66383d84416bdd78cb.zip | |
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 }} |