diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2017-12-08 15:49:41 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-12-08 15:49:41 -0800 |
| commit | 54fe1e38764332634181cc7bdc0d0e7692304f91 (patch) | |
| tree | adae4f2b0e6bf75a63175a2371470789c22f0df0 /roles/openshift_management | |
| parent | c0f7152a51c6306340f9634f191e81d4322d1b52 (diff) | |
| parent | 2bf65cdab4aa88f160d005d3b7649b22a6dceba8 (diff) | |
| download | openshift-54fe1e38764332634181cc7bdc0d0e7692304f91.tar.gz openshift-54fe1e38764332634181cc7bdc0d0e7692304f91.tar.bz2 openshift-54fe1e38764332634181cc7bdc0d0e7692304f91.tar.xz openshift-54fe1e38764332634181cc7bdc0d0e7692304f91.zip | |
Merge pull request #6399 from mtnbikenc/cleanup-byo-refs
Automatic merge from submit-queue.
Cleanup byo references
* Remove playbooks/byo/config.yml, replaced by playbooks/deploy_cluster.yml
* Update example inventories
* Update doc references to 'byo' paths
Diffstat (limited to 'roles/openshift_management')
| -rw-r--r-- | roles/openshift_management/README.md | 10 | ||||
| -rw-r--r-- | roles/openshift_management/defaults/main.yml | 2 |
2 files changed, 6 insertions, 6 deletions
diff --git a/roles/openshift_management/README.md b/roles/openshift_management/README.md index 96de82669..974d9781a 100644 --- a/roles/openshift_management/README.md +++ b/roles/openshift_management/README.md @@ -164,14 +164,14 @@ away. If you want to install CFME/MIQ at the same time you install your OCP/Origin cluster, ensure that `openshift_management_install_management` is set to `true` in your inventory. Call the standard -`playbooks/byo/config.yml` playbook to begin the cluster and CFME/MIQ +`playbooks/deploy_cluster.yml` playbook to begin the cluster and CFME/MIQ installation. If you are installing CFME/MIQ on an *already provisioned cluster* then you can call the CFME/MIQ playbook directly: ``` -$ ansible-playbook -v -i <YOUR_INVENTORY> playbooks/byo/openshift-management/config.yml +$ ansible-playbook -v -i <YOUR_INVENTORY> playbooks/openshift-management/config.yml ``` *Note: Use `miq-template` in the following examples for ManageIQ installs* @@ -489,7 +489,7 @@ This playbook will: ``` -$ ansible-playbook -v -i <YOUR_INVENTORY> playbooks/byo/openshift-management/add_container_provider.yml +$ ansible-playbook -v -i <YOUR_INVENTORY> playbooks/openshift-management/add_container_provider.yml ``` ## Multiple Providers @@ -567,7 +567,7 @@ the config file path. ``` $ ansible-playbook -v -e container_providers_config=/tmp/cp.yml \ - playbooks/byo/openshift-management/add_many_container_providers.yml + playbooks/openshift-management/add_many_container_providers.yml ``` Afterwards you will find two new container providers in your @@ -579,7 +579,7 @@ to see an overview. This role includes a playbook to uninstall and erase the CFME/MIQ installation: -* `playbooks/byo/openshift-management/uninstall.yml` +* `playbooks/openshift-management/uninstall.yml` NFS export definitions and data stored on NFS exports are not automatically removed. You are urged to manually erase any data from diff --git a/roles/openshift_management/defaults/main.yml b/roles/openshift_management/defaults/main.yml index e768961ce..b5e234b7f 100644 --- a/roles/openshift_management/defaults/main.yml +++ b/roles/openshift_management/defaults/main.yml @@ -88,7 +88,7 @@ openshift_management_storage_nfs_local_hostname: false # name and password AND are trying to use integration scripts. # # For example, adding this cluster as a container provider, -# playbooks/byo/openshift-management/add_container_provider.yml +# playbooks/openshift-management/add_container_provider.yml openshift_management_username: admin openshift_management_password: smartvm |