From c0f63fb902b53bc592e6862d5876af9b244ee82b Mon Sep 17 00:00:00 2001 From: Tim Bielawa Date: Thu, 5 Oct 2017 15:42:18 -0400 Subject: Rename openshift_cfme role to openshift_management --- playbooks/byo/openshift-cfme/config.yml | 8 ------- playbooks/byo/openshift-cfme/uninstall.yml | 6 ------ playbooks/byo/openshift-management/config.yml | 8 +++++++ playbooks/byo/openshift-management/uninstall.yml | 6 ++++++ playbooks/common/openshift-cfme/config.yml | 15 ------------- playbooks/common/openshift-cfme/filter_plugins | 1 - playbooks/common/openshift-cfme/library | 1 - playbooks/common/openshift-cfme/roles | 1 - playbooks/common/openshift-cfme/uninstall.yml | 8 ------- playbooks/common/openshift-cluster/config.yml | 4 ++-- .../common/openshift-cluster/openshift_cfme.yml | 25 ---------------------- .../openshift-cluster/openshift_management.yml | 25 ++++++++++++++++++++++ playbooks/common/openshift-management/config.yml | 15 +++++++++++++ .../common/openshift-management/filter_plugins | 1 + playbooks/common/openshift-management/library | 1 + playbooks/common/openshift-management/roles | 1 + .../common/openshift-management/uninstall.yml | 8 +++++++ 17 files changed, 67 insertions(+), 67 deletions(-) delete mode 100644 playbooks/byo/openshift-cfme/config.yml delete mode 100644 playbooks/byo/openshift-cfme/uninstall.yml create mode 100644 playbooks/byo/openshift-management/config.yml create mode 100644 playbooks/byo/openshift-management/uninstall.yml delete mode 100644 playbooks/common/openshift-cfme/config.yml delete mode 120000 playbooks/common/openshift-cfme/filter_plugins delete mode 120000 playbooks/common/openshift-cfme/library delete mode 120000 playbooks/common/openshift-cfme/roles delete mode 100644 playbooks/common/openshift-cfme/uninstall.yml delete mode 100644 playbooks/common/openshift-cluster/openshift_cfme.yml create mode 100644 playbooks/common/openshift-cluster/openshift_management.yml create mode 100644 playbooks/common/openshift-management/config.yml create mode 120000 playbooks/common/openshift-management/filter_plugins create mode 120000 playbooks/common/openshift-management/library create mode 120000 playbooks/common/openshift-management/roles create mode 100644 playbooks/common/openshift-management/uninstall.yml (limited to 'playbooks') diff --git a/playbooks/byo/openshift-cfme/config.yml b/playbooks/byo/openshift-cfme/config.yml deleted file mode 100644 index 0e8e7a94d..000000000 --- a/playbooks/byo/openshift-cfme/config.yml +++ /dev/null @@ -1,8 +0,0 @@ ---- -- include: ../openshift-cluster/initialize_groups.yml - tags: - - always - -- include: ../../common/openshift-cluster/evaluate_groups.yml - -- include: ../../common/openshift-cfme/config.yml diff --git a/playbooks/byo/openshift-cfme/uninstall.yml b/playbooks/byo/openshift-cfme/uninstall.yml deleted file mode 100644 index c8ed16859..000000000 --- a/playbooks/byo/openshift-cfme/uninstall.yml +++ /dev/null @@ -1,6 +0,0 @@ ---- -# - include: ../openshift-cluster/initialize_groups.yml -# tags: -# - always - -- include: ../../common/openshift-cfme/uninstall.yml diff --git a/playbooks/byo/openshift-management/config.yml b/playbooks/byo/openshift-management/config.yml new file mode 100644 index 000000000..33a555cc1 --- /dev/null +++ b/playbooks/byo/openshift-management/config.yml @@ -0,0 +1,8 @@ +--- +- include: ../openshift-cluster/initialize_groups.yml + tags: + - always + +- include: ../../common/openshift-cluster/evaluate_groups.yml + +- include: ../../common/openshift-management/config.yml diff --git a/playbooks/byo/openshift-management/uninstall.yml b/playbooks/byo/openshift-management/uninstall.yml new file mode 100644 index 000000000..ebd6fb261 --- /dev/null +++ b/playbooks/byo/openshift-management/uninstall.yml @@ -0,0 +1,6 @@ +--- +# - include: ../openshift-cluster/initialize_groups.yml +# tags: +# - always + +- include: ../../common/openshift-management/uninstall.yml diff --git a/playbooks/common/openshift-cfme/config.yml b/playbooks/common/openshift-cfme/config.yml deleted file mode 100644 index 08df4a57e..000000000 --- a/playbooks/common/openshift-cfme/config.yml +++ /dev/null @@ -1,15 +0,0 @@ ---- -- name: Setup CFME - hosts: oo_first_master - 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 - - tasks: - - name: Run the CFME Setup Role - include_role: - name: openshift_cfme - vars: - template_dir: "{{ hostvars[groups.masters.0].r_openshift_cfme_mktemp.stdout }}" diff --git a/playbooks/common/openshift-cfme/filter_plugins b/playbooks/common/openshift-cfme/filter_plugins deleted file mode 120000 index 99a95e4ca..000000000 --- a/playbooks/common/openshift-cfme/filter_plugins +++ /dev/null @@ -1 +0,0 @@ -../../../filter_plugins \ No newline at end of file diff --git a/playbooks/common/openshift-cfme/library b/playbooks/common/openshift-cfme/library deleted file mode 120000 index ba40d2f56..000000000 --- a/playbooks/common/openshift-cfme/library +++ /dev/null @@ -1 +0,0 @@ -../../../library \ No newline at end of file diff --git a/playbooks/common/openshift-cfme/roles b/playbooks/common/openshift-cfme/roles deleted file mode 120000 index 20c4c58cf..000000000 --- a/playbooks/common/openshift-cfme/roles +++ /dev/null @@ -1 +0,0 @@ -../../../roles \ No newline at end of file diff --git a/playbooks/common/openshift-cfme/uninstall.yml b/playbooks/common/openshift-cfme/uninstall.yml deleted file mode 100644 index 78b8e7668..000000000 --- a/playbooks/common/openshift-cfme/uninstall.yml +++ /dev/null @@ -1,8 +0,0 @@ ---- -- name: Uninstall CFME - hosts: masters - tasks: - - name: Run the CFME Uninstall Role Tasks - include_role: - name: openshift_cfme - tasks_from: uninstall diff --git a/playbooks/common/openshift-cluster/config.yml b/playbooks/common/openshift-cluster/config.yml index 76ca067e7..b399ea995 100644 --- a/playbooks/common/openshift-cluster/config.yml +++ b/playbooks/common/openshift-cluster/config.yml @@ -46,8 +46,8 @@ - include: service_catalog.yml when: openshift_enable_service_catalog | default(false) | bool -- include: openshift_cfme.yml - when: openshift_cfme_install_cfme | default(false) | bool +- include: openshift_management.yml + when: openshift_management_install_management | default(false) | bool - name: Print deprecated variable warning message if necessary hosts: oo_first_master diff --git a/playbooks/common/openshift-cluster/openshift_cfme.yml b/playbooks/common/openshift-cluster/openshift_cfme.yml deleted file mode 100644 index 29966d99e..000000000 --- a/playbooks/common/openshift-cluster/openshift_cfme.yml +++ /dev/null @@ -1,25 +0,0 @@ ---- -- 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 diff --git a/playbooks/common/openshift-cluster/openshift_management.yml b/playbooks/common/openshift-cluster/openshift_management.yml new file mode 100644 index 000000000..6e582920b --- /dev/null +++ b/playbooks/common/openshift-cluster/openshift_management.yml @@ -0,0 +1,25 @@ +--- +- name: Management Install Checkpoint Start + hosts: localhost + connection: local + gather_facts: false + tasks: + - name: Set Management install 'In Progress' + set_stats: + data: + installer_phase_Management: "In Progress" + aggregate: false + +- name: Management + include: ../openshift-management/config.yml + +- name: Management Install Checkpoint End + hosts: localhost + connection: local + gather_facts: false + tasks: + - name: Set Management install 'Complete' + set_stats: + data: + installer_phase_Management: "Complete" + aggregate: false diff --git a/playbooks/common/openshift-management/config.yml b/playbooks/common/openshift-management/config.yml new file mode 100644 index 000000000..0aaafe440 --- /dev/null +++ b/playbooks/common/openshift-management/config.yml @@ -0,0 +1,15 @@ +--- +- name: Setup CFME + hosts: oo_first_master + pre_tasks: + - name: Create a temporary place to evaluate the PV templates + command: mktemp -d /tmp/openshift-ansible-XXXXXXX + register: r_openshift_management_mktemp + changed_when: false + + tasks: + - name: Run the CFME Setup Role + include_role: + name: openshift_management + vars: + template_dir: "{{ hostvars[groups.masters.0].r_openshift_management_mktemp.stdout }}" diff --git a/playbooks/common/openshift-management/filter_plugins b/playbooks/common/openshift-management/filter_plugins new file mode 120000 index 000000000..99a95e4ca --- /dev/null +++ b/playbooks/common/openshift-management/filter_plugins @@ -0,0 +1 @@ +../../../filter_plugins \ No newline at end of file diff --git a/playbooks/common/openshift-management/library b/playbooks/common/openshift-management/library new file mode 120000 index 000000000..ba40d2f56 --- /dev/null +++ b/playbooks/common/openshift-management/library @@ -0,0 +1 @@ +../../../library \ No newline at end of file diff --git a/playbooks/common/openshift-management/roles b/playbooks/common/openshift-management/roles new file mode 120000 index 000000000..20c4c58cf --- /dev/null +++ b/playbooks/common/openshift-management/roles @@ -0,0 +1 @@ +../../../roles \ No newline at end of file diff --git a/playbooks/common/openshift-management/uninstall.yml b/playbooks/common/openshift-management/uninstall.yml new file mode 100644 index 000000000..698d93405 --- /dev/null +++ b/playbooks/common/openshift-management/uninstall.yml @@ -0,0 +1,8 @@ +--- +- name: Uninstall CFME + hosts: masters + tasks: + - name: Run the CFME Uninstall Role Tasks + include_role: + name: openshift_management + tasks_from: uninstall -- cgit v1.2.1