Streamlined networking, OpenShift recovery, Ganesha

5 files changed, 47 insertions, 28 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 }}"
diff --git a/group_vars/ands.yml b/group_vars/ands.yml
index d9639f3..d81f11e 100644
--- a/group_vars/ands.yml
+++ b/group_vars/ands.yml
@@ -1,10 +1,11 @@
-# This should be here, the variables from the role are not propogated to hostvars
+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_configure_heketi: false
+
 
 ands_repo_url: http://ufo.kit.edu/ands/repos
 ands_repositories:
- - name: ands-updates 
-   url: "{{ ands_repo_url }}/centos74/"
+  - name: ands-updates 
+    url: "{{ ands_repo_url }}/centos74/"
diff --git a/group_vars/staging.yml b/group_vars/staging.yml
index b35440a..34bf7c7 100644
--- a/group_vars/staging.yml
+++ b/group_vars/staging.yml
@@ -1,6 +1,7 @@
 ands_storage_network: 192.168.212.0/24
 
-ands_cluster_domain: ipe.kit.edu
+#ands_cluster_domain: ipe.kit.edu
+ands_hostname_template: ipeshift
 #ands_openshift_lb: openshift.ipe.kit.edu
 #ands_openshift_subdomain: openshift.ipe.kit.edu
 ands_openshift_lb: openshift.suren.me
@@ -9,17 +10,22 @@ 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
 
-ands_ipfailover_interface: eth1
-ands_ipfailover_vips: [141.52.64.28/24]
+ands_inner_domain: ""
+#ands_inner_lb: true
+#ands_openshift_set_hostname: false
+
+ands_inner_lb: false
+ands_openshift_set_hostname: true
+
+
+#ands_ipfailover_interface: eth1
+ands_ipfailover_vips: [141.52.64.28/23]
 
 katrin_openvpn_subnet_bits: 24
 katrin_openvpn_subnet_offset: 221
 katrin_openvpn_network: "192.168.0.0/16"
 
-vagrant_hostname_template: ipeshift
-vagrant_cpu_cores: 4
-vagrant_mem_size: 16
-vagrant_disk_size: 240
-
-#ands_provision_without_dns: true
 ands_prefer_docker: true
+
+
+
diff --git a/group_vars/testing.yml b/group_vars/testing.yml
index f0e4770..72b2dba 100644
--- a/group_vars/testing.yml
+++ b/group_vars/testing.yml
@@ -9,14 +9,14 @@ 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_ipfailover_interface: eth1
-ands_ipfailover_vips: [141.52.64.15/24, 141.52.64.17/24]
+ands_ipfailover_vips: [141.52.64.15/23, 141.52.64.17/23]
 
 katrin_openvpn_subnet_bits: 24
 katrin_openvpn_subnet_offset: 111 
 katrin_openvpn_network: "192.168.0.0/16"
 
-vagrant_hostname_template: ipekatrin
 
-#ands_provision_without_dns: true
 ands_prefer_docker: true
diff --git a/group_vars/vagrant.yml b/group_vars/vagrant.yml
new file mode 100644
index 0000000..49921a5
--- /dev/null
+++ b/group_vars/vagrant.yml
@@ -0,0 +1,4 @@
+vagrant_hostname_template: "{{ ands_hostname_template }}"
+vagrant_cpu_cores: 4
+vagrant_mem_size: 16
+vagrant_disk_size: 240