Merge branch 'master' of /git/ansible

files/openshift/openshift.repo

@@ -0,0 +1,4 @@
+[rhel7-openshift-3.4]
+name = rhel7 openshift 3.4 $basearch
+baseurl=http://infrastructure.fedoraproject.org/repo/rhel/rhel7/$basearch/rhel-7-openshift-3.4-rpms/
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-redhat-release

inventory/group_vars/os

@@ -0,0 +1,2 @@
+---
+host_group: os

inventory/inventory

@@ -1342,6 +1342,11 @@ os-master03.stg.phx2.fedoraproject.org
 os-node01.stg.phx2.fedoraproject.org
 os-node02.stg.phx2.fedoraproject.org
 
+[os:children]
+os-nodes-stg
+os-masters-stg
+os-control-stg
+
 [ci]
 ci-cc-rdu01.fedoraproject.org
 

playbooks/groups/os-cluster.yml

@@ -23,6 +23,11 @@
     - sudo
 
   tasks:
+    - name: Deploy controller public ssh keys to osbs cluster hosts
+      authorized_key:
+        user: root
+        key: "{{ lookup('file', '{{private}}/files/os/{{env}}/control_key.pub') }}"
+
     - include: "{{ tasks_path }}/yumrepos.yml"
     - include: "{{ tasks_path }}/2fa_client.yml"
     - include: "{{ tasks_path }}/motd.yml"
@@ -73,10 +78,10 @@
     - {
       role: ansible-ansible-openshift-ansible,
         cluster_inventory_filename: "cluster-inventory-stg",
-        openshift_release: "v3.5",
+        openshift_release: "v3.4",
         openshift_ansible_path: "/root/openshift-ansible",
         openshift_ansible_playbook: "playbooks/byo/config.yml",
-        openshift_ansible_version: "openshift-ansible-3.5.69-1",
+        openshift_ansible_version: "openshift-ansible-3.4.88-1",
         openshift_ansible_ssh_user: root,
         openshift_ansible_install_examples: true,
         openshift_ansible_containerized_deploy: true,

roles/hosts/files/os-hosts

@@ -0,0 +1,3 @@
+127.0.0.1   localhost localhost.localdomain localhost4 localhost4.localdomain4
+::1         localhost localhost.localdomain localhost6 localhost6.localdomain6
+209.132.182.64 registery.access.redhat.com

roles/koschei/frontend/templates/config-frontend.cfg.j2

@@ -103,6 +103,11 @@ config = {
     "bugreport": {
         "url": "https://{{ koschei_bugzilla }}/enter_bug.cgi?{query}",
     },
+    "copr": {
+        "require_admin": True,
+        "copr_owner": "mizdebsk",
+        "default_schedule_count": 8,
+    },
 }
 
 # Local Variables:

roles/postgresql_server/templates/postgresql.conf

@@ -177,8 +177,9 @@ wal_buffers = 64kB                      # min 32kB
 #commit_siblings = 5                    # range 1-1000                   
 
 # - Checkpoints -
-
+{% if ansible_distribution != "Fedora" %}
 checkpoint_segments = 30                # in logfile segments, min 1, 16MB each
+{% endif %}
 checkpoint_timeout = 30min              # range 30s-1h                         
 checkpoint_completion_target = 0.6      # checkpoint target duration, 0.0 - 1.0
 checkpoint_warning = 180s               # 0 is off                             

tasks/yumrepos.yml

@@ -15,6 +15,14 @@
   - packages
   - yumrepos
 
+- name: put openshift 3.4 repo on os- systems
+  copy: src="{{ files }}/openshift/openshift.repo" dest="/etc/yum.repos.d/openshift.repo"
+  when: ansible_distribution == 'RedHat' and ansible_distribution_major_version == 7 and inventory_hostname.startswith('os-')
+  tags:
+  - config
+  - packages
+  - yumrepos
+
 - name: put epel repos on el systems
   copy: src="{{ files }}/common/epel{{ ansible_distribution_major_version }}.repo" dest="/etc/yum.repos.d/epel{{ ansible_distribution_major_version }}.repo"
   when: ((ansible_distribution == 'RedHat' or ansible_distribution == 'CentOS') and use_default_epel)