diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2017-10-26 10:26:52 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-10-26 10:26:52 -0700 |
| commit | 6d3f9ab2473fb6f69974fd770bc9ae3fb4952b98 (patch) | |
| tree | df8e007ef91cfe951ed241df0e74ed3ff70cb659 /playbooks/common | |
| parent | 34f6e3e2543ab961bcded8cbc7e531a7bbf5b02c (diff) | |
| parent | ac62ea0066934877f94e99bda6ec53a9c03ababb (diff) | |
| download | openshift-6d3f9ab2473fb6f69974fd770bc9ae3fb4952b98.tar.gz openshift-6d3f9ab2473fb6f69974fd770bc9ae3fb4952b98.tar.bz2 openshift-6d3f9ab2473fb6f69974fd770bc9ae3fb4952b98.tar.xz openshift-6d3f9ab2473fb6f69974fd770bc9ae3fb4952b98.zip | |
Merge pull request #5793 from tbielawa/openshift_management_module
Automatic merge from submit-queue.
Openshift MGMT Fixes and Container Provider Integration
Various small fixes/polishing to the openshift management role.
* Updated uninstall script
* Automatically add cluster to new management deployment
* Scaffolding for scripts to add *N* number of OCP/Origin clusters as Container Providers in any arbitrary MIQ/CFME instance
* Fix mis-named task in `openshift_nfs/create_export`
* Uninstall playbook only runs on one master
Diffstat (limited to 'playbooks/common')
| -rw-r--r-- | playbooks/common/openshift-management/add_container_provider.yml | 8 | ||||
| -rw-r--r-- | playbooks/common/openshift-management/uninstall.yml | 2 |
2 files changed, 9 insertions, 1 deletions
diff --git a/playbooks/common/openshift-management/add_container_provider.yml b/playbooks/common/openshift-management/add_container_provider.yml new file mode 100644 index 000000000..facb3a5b9 --- /dev/null +++ b/playbooks/common/openshift-management/add_container_provider.yml @@ -0,0 +1,8 @@ +--- +- name: Add Container Provider to Management + hosts: oo_first_master + tasks: + - name: Run the Management Integration Tasks + include_role: + name: openshift_management + tasks_from: add_container_provider diff --git a/playbooks/common/openshift-management/uninstall.yml b/playbooks/common/openshift-management/uninstall.yml index 698d93405..9f35cc276 100644 --- a/playbooks/common/openshift-management/uninstall.yml +++ b/playbooks/common/openshift-management/uninstall.yml @@ -1,6 +1,6 @@ --- - name: Uninstall CFME - hosts: masters + hosts: masters[0] tasks: - name: Run the CFME Uninstall Role Tasks include_role: |