From e98941e16d176749ace5181ae06c61bbe0cf6119 Mon Sep 17 00:00:00 2001 From: Tim Bielawa Date: Tue, 3 Oct 2017 16:17:15 -0400 Subject: Documentation * Update README * Add parameter docs to inventory examples * Remove unused graphic * Update defaults --- inventory/byo/hosts.origin.example | 65 ++++++++++++++++++++++++++++++++++++++ inventory/byo/hosts.ose.example | 65 ++++++++++++++++++++++++++++++++++++++ 2 files changed, 130 insertions(+) (limited to 'inventory') diff --git a/inventory/byo/hosts.origin.example b/inventory/byo/hosts.origin.example index c54d6bca7..29467816a 100644 --- a/inventory/byo/hosts.origin.example +++ b/inventory/byo/hosts.origin.example @@ -897,3 +897,68 @@ ose3-lb-ansible.test.example.com containerized=false [nodes] ose3-master[1:3]-ansible.test.example.com ose3-node[1:2]-ansible.test.example.com openshift_node_labels="{'region': 'primary', 'zone': 'default'}" +# CloudForms/ManageIQ (CFME/MIQ) Configuration + +# See the readme for full descriptions and getting started +# instructions: ../../roles/openshift_cfme/README.md or go directly to +# their definitions: ../../roles/openshift_cfme/defaults/main.yml +# ../../roles/openshift_cfme/vars/main.yml +# +# Namespace for the CFME project +#openshift_cfme_project: openshift-cfme + +# Namespace/project description +#openshift_cfme_project_description: CloudForms Management Engine + +# Choose 'miq-template' for a podified database install +# Choose 'miq-template-ext-db' for an external database install +# +# If you are using the miq-template-ext-db template then you must add +# the required database parameters to the +# openshift_cfme_template_parameters variable. +#openshift_cfme_app_template: miq-template + +# Allowed options: nfs, nfs_external, preconfigured, cloudprovider. +#openshift_cfme_storage_class: nfs + +# [OPTIONAL] - If you are using an EXTERNAL NFS server, such as a +# netapp appliance, then you must set the hostname here. Leave the +# value as 'false' if you are not using external NFS. +#openshift_cfme_storage_nfs_external_hostname: false + +# [OPTIONAL] - If you are using external NFS then you must set the base +# path to the exports location here. +# +# Additionally: EXTERNAL NFS REQUIRES that YOU CREATE the nfs exports +# that will back the application PV and optionally the database +# pv. Export path definitions, relative to +# {{ openshift_cfme_storage_nfs_base_dir }} +# +# LOCAL NFS NOTE: +# +# You may may also change this value if you want to change the default +# path used for local NFS exports. +#openshift_cfme_storage_nfs_base_dir: /exports + +# LOCAL NFS NOTE: +# +# You may override the automatically selected LOCAL NFS server by +# setting this variable. Useful for testing specific task files. +#openshift_cfme_storage_nfs_local_hostname: false + +# DEFAULT PV SIZES +# How large to make the MIQ application PV +#openshift_cfme_app_pv_size: 5Gi + +# How large to make the MIQ PostgreSQL PV +#openshift_cfme_db_pv_size: 15Gi + +# A hash of parameters you want to override or set in the +# miq-template.yaml or miq-template-ext-db.yaml templates. Set this in +# your inventory file as a simple hash. Acceptable values are defined +# under the .parameters list in files/miq-template{-ext-db}.yaml +# Example: +# +# openshift_cfme_template_parameters={'APPLICATION_MEM_REQ': '512Mi'} +#openshift_cfme_template_parameters: {} + diff --git a/inventory/byo/hosts.ose.example b/inventory/byo/hosts.ose.example index 7c637b3cb..ccba27177 100644 --- a/inventory/byo/hosts.ose.example +++ b/inventory/byo/hosts.ose.example @@ -900,3 +900,68 @@ ose3-lb-ansible.test.example.com containerized=false [nodes] ose3-master[1:3]-ansible.test.example.com ose3-node[1:2]-ansible.test.example.com openshift_node_labels="{'region': 'primary', 'zone': 'default'}" + +# CloudForms/ManageIQ (CFME/MIQ) Configuration + +# See the readme for full descriptions and getting started +# instructions: ../../roles/openshift_cfme/README.md or go directly to +# their definitions: ../../roles/openshift_cfme/defaults/main.yml +# ../../roles/openshift_cfme/vars/main.yml +# +# Namespace for the CFME project +#openshift_cfme_project: openshift-cfme + +# Namespace/project description +#openshift_cfme_project_description: CloudForms Management Engine + +# Choose 'miq-template' for a podified database install +# Choose 'miq-template-ext-db' for an external database install +# +# If you are using the miq-template-ext-db template then you must add +# the required database parameters to the +# openshift_cfme_template_parameters variable. +#openshift_cfme_app_template: miq-template + +# Allowed options: nfs, nfs_external, preconfigured, cloudprovider. +#openshift_cfme_storage_class: nfs + +# [OPTIONAL] - If you are using an EXTERNAL NFS server, such as a +# netapp appliance, then you must set the hostname here. Leave the +# value as 'false' if you are not using external NFS. +#openshift_cfme_storage_nfs_external_hostname: false + +# [OPTIONAL] - If you are using external NFS then you must set the base +# path to the exports location here. +# +# Additionally: EXTERNAL NFS REQUIRES that YOU CREATE the nfs exports +# that will back the application PV and optionally the database +# pv. Export path definitions, relative to +# {{ openshift_cfme_storage_nfs_base_dir }} +# +# LOCAL NFS NOTE: +# +# You may may also change this value if you want to change the default +# path used for local NFS exports. +#openshift_cfme_storage_nfs_base_dir: /exports + +# LOCAL NFS NOTE: +# +# You may override the automatically selected LOCAL NFS server by +# setting this variable. Useful for testing specific task files. +#openshift_cfme_storage_nfs_local_hostname: false + +# DEFAULT PV SIZES +# How large to make the MIQ application PV +#openshift_cfme_app_pv_size: 5Gi + +# How large to make the MIQ PostgreSQL PV +#openshift_cfme_db_pv_size: 15Gi + +# A hash of parameters you want to override or set in the +# miq-template.yaml or miq-template-ext-db.yaml templates. Set this in +# your inventory file as a simple hash. Acceptable values are defined +# under the .parameters list in files/miq-template{-ext-db}.yaml +# Example: +# +# openshift_cfme_template_parameters={'APPLICATION_MEM_REQ': '512Mi'} +#openshift_cfme_template_parameters: {} -- cgit v1.2.1 From 4df55b2a2722664b734974f524e0cf3eb235227f Mon Sep 17 00:00:00 2001 From: Tim Bielawa Date: Wed, 4 Oct 2017 10:55:18 -0400 Subject: Remove the no-longer-used App/DB pv size override variables from inventories --- inventory/byo/hosts.origin.example | 8 -------- inventory/byo/hosts.ose.example | 7 ------- 2 files changed, 15 deletions(-) (limited to 'inventory') diff --git a/inventory/byo/hosts.origin.example b/inventory/byo/hosts.origin.example index 29467816a..77e99b0eb 100644 --- a/inventory/byo/hosts.origin.example +++ b/inventory/byo/hosts.origin.example @@ -946,13 +946,6 @@ ose3-node[1:2]-ansible.test.example.com openshift_node_labels="{'region': 'prima # setting this variable. Useful for testing specific task files. #openshift_cfme_storage_nfs_local_hostname: false -# DEFAULT PV SIZES -# How large to make the MIQ application PV -#openshift_cfme_app_pv_size: 5Gi - -# How large to make the MIQ PostgreSQL PV -#openshift_cfme_db_pv_size: 15Gi - # A hash of parameters you want to override or set in the # miq-template.yaml or miq-template-ext-db.yaml templates. Set this in # your inventory file as a simple hash. Acceptable values are defined @@ -961,4 +954,3 @@ ose3-node[1:2]-ansible.test.example.com openshift_node_labels="{'region': 'prima # # openshift_cfme_template_parameters={'APPLICATION_MEM_REQ': '512Mi'} #openshift_cfme_template_parameters: {} - diff --git a/inventory/byo/hosts.ose.example b/inventory/byo/hosts.ose.example index ccba27177..94450bc3b 100644 --- a/inventory/byo/hosts.ose.example +++ b/inventory/byo/hosts.ose.example @@ -950,13 +950,6 @@ ose3-node[1:2]-ansible.test.example.com openshift_node_labels="{'region': 'prima # setting this variable. Useful for testing specific task files. #openshift_cfme_storage_nfs_local_hostname: false -# DEFAULT PV SIZES -# How large to make the MIQ application PV -#openshift_cfme_app_pv_size: 5Gi - -# How large to make the MIQ PostgreSQL PV -#openshift_cfme_db_pv_size: 15Gi - # A hash of parameters you want to override or set in the # miq-template.yaml or miq-template-ext-db.yaml templates. Set this in # your inventory file as a simple hash. Acceptable values are defined -- cgit v1.2.1