From 3dac10cbb0af5feffc7e18928b0ed4960daaf423 Mon Sep 17 00:00:00 2001 From: Adam Miller Date: Mon, 21 Aug 2017 15:18:52 +0000 Subject: [PATCH] switch osbs stage to overlayfs, increase ram per node Signed-off-by: Adam Miller --- files/osbs/docker-storage-setup.staging | 1 + .../host_vars/osbs-master01.stg.phx2.fedoraproject.org | 4 ++-- inventory/host_vars/osbs-node01.stg.phx2.fedoraproject.org | 4 ++-- inventory/host_vars/osbs-node02.stg.phx2.fedoraproject.org | 4 ++-- .../osbsworker-x86-64-master01.stg.phx2.fedoraproject.org | 4 ++-- .../osbsworker-x86-64-node01.stg.phx2.fedoraproject.org | 4 ++-- .../osbsworker-x86-64-node02.stg.phx2.fedoraproject.org | 4 ++-- playbooks/groups/osbs-orchestrator-cluster.yml | 7 +++++++ 8 files changed, 20 insertions(+), 12 deletions(-) create mode 100644 files/osbs/docker-storage-setup.staging diff --git a/files/osbs/docker-storage-setup.staging b/files/osbs/docker-storage-setup.staging new file mode 100644 index 0000000000..e29e2a65b0 --- /dev/null +++ b/files/osbs/docker-storage-setup.staging @@ -0,0 +1 @@ +STORAGE_DRIVER="overlay2" \ No newline at end of file diff --git a/inventory/host_vars/osbs-master01.stg.phx2.fedoraproject.org b/inventory/host_vars/osbs-master01.stg.phx2.fedoraproject.org index 8f501f21d4..f805120683 100644 --- a/inventory/host_vars/osbs-master01.stg.phx2.fedoraproject.org +++ b/inventory/host_vars/osbs-master01.stg.phx2.fedoraproject.org @@ -2,7 +2,7 @@ nm: 255.255.255.0 gw: 10.5.126.254 dns: 10.5.126.21 -ks_url: http://10.5.126.23/repo/rhel/ks/kvm-fedora-26-osbs +ks_url: http://10.5.126.23/repo/rhel/ks/kvm-fedora-26 ks_repo: http://10.5.126.23/pub/fedora/linux/releases/26/Server/x86_64/os/ volgroup: /dev/vg_guests eth0_ip: 10.5.126.216 @@ -14,6 +14,6 @@ nrpe_procs_warn: 900 nrpe_procs_crit: 1000 lvm_size: 120g -mem_size: 8192 +mem_size: 16384 max_mem_size: 16384 num_cpus: 4 diff --git a/inventory/host_vars/osbs-node01.stg.phx2.fedoraproject.org b/inventory/host_vars/osbs-node01.stg.phx2.fedoraproject.org index 10f1043db7..b6cd4afc79 100644 --- a/inventory/host_vars/osbs-node01.stg.phx2.fedoraproject.org +++ b/inventory/host_vars/osbs-node01.stg.phx2.fedoraproject.org @@ -2,7 +2,7 @@ nm: 255.255.255.0 gw: 10.5.126.254 dns: 10.5.126.21 -ks_url: http://10.5.126.23/repo/rhel/ks/kvm-fedora-26-osbs +ks_url: http://10.5.126.23/repo/rhel/ks/kvm-fedora-26 ks_repo: http://10.5.126.23/pub/fedora/linux/releases/26/Server/x86_64/os/ volgroup: /dev/vg_guests eth0_ip: 10.5.126.219 @@ -14,6 +14,6 @@ nrpe_procs_warn: 900 nrpe_procs_crit: 1000 lvm_size: 120g -mem_size: 8192 +mem_size: 16384 max_mem_size: 16384 num_cpus: 4 diff --git a/inventory/host_vars/osbs-node02.stg.phx2.fedoraproject.org b/inventory/host_vars/osbs-node02.stg.phx2.fedoraproject.org index 8e76d8ebb0..ef2c7fc534 100644 --- a/inventory/host_vars/osbs-node02.stg.phx2.fedoraproject.org +++ b/inventory/host_vars/osbs-node02.stg.phx2.fedoraproject.org @@ -2,7 +2,7 @@ nm: 255.255.255.0 gw: 10.5.126.254 dns: 10.5.126.21 -ks_url: http://10.5.126.23/repo/rhel/ks/kvm-fedora-26-osbs +ks_url: http://10.5.126.23/repo/rhel/ks/kvm-fedora-26 ks_repo: http://10.5.126.23/pub/fedora/linux/releases/26/Server/x86_64/os/ volgroup: /dev/vg_guests eth0_ip: 10.5.126.213 @@ -14,6 +14,6 @@ nrpe_procs_warn: 900 nrpe_procs_crit: 1000 lvm_size: 120g -mem_size: 8192 +mem_size: 16384 max_mem_size: 16384 num_cpus: 4 diff --git a/inventory/host_vars/osbsworker-x86-64-master01.stg.phx2.fedoraproject.org b/inventory/host_vars/osbsworker-x86-64-master01.stg.phx2.fedoraproject.org index 64b3c99ad0..ddfbba4a22 100644 --- a/inventory/host_vars/osbsworker-x86-64-master01.stg.phx2.fedoraproject.org +++ b/inventory/host_vars/osbsworker-x86-64-master01.stg.phx2.fedoraproject.org @@ -2,7 +2,7 @@ nm: 255.255.255.0 gw: 10.5.128.254 dns: 10.5.126.21 -ks_url: http://10.5.126.23/repo/rhel/ks/kvm-fedora-26-osbs +ks_url: http://10.5.126.23/repo/rhel/ks/kvm-fedora-26 ks_repo: http://10.5.126.23/pub/fedora/linux/releases/26/Server/x86_64/os/ volgroup: /dev/vg_guests eth0_ip: 10.5.128.110 @@ -14,6 +14,6 @@ nrpe_procs_warn: 900 nrpe_procs_crit: 1000 lvm_size: 120g -mem_size: 8192 +mem_size: 16384 max_mem_size: 16384 num_cpus: 4 diff --git a/inventory/host_vars/osbsworker-x86-64-node01.stg.phx2.fedoraproject.org b/inventory/host_vars/osbsworker-x86-64-node01.stg.phx2.fedoraproject.org index 365c1d4431..56de138bae 100644 --- a/inventory/host_vars/osbsworker-x86-64-node01.stg.phx2.fedoraproject.org +++ b/inventory/host_vars/osbsworker-x86-64-node01.stg.phx2.fedoraproject.org @@ -2,7 +2,7 @@ nm: 255.255.255.0 gw: 10.5.128.254 dns: 10.5.126.21 -ks_url: http://10.5.126.23/repo/rhel/ks/kvm-fedora-26-osbs +ks_url: http://10.5.126.23/repo/rhel/ks/kvm-fedora-26 ks_repo: http://10.5.126.23/pub/fedora/linux/releases/26/Server/x86_64/os/ volgroup: /dev/vg_guests eth0_ip: 10.5.128.111 @@ -14,6 +14,6 @@ nrpe_procs_warn: 900 nrpe_procs_crit: 1000 lvm_size: 120g -mem_size: 8192 +mem_size: 16384 max_mem_size: 16384 num_cpus: 4 diff --git a/inventory/host_vars/osbsworker-x86-64-node02.stg.phx2.fedoraproject.org b/inventory/host_vars/osbsworker-x86-64-node02.stg.phx2.fedoraproject.org index 9188045d4a..b6f3831bbc 100644 --- a/inventory/host_vars/osbsworker-x86-64-node02.stg.phx2.fedoraproject.org +++ b/inventory/host_vars/osbsworker-x86-64-node02.stg.phx2.fedoraproject.org @@ -2,7 +2,7 @@ nm: 255.255.255.0 gw: 10.5.128.254 dns: 10.5.126.21 -ks_url: http://10.5.126.23/repo/rhel/ks/kvm-fedora-26-osbs +ks_url: http://10.5.126.23/repo/rhel/ks/kvm-fedora-26 ks_repo: http://10.5.126.23/pub/fedora/linux/releases/26/Server/x86_64/os/ volgroup: /dev/vg_guests eth0_ip: 10.5.128.112 @@ -14,6 +14,6 @@ nrpe_procs_warn: 900 nrpe_procs_crit: 1000 lvm_size: 120g -mem_size: 8192 +mem_size: 16384 max_mem_size: 16384 num_cpus: 4 diff --git a/playbooks/groups/osbs-orchestrator-cluster.yml b/playbooks/groups/osbs-orchestrator-cluster.yml index 7bb3cf044a..7503193e84 100644 --- a/playbooks/groups/osbs-orchestrator-cluster.yml +++ b/playbooks/groups/osbs-orchestrator-cluster.yml @@ -178,6 +178,13 @@ copy: src: "{{files}}/osbs/docker-storage-setup" dest: "/etc/sysconfig/docker-storage-setup" + when: env == "production" + + - name: copy docker-storage-setup config + copy: + src: "{{files}}/osbs/docker-storage-setup.staging" + dest: "/etc/sysconfig/docker-storage-setup" + when: env == "staging" # This keytab needs to be on any system that is going to talk to koji and