summaryrefslogtreecommitdiffstats
path: root/group_vars/OSEv3.yml
diff options
context:
space:
mode:
authorSuren A. Chilingaryan <csa@suren.me>2018-03-07 07:03:57 +0100
committerSuren A. Chilingaryan <csa@suren.me>2018-03-07 07:03:57 +0100
commit6bc3a3ac71e11fb6459df715536fec373c123a97 (patch)
treec99a4507012fd853ffa2622e35fa26f3bd3804e3 /group_vars/OSEv3.yml
parent69adb23c59e991ddcabf5cfce415fd8b638dbc1a (diff)
downloadands-6bc3a3ac71e11fb6459df715536fec373c123a97.tar.gz
ands-6bc3a3ac71e11fb6459df715536fec373c123a97.tar.bz2
ands-6bc3a3ac71e11fb6459df715536fec373c123a97.tar.xz
ands-6bc3a3ac71e11fb6459df715536fec373c123a97.zip
Streamlined networking, OpenShift recovery, Ganesha
Diffstat (limited to 'group_vars/OSEv3.yml')
-rw-r--r--group_vars/OSEv3.yml32
1 files changed, 20 insertions, 12 deletions
diff --git a/group_vars/OSEv3.yml b/group_vars/OSEv3.yml
index 537e5d7..d896677 100644
--- a/group_vars/OSEv3.yml
+++ b/group_vars/OSEv3.yml
@@ -1,5 +1,6 @@
### Deployment Type
-deployment_type: "origin"
+openshift_deployment_type: origin
+openshift_master_cluster_method: "native"
#openshift_release: "v1.5"
openshift_release: "v3.7.1"
#openshift_release: "v3.7"
@@ -11,7 +12,6 @@ openshift_release: "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
@@ -20,23 +20,24 @@ os_firewall_use_firewalld: true
### Network & DNS configuration
-openshift_master_cluster_hostname: "{{ ands_openshift_lb }}"
+openshift_master_cluster_hostname: "{{ ands_openshift_cluster_fqdn }}"
openshift_master_cluster_public_hostname: "{{ ands_openshift_lb }}"
-openshift_master_default_subdomain: "{{ ands_openshift_subdomain }}"
+openshift_master_default_subdomain: "{{ ands_openshift_subdomain | default(ands_openshift_lb) }}"
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') }}"
+# 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 }}"
+
#Check configuration to fight dynamic IPs
-openshift_dns_ip: "{{ ands_ipfailover_vips[0] | ipaddr('address') }}"
-openshift_set_hostname: true
+# We have per node DNS, so it is not necessary to use vips here.
+# This overrides default in roles/openshift_node/defaults which sets dns_ip to: ansible_default_ipv4['address']
+openshift_dns_ip: "{{ openshift_ip }}"
openshift_set_node_ip: true
### Node configuration
@@ -60,6 +61,13 @@ openshift_node_cert_expire_days: 3650
openshift_master_cert_expire_days: 3650
etcd_ca_default_days: 3650
+### Docker
+# log_driver is currently ignored for some reason
+openshift_docker_log_driver: "json-file"
+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
+
### Dynamic Storage
openshift_storage_glusterfs_image: chsa/gluster-centos
openshift_storage_glusterfs_version: "{{ glusterfs_version }}"