From 42d330a1cf2990fee39dab36250524ebfb303428 Mon Sep 17 00:00:00 2001 From: Tim Bielawa Date: Wed, 6 Sep 2017 15:11:55 -0400 Subject: CFME 4.6 work begins. CFME 4.5 references added to the release-3.6 branch --- playbooks/common/openshift-cfme/config.yml | 16 +--------------- 1 file changed, 1 insertion(+), 15 deletions(-) (limited to 'playbooks') diff --git a/playbooks/common/openshift-cfme/config.yml b/playbooks/common/openshift-cfme/config.yml index 533a35d9e..798805698 100644 --- a/playbooks/common/openshift-cfme/config.yml +++ b/playbooks/common/openshift-cfme/config.yml @@ -14,27 +14,13 @@ # # F-a-f, never check on this. True 'background' task. # poll: 0 -- name: Configure Masters for CFME Bulk Image Imports - hosts: oo_masters_to_config - serial: 1 - tasks: - - name: Run master cfme tuning playbook - include_role: - name: openshift_cfme - tasks_from: tune_masters - - name: Setup CFME - hosts: oo_first_master - vars: - r_openshift_cfme_miq_template_content: "{{ lookup('file', 'roles/openshift_cfme/files/miq-template.yaml') | from_yaml}}" + hosts: m01.example.com pre_tasks: - name: Create a temporary place to evaluate the PV templates command: mktemp -d /tmp/openshift-ansible-XXXXXXX register: r_openshift_cfme_mktemp changed_when: false - - name: Ensure the server template was read from disk - debug: - msg="{{ r_openshift_cfme_miq_template_content | from_yaml }}" tasks: - name: Run the CFME Setup Role -- cgit v1.2.1 From 8e10c53974b4b87e483ed0dfec3946383aa071c7 Mon Sep 17 00:00:00 2001 From: Tim Bielawa Date: Fri, 15 Sep 2017 17:18:22 -0400 Subject: Import upstream templates. Do the work. Validate parameters. --- playbooks/common/openshift-cfme/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'playbooks') diff --git a/playbooks/common/openshift-cfme/config.yml b/playbooks/common/openshift-cfme/config.yml index 798805698..3f3abd008 100644 --- a/playbooks/common/openshift-cfme/config.yml +++ b/playbooks/common/openshift-cfme/config.yml @@ -15,7 +15,7 @@ # poll: 0 - name: Setup CFME - hosts: m01.example.com + hosts: oo_first_master pre_tasks: - name: Create a temporary place to evaluate the PV templates command: mktemp -d /tmp/openshift-ansible-XXXXXXX -- cgit v1.2.1 From 534113870fc5e6c47fe8dbba1322a462c9cbef37 Mon Sep 17 00:00:00 2001 From: Tim Bielawa Date: Tue, 3 Oct 2017 17:21:49 -0400 Subject: Hooks for installing CFME during full openshift installation --- playbooks/common/openshift-cfme/config.yml | 15 ------------- playbooks/common/openshift-cluster/config.yml | 3 +++ .../common/openshift-cluster/openshift_cfme.yml | 25 ++++++++++++++++++++++ 3 files changed, 28 insertions(+), 15 deletions(-) create mode 100644 playbooks/common/openshift-cluster/openshift_cfme.yml (limited to 'playbooks') diff --git a/playbooks/common/openshift-cfme/config.yml b/playbooks/common/openshift-cfme/config.yml index 3f3abd008..08df4a57e 100644 --- a/playbooks/common/openshift-cfme/config.yml +++ b/playbooks/common/openshift-cfme/config.yml @@ -1,19 +1,4 @@ --- -# TODO: Make this work. The 'name' variable below is undefined -# presently because it's part of the cfme role. This play can't run -# until that's re-worked. -# -# - name: Pre-Pull manageiq-pods docker images -# hosts: nodes -# tasks: -# - name: Ensure the latest manageiq-pods docker image is pulling -# docker_image: -# name: "{{ openshift_cfme_container_image }}" -# # Fire-and-forget method, never timeout -# async: 99999999999 -# # F-a-f, never check on this. True 'background' task. -# poll: 0 - - name: Setup CFME hosts: oo_first_master pre_tasks: diff --git a/playbooks/common/openshift-cluster/config.yml b/playbooks/common/openshift-cluster/config.yml index 4ca0d48e4..2b6f48468 100644 --- a/playbooks/common/openshift-cluster/config.yml +++ b/playbooks/common/openshift-cluster/config.yml @@ -56,6 +56,9 @@ - include: service_catalog.yml when: openshift_enable_service_catalog | default(false) | bool +- include: openshift_cfme.yml + when: openshift_cfme_install_cfme | default(false) | bool + - name: Print deprecated variable warning message if necessary hosts: oo_first_master gather_facts: no diff --git a/playbooks/common/openshift-cluster/openshift_cfme.yml b/playbooks/common/openshift-cluster/openshift_cfme.yml new file mode 100644 index 000000000..29966d99e --- /dev/null +++ b/playbooks/common/openshift-cluster/openshift_cfme.yml @@ -0,0 +1,25 @@ +--- +- name: CFME Install Checkpoint Start + hosts: localhost + connection: local + gather_facts: false + tasks: + - name: Set CFME install 'In Progress' + set_stats: + data: + installer_phase_cfme: "In Progress" + aggregate: false + +- name: CFME + include: ../openshift-cfme/config.yml + +- name: CFME Install Checkpoint End + hosts: localhost + connection: local + gather_facts: false + tasks: + - name: Set CFME install 'Complete' + set_stats: + data: + installer_phase_CFME: "Complete" + aggregate: false -- cgit v1.2.1