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 /roles/openshift_management/files | |
| 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 'roles/openshift_management/files')
| -rw-r--r-- | roles/openshift_management/files/examples/container_providers.yml | 22 |
1 files changed, 22 insertions, 0 deletions
diff --git a/roles/openshift_management/files/examples/container_providers.yml b/roles/openshift_management/files/examples/container_providers.yml new file mode 100644 index 000000000..661f62e4d --- /dev/null +++ b/roles/openshift_management/files/examples/container_providers.yml @@ -0,0 +1,22 @@ +--- +container_providers: + - connection_configurations: + - authentication: {auth_key: "management-admin-token-here", authtype: bearer, type: AuthToken} + endpoint: {role: default, security_protocol: ssl-without-validation, verify_ssl: 0} + hostname: "OCP/Origin cluster hostname (providing API access)" + name: openshift-management + port: 8443 + type: "ManageIQ::Providers::Openshift::ContainerManager" +# Copy and update for as many OCP or Origin providers as you want to +# add to your management service + # - connection_configurations: + # - authentication: {auth_key: "management-admin-token-here", authtype: bearer, type: AuthToken} + # endpoint: {role: default, security_protocol: ssl-without-validation, verify_ssl: 0} + # hostname: "OCP/Origin cluster hostname (providing API access)" + # name: openshift-management + # port: 8443 + # type: "ManageIQ::Providers::Openshift::ContainerManager" +management_server: + hostname: "Management server hostname (providing API access)" + user: admin + password: smartvm |