summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRicky Elrod <codeblock@fedoraproject.org>2017-09-15 19:21:53 +0000
committerRicky Elrod <codeblock@fedoraproject.org>2017-09-15 19:21:53 +0000
commitf403c4887e017307edd88026db28c8da8db89c01 (patch)
tree791f7442d859d1889351591a7dff6c2611274984
parentce95ba5fd6eea83c7475157e26971c975bd32a3b (diff)
parentb3ff45ffad78a484811a88c78d51dd20437df5ce (diff)
downloadansible-f403c4887e017307edd88026db28c8da8db89c01.tar.gz
ansible-f403c4887e017307edd88026db28c8da8db89c01.tar.xz
ansible-f403c4887e017307edd88026db28c8da8db89c01.zip
Merge branch 'master' of /git/ansible
-rw-r--r--inventory/group_vars/mbs-backend3
-rw-r--r--inventory/group_vars/mbs-backend-stg3
-rw-r--r--inventory/group_vars/mbs-frontend3
-rw-r--r--inventory/group_vars/mbs-frontend-stg3
4 files changed, 0 insertions, 12 deletions
diff --git a/inventory/group_vars/mbs-backend b/inventory/group_vars/mbs-backend
index 73f32c6dd..05cdc8568 100644
--- a/inventory/group_vars/mbs-backend
+++ b/inventory/group_vars/mbs-backend
@@ -3,9 +3,6 @@ lvm_size: 20000
mem_size: 4096
num_cpus: 2
-# We should set freezes = True for the F27 timeframe.
-freezes: false
-
# for systems that do not match the above - specify the same parameter in
# the host_vars/$hostname file
diff --git a/inventory/group_vars/mbs-backend-stg b/inventory/group_vars/mbs-backend-stg
index f9261713f..d27928425 100644
--- a/inventory/group_vars/mbs-backend-stg
+++ b/inventory/group_vars/mbs-backend-stg
@@ -3,9 +3,6 @@ lvm_size: 20000
mem_size: 2048
num_cpus: 1
-# We should set freezes = True for the F27 timeframe.
-freezes: false
-
# for systems that do not match the above - specify the same parameter in
# the host_vars/$hostname file
diff --git a/inventory/group_vars/mbs-frontend b/inventory/group_vars/mbs-frontend
index df059068a..a4592299d 100644
--- a/inventory/group_vars/mbs-frontend
+++ b/inventory/group_vars/mbs-frontend
@@ -3,9 +3,6 @@ lvm_size: 20000
mem_size: 4096
num_cpus: 2
-# Set this to True for the F27 release and onwards.
-freezes: false
-
# Definining these vars has a number of effects
# 1) mod_wsgi is configured to use the vars for its own setup
# 2) iptables opens enough ports for all threads for fedmsg
diff --git a/inventory/group_vars/mbs-frontend-stg b/inventory/group_vars/mbs-frontend-stg
index 7d3c9c0bd..ff8dfd555 100644
--- a/inventory/group_vars/mbs-frontend-stg
+++ b/inventory/group_vars/mbs-frontend-stg
@@ -3,9 +3,6 @@ lvm_size: 20000
mem_size: 2048
num_cpus: 1
-# Set this to True for the F27 release and onwards.
-freezes: false
-
# Definining these vars has a number of effects
# 1) mod_wsgi is configured to use the vars for its own setup
# 2) iptables opens enough ports for all threads for fedmsg