diff options
| author | Kenny Woodson <kwoodson@redhat.com> | 2017-10-28 20:46:44 -0400 |
|---|---|---|
| committer | Michael Gugino <mgugino@redhat.com> | 2017-11-03 15:12:09 -0400 |
| commit | 983fdade31c57654854cce3c5340e8bf5a7838e7 (patch) | |
| tree | 5c94d39c8e802a0b88451bd36efd8947be858588 /playbooks | |
| parent | adb5c51666dfe7c6b93c7bd7c87b339ef2a27f5b (diff) | |
| download | openshift-983fdade31c57654854cce3c5340e8bf5a7838e7.tar.gz openshift-983fdade31c57654854cce3c5340e8bf5a7838e7.tar.bz2 openshift-983fdade31c57654854cce3c5340e8bf5a7838e7.tar.xz openshift-983fdade31c57654854cce3c5340e8bf5a7838e7.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 | 7 |
3 files changed, 8 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..f32073f09 100644 --- a/playbooks/common/openshift-master/config.yml +++ b/playbooks/common/openshift-master/config.yml @@ -212,6 +212,13 @@ tasks_from: master when: openshift_use_kuryr | default(false) | bool + - name: Setup the compute and infra node config maps + include_role: + name: openshift_node_bootstrap_configmap + tasks_from: standard.yml + 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 }} |