diff options
Diffstat (limited to 'group_vars')
| -rw-r--r-- | group_vars/OSEv3.yml | 121 | ||||
| -rw-r--r-- | group_vars/all.yml | 3 | ||||
| -rw-r--r-- | group_vars/ands.yml | 2 | ||||
| -rw-r--r-- | group_vars/glusterfs.yml | 6 | ||||
| -rw-r--r-- | group_vars/staging.yml | 4 | ||||
| -rw-r--r-- | group_vars/testing.yml | 4 |
6 files changed, 97 insertions, 43 deletions
diff --git a/group_vars/OSEv3.yml b/group_vars/OSEv3.yml index 2f7fdc1..6a23094 100644 --- a/group_vars/OSEv3.yml +++ b/group_vars/OSEv3.yml @@ -1,59 +1,106 @@ ### Deployment Type deployment_type: "origin" -#openshift_release: "v1.4" -#openshift_image_tag: "v1.4.1" -openshift_release: "v1.5" -#openshift_image_tag: "v1.5.0" -openshift_image_tag: "v1.5.0-rc.0" -openshift_hosted_metrics_deployer_version: "v1.5.0-rc.0" - -containerized: true +#openshift_release: "v1.5" +openshift_release: "v3.7" +#openshift_image_tag: "v1.5.0-rc.0" +openshift_image_tag: "v3.7.1" +#openshift_hosted_metrics_deployer_version: "v1.5.0-rc.0" +#openshift_hosted_metrics_deployer_version: "v3.7.1" + +#containerized: true +containerized: false openshift_master_cluster_method: "native" os_firewall_use_firewalld: true +#Recommended to avoid: No package matching 'origin-docker-excluder-1.5.0*' found available +#enable_excluders: false +#enable_docker_excluder: false + + +### Network & DNS configuration +openshift_master_cluster_hostname: "{{ ands_openshift_lb }}" +#openshift_master_cluster_public_hostname: "{{ ands_openshift_lb }}" +openshift_master_default_subdomain: "{{ ands_openshift_subdomain }}" +openshift_master_ingress_ip_network_cidr: "{{ ands_openshift_ingress_network }}" +#openshift_portal_net: +#osm_host_subnet_length: + +openshift_ip: "{{ ands_openshift_network | ipaddr(ands_host_id) | ipaddr('address') }}" +openshift_public_ip: "{{ ands_openshift_public_network | ipaddr(ands_host_id) | ipaddr('address') }}" +openshift_hostname: "{{ ansible_hostname }}" +openshift_public_hostname: "{{ ansible_hostname }}.{{ ands_cluster_domain }}" +#openshift_hostname: "{{ ands_openshift_network | ipaddr(ands_host_id) | ipaddr('address') }}" +#openshift_public_hostname: "{{ ands_openshift_public_network | ipaddr(ands_host_id) | ipaddr('address') }}" + #Check configuration to fight dynamic IPs openshift_dns_ip: "{{ ands_ipfailover_vips[0] | ipaddr('address') }}" openshift_set_hostname: true openshift_set_node_ip: true -#Recommended to avoid: No package matching 'origin-docker-excluder-1.5.0*' found available -enable_excluders: false -enable_docker_excluder: false - -### Configuration -osm_use_cockpit: true -osm_cockpit_plugins: ['cockpit-kubernetes'] -osn_storage_plugin_deps: ['ceph', 'glusterfs'] -openshift_hosted_metrics_deploy: true -ppenshift_hosted_metrics_storage_kind: dynamic -#openshift_use_manageiq: true -openshift_install_examples: true - -# Required for IPFailover -openshift_clock_enabled: true +### Node configuration +openshift_schedulable: true +openshift_node_labels: "{{ ands_openshift_labels }}" +#openshift_hosted_infra_selector: "region=infra" # Fine tunning openshift_master_pod_eviction_timeout: 30s + ### Authentication openshift_master_identity_providers: [{'name': 'htpasswd_auth', 'login': 'true', 'challenge': 'true', 'kind': 'HTPasswdPasswordIdentityProvider', 'filename': '/etc/origin/master/htpasswd'}] openshift_master_htpasswd_users: {'pdv': '$apr1$ACvj6uUa$Nm1Vq8hZq3RzTtaYpAHv01', 'csa': '$apr1$IqEwdnzy$UAdd8ZSFnXommBbj29w3c0'} -# Network & DNS configuration -openshift_master_cluster_hostname: "{{ ands_openshift_lb }}" -#openshift_master_cluster_public_hostname: "{{ ands_openshift_lb }}" -openshift_master_default_subdomain: "{{ ands_openshift_subdomain }}" -openshift_master_ingress_ip_network_cidr: "{{ ands_openshift_ingress_network }}" -# Node configuration -openshift_schedulable: true +### Certificates & Security +openshift_ca_cert_expire_days: 3650 +openshift_hosted_registry_cert_expire_days: 3650 +openshift_node_cert_expire_days: 3650 +openshift_master_cert_expire_days: 3650 +etcd_ca_default_days: 3650 -openshift_ip: "{{ ands_openshift_network | ipaddr(ands_host_id) | ipaddr('address') }}" -openshift_hostname: "{{ ansible_hostname }}" -openshift_public_hostname: "{{ ansible_hostname }}.{{ ands_cluster_domain }}" +### Dynamic Storage +openshift_storage_glusterfs_image: chsa/gluster-centos +openshift_storage_glusterfs_version: "{{ glusterfs_version }}" -#openshift_public_ip: "{{ ands_openshift_network | ipaddr(ands_host_id) | ipaddr('address') }}" -#openshift_hostname: "{{ ands_openshift_network | ipaddr(ands_host_id) | ipaddr('address') }}" -#openshift_public_hostname: "{{ ands_openshift_public_network | ipaddr(ands_host_id) | ipaddr('address') }}" -openshift_node_labels: "{{ ands_openshift_labels }}" +#openshift_storage_glusterfs_version: '3.12.5' # Latest 3.10.1 +#openshift_storage_glusterfs_is_native: True + +#openshift_storage_glusterfs_is_native: False +#openshift_storage_glusterfs_is_missing: False +#openshift_storage_glusterfs_heketi_is_native: True + +#openshift_storage_glusterfs_heketi_url: +#openshift_storage_glusterfs_heketi_is_missing: False +#openshift_storage_glusterfs_heketi_executor: 'ssh' +#openshift_storage_glusterfs_heketi_ssh_port: 22 +#openshift_storage_glusterfs_heketi_ssh_user: 'root' +#openshift_storage_glusterfs_heketi_ssh_keyfile: "{{ omit }}" + +### Modules & Configuration +openshift_master_dynamic_provisioning_enabled: true +#openshift_metrics_install_metrics: false +openshift_metrics_install_metrics: true +openshift_metrics_storage_kind: dynamic +openshift_metrics_cassanda_pvc_storage_class_name: glusterfs-storage +#openshift_metrics_storage_volume_size: +#openshift_metrics_hawkular_hostname: https://hawkular-metrics.{{openshift_master_default_subdomain}}/hawkular/metrics + +#Problematic and resource intensive +#openshift_logging_install_logging: true +#openshift_logging_storage_kind: dynamic +#openshift_logging_es_pvc_storage_class_name: glusterfs-storage # Does not work +#openshift_logging_es_pvc_size: 1Gi +#openshift_master_logging_public_url: + +#Catalog services +#openshift_enable_service_catalog: false +#ansible_service_broker_install: false +#openshift_hosted_etcd_storage_kind +#openshift_hosted_etcd_storage_volume_size + +openshift_install_examples: true + +# Required for IPFailover +openshift_clock_enabled: true + diff --git a/group_vars/all.yml b/group_vars/all.yml index f29206f..aef2251 100644 --- a/group_vars/all.yml +++ b/group_vars/all.yml @@ -1,3 +1,4 @@ ansible_ssh_user: root -glusterfs_version: 39 +ansible_ssh_private_key_file: /home/csa/.ssh/id_dsa +glusterfs_version: 312 diff --git a/group_vars/ands.yml b/group_vars/ands.yml index 58570c6..d3121c1 100644 --- a/group_vars/ands.yml +++ b/group_vars/ands.yml @@ -2,4 +2,4 @@ #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_configure_heketi: false diff --git a/group_vars/glusterfs.yml b/group_vars/glusterfs.yml new file mode 100644 index 0000000..0593d31 --- /dev/null +++ b/group_vars/glusterfs.yml @@ -0,0 +1,6 @@ +# This should be here, the variables from the role are not propogated to hostvars + +glusterfs_ip: "{{ ands_storage_network | default(false) | ternary(ands_storage_network | default('') | ipaddr(ands_host_id) | ipaddr('address'), openshift_ip) }}" +#glusterfs_devices: "[ {{ ands_heketi_dev }} ]" + +glusterfs_devices: [ "/dev/mapper/ands-ands_heketi" ] diff --git a/group_vars/staging.yml b/group_vars/staging.yml index 72683ff..b35440a 100644 --- a/group_vars/staging.yml +++ b/group_vars/staging.yml @@ -5,7 +5,7 @@ ands_cluster_domain: ipe.kit.edu #ands_openshift_subdomain: openshift.ipe.kit.edu ands_openshift_lb: openshift.suren.me ands_openshift_subdomain: openshift.suren.me -ands_openshift_network: 192.168.212.0/24 +ands_openshift_network: 192.168.213.0/24 ands_openshift_public_network: 192.168.226.0/24 ands_openshift_ingress_network: 192.168.216.0/24 @@ -21,7 +21,5 @@ vagrant_cpu_cores: 4 vagrant_mem_size: 16 vagrant_disk_size: 240 - -#ands_disable_dynamic_provisioning: true #ands_provision_without_dns: true ands_prefer_docker: true diff --git a/group_vars/testing.yml b/group_vars/testing.yml index ac7ee89..f0e4770 100644 --- a/group_vars/testing.yml +++ b/group_vars/testing.yml @@ -5,7 +5,7 @@ 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_openshift_network: 192.168.12.0/24 +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 @@ -18,3 +18,5 @@ katrin_openvpn_network: "192.168.0.0/16" vagrant_hostname_template: ipekatrin +#ands_provision_without_dns: true +ands_prefer_docker: true |