1
0
mirror of https://github.com/openshift/openshift-ansible.git synced 2026-02-05 15:45:57 +01:00

Use MCO --once-from instead of custom ansible module

This commit is contained in:
Vadim Rutkovsky
2019-01-02 18:50:45 +01:00
parent 54cfbae152
commit 899195f83c
8 changed files with 46 additions and 223 deletions

View File

@@ -29,15 +29,17 @@
- name: Config bootstrap node
hosts: bootstrap
tasks:
# Bootstrap ignition file wants to set /home/core/.bash_history and requires a user to exist
# to set permissions
- name: FIXME Make sure core user exists
user:
name: "{{ item }}"
with_items:
- core
- systemd-journal-gateway
- import_role:
name: openshift_node40
tasks_from: config.yml
- import_role:
name: openshift_node40
tasks_from: systemd.yml
vars:
excluded_services:
- progress.service
- name: Wait for MCS endpoint to show up
uri:
url: "{{ mcd_endpoint }}/config/master"
@@ -83,15 +85,12 @@
until:
- "'status' in result"
- result.status == 200
- import_role:
name: openshift_node40
tasks_from: config.yml
- name: Make sure etcd user exists
user:
name: etcd
- import_role:
name: openshift_node40
tasks_from: systemd.yml
tasks_from: config.yml
- name: Start workers
hosts: workers
@@ -109,9 +108,6 @@
- import_role:
name: openshift_node40
tasks_from: config.yml
- import_role:
name: openshift_node40
tasks_from: systemd.yml
- name: Wait for nodes to become ready
hosts: bootstrap

View File

@@ -50,6 +50,3 @@
- import_role:
name: openshift_node40
tasks_from: config.yml
- import_role:
name: openshift_node40
tasks_from: systemd.yml