diff --git a/etc/freezer/freezer-api.conf.sample b/etc/freezer/freezer-api.conf.sample index 0f43e3a0..b5c59dbe 100644 --- a/etc/freezer/freezer-api.conf.sample +++ b/etc/freezer/freezer-api.conf.sample @@ -347,6 +347,8 @@ # path to CA certs on disk (string value) #ca_certs = -# Number of replicas for elk cluster. Default is 2. Use 0 for no replicas +# Number of replicas for elk cluster. Default is 0. Use 0 for no replicas +# In a production environment, this value should be equal to: +# (Number of elasticsearch node in the cluster - 1) # (integer value) -#number_of_replicas = 2 +#number_of_replicas = 0 diff --git a/freezer_api/cmd/db_init.py b/freezer_api/cmd/db_init.py index 79f3812a..6bd6c466 100644 --- a/freezer_api/cmd/db_init.py +++ b/freezer_api/cmd/db_init.py @@ -33,7 +33,7 @@ from freezer_api.common import db_mappings DEFAULT_CONF_PATH = '/etc/freezer/freezer-api.conf' DEFAULT_ES_SERVER_PORT = 9200 DEFAULT_INDEX = 'freezer' -DEFAULT_REPLICAS = 1 +DEFAULT_REPLICAS = 0 class MergeMappingException(Exception): @@ -351,6 +351,8 @@ def get_db_params(args): def main(): + print("Using the freezer-db-init script is deprecated. Please use " + "freezer-manage instead.") mappings = db_mappings.get_mappings() args = get_args(mapping_choices=mappings.keys()) diff --git a/freezer_api/cmd/manage.py b/freezer_api/cmd/manage.py index 4b48944a..f12e2e61 100644 --- a/freezer_api/cmd/manage.py +++ b/freezer_api/cmd/manage.py @@ -34,7 +34,7 @@ LOG = log.getLogger(__name__) DEFAULT_ES_SERVER_PORT = 9200 DEFAULT_INDEX = 'freezer' -DEFAULT_REPLICAS = 1 +DEFAULT_REPLICAS = 0 def add_db_opts(subparser): diff --git a/freezer_api/storage/driver.py b/freezer_api/storage/driver.py index aa6455d9..77acbab8 100644 --- a/freezer_api/storage/driver.py +++ b/freezer_api/storage/driver.py @@ -57,9 +57,10 @@ def get_elk_opts(): default=None, help='path to CA certs on disk'), cfg.IntOpt('number_of_replicas', - default=2, - help='Number of replicas for elk cluster. Default is 2. ' - 'Use 0 for no replicas') + default=0, + help='Number of replicas for elk cluster. Default is 0. ' + 'Use 0 for no replicas. This should be set to (number ' + 'of node in the ES cluter -1).') ] return storage_opts