diff options
Diffstat (limited to 'group_vars')
| -rw-r--r-- | group_vars/OSEv3.yml | 65 | ||||
| -rw-r--r-- | group_vars/ands.yml | 7 | ||||
| -rw-r--r-- | group_vars/staging.yml | 6 | ||||
| -rw-r--r-- | group_vars/testing.yml | 15 | ||||
| -rw-r--r-- | group_vars/virtual.yml | 6 |
5 files changed, 65 insertions, 34 deletions
diff --git a/group_vars/OSEv3.yml b/group_vars/OSEv3.yml index d896677..20bfece 100644 --- a/group_vars/OSEv3.yml +++ b/group_vars/OSEv3.yml @@ -1,14 +1,8 @@ ### Deployment Type openshift_deployment_type: origin openshift_master_cluster_method: "native" -#openshift_release: "v1.5" openshift_release: "v3.7.1" -#openshift_release: "v3.7" -#openshift_image_tag: "v1.5.0-rc.0" #openshift_image_tag: "v3.7.1" -#openshift_pkg_version=-3.7.0 -#openshift_hosted_metrics_deployer_version: "v1.5.0-rc.0" -#openshift_hosted_metrics_deployer_version: "v3.7.1" #containerized: true containerized: false @@ -18,9 +12,32 @@ os_firewall_use_firewalld: true #enable_excluders: false #enable_docker_excluder: false +### Versions +#system packages +#etcd_version="3.1.0" +#docker_version="1.12.1" + +#for some package only latest is available +#openshift_pkg_version=-3.7.0 +#openshift_cockpit_deployer_version=latest +#openshift_metrics_image_prefix=docker.io/openshift/origin- +#openshift_metrics_image_version=v3.7 +#openshift_logging_image_prefix=docker.io/openshift/origin- +#openshift_logging_image_version=v3.7.0 +#openshift_service_catalog_image_prefix=docker.io/openshift/origin- +#openshift_service_catalog_image_version=v3.7.1 +#template_service_broker_version='v3.7' +#ansible_service_broker_image_prefix: ansibleplaybookbundle/ +#ansible_service_broker_registry_url: "registry.access.redhat.com" +ansible_service_broker_etcd_image_tag: v3.2 + +#test +#openshift_enable_service_catalog: false + + ### Network & DNS configuration -openshift_master_cluster_hostname: "{{ ands_openshift_cluster_fqdn }}" +openshift_master_cluster_hostname: "{{ ands_use_inner_lb | ternary(ands_inner_lb_fqdn, ands_openshift_lb) }}" openshift_master_cluster_public_hostname: "{{ ands_openshift_lb }}" openshift_master_default_subdomain: "{{ ands_openshift_subdomain | default(ands_openshift_lb) }}" openshift_master_ingress_ip_network_cidr: "{{ ands_openshift_ingress_network }}" @@ -30,8 +47,8 @@ openshift_master_ingress_ip_network_cidr: "{{ ands_openshift_ingress_network }}" # we may need to put conditionals here (except _ip). Currently values set to '' if undifined (OpenShift uses None which is equivalent in ansible) openshift_ip: "{{ ands_openshift_ip }}" openshift_public_ip: "{{ ands_openshift_public_ip }}" -openshift_hostname: "{{ ands_openshift_fqdn }}" -openshift_public_hostname: "{{ ands_openshift_public_fqdn }}" +openshift_hostname: "{{ ands_openshift_set_hostname | ternary(ands_openshift_fqdn, ands_none) }}" +openshift_public_hostname: "{{ ands_openshift_set_public_hostname | ternary(ands_openshift_public_fqdn, ands_none) }}" #Check configuration to fight dynamic IPs @@ -68,10 +85,35 @@ openshift_docker_log_options: [ max-size=2m, max-file=3 ] openshift_docker_options: --log-driver json-file #openshift_docker_options: --log-opt max-size=2m --log-opt max-file=3 +### Registry +openshift_hosted_registry_storage_kind: glusterfs +openshift_hosted_registry_storage_class: glusterfs-storage +openshift_hosted_registry_storage_volume_size: "{{ ands_registry_volume_size }}" + +# By default dynamic provisioning is not used. The 'openshift_persistent_volumes' role creates pvc/pv pair if the following +# variables set. The volumes are called 'registry-claim' and 'registry-volume'. The 'openshift_storage_glusterfs' creates +# the corresponding volume using heketi (this can't be disabled, so we patched to skip if openshift_hosted_registry_storage_class set). +# Finally, 'openshift_hosted' role creates the corresponding endpoints (this only happens if ..._ips are set). +# Alternative is triggered if 'openshift_hosted_registry_storage_glusterfs_swap' is set. The 'openshift_persistent_volumes' creates +# registry-glusterfs-claim/registry-volume pair. 'openshift_hosted' role, then, tries first to copy data from the current volume, but +# this path is pretty much broken. +# I have introduced 'openshift_hosted_registry_storage_class' and blocked if it set creatin of above-said components which are not +# possible to disable with variable bellow. Furthermore, I added a simple 'pvc' based on dynamic provisioning to 'openshift_persistent_volumes'. +openshift_hosted_registry_storage_create_pv: false +openshift_hosted_registry_storage_create_pvc: false + +# This is an alternative to go standard way. All above should be commented, then. +# volume size should be given as plain number (without G) if we go without 'sc'. +#openshift_hosted_registry_storage_glusterfs_path: openshift_registry +#openshift_hosted_registry_storage_glusterfs_ips: "{{ openshift_storage_nodes }}" + ### Dynamic Storage openshift_storage_glusterfs_image: chsa/gluster-centos openshift_storage_glusterfs_version: "{{ glusterfs_version }}" - +#Either 5 or 6 corresponds to latest +#openshift_storage_glusterfs_heketi_version: 6 +#Only latest +#openshift_storage_glusterfs_block_version: latest #openshift_storage_glusterfs_version: '3.12.5' # Latest 3.10.1 #openshift_storage_glusterfs_is_native: True @@ -113,6 +155,3 @@ openshift_install_examples: true # Required for IPFailover openshift_clock_enabled: true - -#This is required by OpenShift upgrade (may be something else) -g_ssh_user: "{{ ansible_ssh_user }}" diff --git a/group_vars/ands.yml b/group_vars/ands.yml index d81f11e..faacc40 100644 --- a/group_vars/ands.yml +++ b/group_vars/ands.yml @@ -1,10 +1,3 @@ -ands_configure_heketi: false - -# This should be here, the variables from the role are not propogated to hostvars -#ands_master_id: "{{ ('masters' in group_names) | ternary(groups.masters.index(('masters' in group_names) | ternary(inventory_hostname, groups.masters[0])), -1) }}" -ands_storage_hostname: "{{ ands_storage_network | default(false) | ternary(ands_storage_network | default('') | ipaddr(ands_host_id) | ipaddr('address'), ansible_fqdn) }}" - - ands_repo_url: http://ufo.kit.edu/ands/repos ands_repositories: - name: ands-updates diff --git a/group_vars/staging.yml b/group_vars/staging.yml index 34bf7c7..00ec146 100644 --- a/group_vars/staging.yml +++ b/group_vars/staging.yml @@ -11,13 +11,9 @@ ands_openshift_public_network: 192.168.226.0/24 ands_openshift_ingress_network: 192.168.216.0/24 ands_inner_domain: "" -#ands_inner_lb: true -#ands_openshift_set_hostname: false - -ands_inner_lb: false +ands_use_inner_lb: true ands_openshift_set_hostname: true - #ands_ipfailover_interface: eth1 ands_ipfailover_vips: [141.52.64.28/23] diff --git a/group_vars/testing.yml b/group_vars/testing.yml index 72b2dba..f7e04cf 100644 --- a/group_vars/testing.yml +++ b/group_vars/testing.yml @@ -1,17 +1,20 @@ ands_storage_network: 192.168.12.0/24 ands_cluster_domain: ipe.kit.edu -ands_openshift_lb: katrin.suren.me -#ands_openshift_subdomain: katrin.suren.me -ands_openshift_subdomain: apps.suren.me -#ands_openshift_network: 192.168.26.0/24 +ands_hostname_template: ipekatrin +ands_openshift_lb: kaas.kit.edu +ands_openshift_subdomain: kaas.kit.edu ands_openshift_network: 192.168.13.0/24 ands_openshift_public_network: 192.168.26.0/24 ands_openshift_ingress_network: 192.168.16.0/24 -ands_hostname_template: ipekatrin +#ands_inner_domain: "" +ands_openshift_set_hostname: false +# if we provision inner_lb (default), we can turn it on and just re-run ands_network role (or maintain play) +ands_use_inner_lb: false + -ands_ipfailover_interface: eth1 +#ands_ipfailover_interface: eth1 ands_ipfailover_vips: [141.52.64.15/23, 141.52.64.17/23] katrin_openvpn_subnet_bits: 24 diff --git a/group_vars/virtual.yml b/group_vars/virtual.yml index f76bafc..7a61a55 100644 --- a/group_vars/virtual.yml +++ b/group_vars/virtual.yml @@ -1,10 +1,10 @@ glusterfs_transport: tcp ands_data_device: "/dev/sdb" -ands_data_volume_size: "20G" -ands_heketi_volume_size: "20G" +ands_data_volume_size: "15G" +ands_heketi_volume_size: "25G" +ands_registry_volume_size: "5G" docker_storage_device: "/dev/sdb" docker_storage_vg: "ands" -ands_host_id: "{{ ansible_hostname | regex_replace('^[\\w\\d]*\\w(\\d+)(\\.|$)', '\\1') }}" |