summaryrefslogtreecommitdiffstats
path: root/playbooks
diff options
context:
space:
mode:
authorTim Bielawa <tbielawa@redhat.com>2017-10-05 15:42:18 -0400
committerTim Bielawa <tbielawa@redhat.com>2017-10-06 11:45:17 -0400
commitc0f63fb902b53bc592e6862d5876af9b244ee82b (patch)
tree85ab3b45eab2ebcf3c56c8236ebb829b0a562065 /playbooks
parente7e82bede0f7ebac08a4290a3f088cca0ea3ab78 (diff)
downloadopenshift-c0f63fb902b53bc592e6862d5876af9b244ee82b.tar.gz
openshift-c0f63fb902b53bc592e6862d5876af9b244ee82b.tar.bz2
openshift-c0f63fb902b53bc592e6862d5876af9b244ee82b.tar.xz
openshift-c0f63fb902b53bc592e6862d5876af9b244ee82b.zip
Rename openshift_cfme role to openshift_management
Diffstat (limited to 'playbooks')
-rw-r--r--playbooks/byo/openshift-management/config.yml (renamed from playbooks/byo/openshift-cfme/config.yml)2
-rw-r--r--playbooks/byo/openshift-management/uninstall.yml (renamed from playbooks/byo/openshift-cfme/uninstall.yml)2
-rw-r--r--playbooks/common/openshift-cluster/config.yml4
-rw-r--r--playbooks/common/openshift-cluster/openshift_cfme.yml25
-rw-r--r--playbooks/common/openshift-cluster/openshift_management.yml25
-rw-r--r--playbooks/common/openshift-management/config.yml (renamed from playbooks/common/openshift-cfme/config.yml)6
l---------playbooks/common/openshift-management/filter_plugins (renamed from playbooks/common/openshift-cfme/filter_plugins)0
l---------playbooks/common/openshift-management/library (renamed from playbooks/common/openshift-cfme/library)0
l---------playbooks/common/openshift-management/roles (renamed from playbooks/common/openshift-cfme/roles)0
-rw-r--r--playbooks/common/openshift-management/uninstall.yml (renamed from playbooks/common/openshift-cfme/uninstall.yml)2
10 files changed, 33 insertions, 33 deletions
diff --git a/playbooks/byo/openshift-cfme/config.yml b/playbooks/byo/openshift-management/config.yml
index 0e8e7a94d..33a555cc1 100644
--- a/playbooks/byo/openshift-cfme/config.yml
+++ b/playbooks/byo/openshift-management/config.yml
@@ -5,4 +5,4 @@
- include: ../../common/openshift-cluster/evaluate_groups.yml
-- include: ../../common/openshift-cfme/config.yml
+- include: ../../common/openshift-management/config.yml
diff --git a/playbooks/byo/openshift-cfme/uninstall.yml b/playbooks/byo/openshift-management/uninstall.yml
index c8ed16859..ebd6fb261 100644
--- a/playbooks/byo/openshift-cfme/uninstall.yml
+++ b/playbooks/byo/openshift-management/uninstall.yml
@@ -3,4 +3,4 @@
# tags:
# - always
-- include: ../../common/openshift-cfme/uninstall.yml
+- include: ../../common/openshift-management/uninstall.yml
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-cfme/config.yml b/playbooks/common/openshift-management/config.yml
index 08df4a57e..0aaafe440 100644
--- a/playbooks/common/openshift-cfme/config.yml
+++ b/playbooks/common/openshift-management/config.yml
@@ -4,12 +4,12 @@
pre_tasks:
- name: Create a temporary place to evaluate the PV templates
command: mktemp -d /tmp/openshift-ansible-XXXXXXX
- register: r_openshift_cfme_mktemp
+ register: r_openshift_management_mktemp
changed_when: false
tasks:
- name: Run the CFME Setup Role
include_role:
- name: openshift_cfme
+ name: openshift_management
vars:
- template_dir: "{{ hostvars[groups.masters.0].r_openshift_cfme_mktemp.stdout }}"
+ template_dir: "{{ hostvars[groups.masters.0].r_openshift_management_mktemp.stdout }}"
diff --git a/playbooks/common/openshift-cfme/filter_plugins b/playbooks/common/openshift-management/filter_plugins
index 99a95e4ca..99a95e4ca 120000
--- a/playbooks/common/openshift-cfme/filter_plugins
+++ b/playbooks/common/openshift-management/filter_plugins
diff --git a/playbooks/common/openshift-cfme/library b/playbooks/common/openshift-management/library
index ba40d2f56..ba40d2f56 120000
--- a/playbooks/common/openshift-cfme/library
+++ b/playbooks/common/openshift-management/library
diff --git a/playbooks/common/openshift-cfme/roles b/playbooks/common/openshift-management/roles
index 20c4c58cf..20c4c58cf 120000
--- a/playbooks/common/openshift-cfme/roles
+++ b/playbooks/common/openshift-management/roles
diff --git a/playbooks/common/openshift-cfme/uninstall.yml b/playbooks/common/openshift-management/uninstall.yml
index 78b8e7668..698d93405 100644
--- a/playbooks/common/openshift-cfme/uninstall.yml
+++ b/playbooks/common/openshift-management/uninstall.yml
@@ -4,5 +4,5 @@
tasks:
- name: Run the CFME Uninstall Role Tasks
include_role:
- name: openshift_cfme
+ name: openshift_management
tasks_from: uninstall