Add openshift-ansible as submodule

8 files changed, 19 insertions, 27 deletions

diff --git a/.gitmodules b/.gitmodules
new file mode 100644
index 0000000..2a57e55
--- /dev/null
+++ b/.gitmodules
@@ -0,0 +1,3 @@
+[submodule "anslib/openshift-ansible"]
+	path = anslib/openshift-ansible
+	url = https://github.com/openshift/openshift-ansible.git
diff --git a/anslib/openshift-ansible b/anslib/openshift-ansible
new file mode 160000
+Subproject f676f1cab3046fa9a288e2b8f79cda066da3e8e
diff --git a/group_vars/OSEv3.yml b/group_vars/OSEv3.yml
index 5e19b7d..12cf400 100644
--- a/group_vars/OSEv3.yml
+++ b/group_vars/OSEv3.yml
@@ -7,38 +7,29 @@ openshift_release: "v1.5"
 openshift_image_tag: "v1.5.0-rc.0"
 openshift_hosted_metrics_deployer_version: "v1.5.0-rc.0"
 
-
 containerized: true
 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
 
 ### Configuration
-openshift_install_examples: true
+osm_use_cockpit: true
+osm_cockpit_plugins: ['cockpit-kubernetes']
 osn_storage_plugin_deps: ['ceph', 'glusterfs']
 openshift_hosted_metrics_deploy: true
-#openshift_metrics_project: openshift-infra
 ppenshift_hosted_metrics_storage_kind: dynamic
-# seems ignored, so lets set to default
-#openshift_metrics_hawkular_hostname: "hawkular-metrics.{{ ands_openshift_subdomain }}"
-
-
-openshift_master_pod_eviction_timeout: 30s
-
-# Verify that it does not cause problems
-os_firewall_use_firewalld: true
-
-
-# Alternative metrics & cockpit, this is purely documented so we keep it out
 #openshift_use_manageiq: true
-osm_use_cockpit: true
-osm_cockpit_plugins: ['cockpit-kubernetes']
-
-#Recommended to avoid: No package matching 'origin-docker-excluder-1.5.0*' found available
-enable_excluders: false
-enable_docker_excluder: false
+openshift_install_examples: true
 
 # Required for IPFailover
 openshift_clock_enabled: true
 
+# 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'}
@@ -49,7 +40,6 @@ openshift_master_cluster_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
 
@@ -62,4 +52,3 @@ openshift_public_hostname: "{{ ansible_hostname }}.{{ ands_cluster_domain }}"
 #openshift_public_hostname: "{{ ands_openshift_public_network | ipaddr(ands_host_id) | ipaddr('address') }}"
 
 openshift_node_labels: "{{ ands_openshift_labels }}"
-
diff --git a/playbooks/openshift-add-nodes.yml b/playbooks/openshift-add-nodes.yml
index ccb5d1c..5044e91 100644
--- a/playbooks/openshift-add-nodes.yml
+++ b/playbooks/openshift-add-nodes.yml
@@ -4,4 +4,4 @@
     - { role: ands_facts }
     - { role: ands_openshift, subrole: hostnames }
 
-- include: ../../openshift-ansible/playbooks/byo/openshift-node/scaleup.yml
+- include: ../anslib/openshift-ansible/playbooks/byo/openshift-node/scaleup.yml
diff --git a/playbooks/openshift-install.yml b/playbooks/openshift-install.yml
index c54f4ee..edbd2d8 100644
--- a/playbooks/openshift-install.yml
+++ b/playbooks/openshift-install.yml
@@ -13,7 +13,7 @@
     node_id: "{{ hostvars[groups['masters'][0]]['ands_host_id'] }}"
 
 
-- include: ../../openshift-ansible/playbooks/byo/config.yml
+- include: ../anslib/openshift-ansible/playbooks/byo/config.yml
 
 - name: Remove temporary entries in /etc/hosts
   hosts: nodes:!masters
diff --git a/playbooks/openshift-redeploy-certificates.yml b/playbooks/openshift-redeploy-certificates.yml
index 2ac0c05..ebc5150 120000
--- a/playbooks/openshift-redeploy-certificates.yml
+++ b/playbooks/openshift-redeploy-certificates.yml
@@ -1 +1 @@
-../../openshift-ansible/playbooks/byo/openshift-cluster/redeploy-certificates.yml
\ No newline at end of file
+../anslib/openshift-ansible/playbooks/byo/openshift-cluster/redeploy-certificates.yml
\ No newline at end of file
diff --git a/roles/openshift_certificate_expiry b/roles/openshift_certificate_expiry
index 789348e..9982b78 120000
--- a/roles/openshift_certificate_expiry
+++ b/roles/openshift_certificate_expiry
@@ -1 +1 @@
-../../openshift-ansible/roles/openshift_certificate_expiry
\ No newline at end of file
+../anslib/openshift-ansible/roles/openshift_certificate_expiry/
\ No newline at end of file
diff --git a/setup/configs/openshift.yml b/setup/configs/openshift.yml
index eb3af3e..5b23837 100644
--- a/setup/configs/openshift.yml
+++ b/setup/configs/openshift.yml
@@ -8,5 +8,5 @@ ands_openshift_users:
   csa: Suren A. Chilingaryan <csa@suren.me>
 
 ands_openshift_roles:
-  cluster-admin: csa, pdv
+  cluster-admin: csa, pdv, katrin
   katrin/admin: katrin