Browse Source

Removed all managers parameters in synergy.conf

The synergy.conf must configure just the service whereas the
managers must be configured with separate configuration files.

- removed all scheduler managers sections
- added support to read all configuration files in /etc/synergy
- removed service automatic restart after installation or update

bug #1663581
Depends-On: I7ceb140182db306567d7f7a6b5bfcf0871249a05
Sem-Ver: feature

Change-Id: I4491606402314d29363420aeb5cb943ae3a9090f
changes/87/432287/6
Lisa Zangrando 5 years ago
committed by Vincent Llorens
parent
commit
78eb46a608
  1. 189
      config/synergy.conf
  2. 6
      packaging/debian/rules
  3. 5
      packaging/rpm/python-synergy.spec
  4. 2
      scripts/synergy.service

189
config/synergy.conf

@ -37,192 +37,3 @@ max_header_line = 16384
retry_until_window = 30
tcp_keepidle = 600
backlog = 4096
[SchedulerManager]
autostart = True
# set the manager rate (minutes)
rate = 1
# set the list of projects accessing to the shared quota
# projects = prj_a, prj_b
#projects =
# set the projects share
# shares = prj_a=70, prj_b=30
#shares =
# set the default max time to live (minutes) for VM/Container
default_TTL = 2880
# set, for the specified projects, the max time to live (minutes) for VM/Container
# TTLs = prj_a=1440, prj_b=2880
#TTLs =
# set the max depth used by the backfilling strategy (default: 100)
# this allows Synergy to not check the whole queue when looking for VMs to start
backfill_depth = 100
# set the notification topic used by Nova for informing listeners about the state
# changes of the VMs. In case some other service (e.g. Ceilometer) is listening
# on the default Nova topic (i.e. "notifications"), please define a new topic
specific for Synergy (e.g. notification_topics = notifications,synergy_notifications)
notification_topic = notifications
[FairShareManager]
autostart = True
# set the manager rate (minutes)
rate = 2
# set the period size (default: 7 days)
period_length = 7
# set num of periods (default: 3)
periods = 3
# set the default share value (default: 10)
default_share = 10
# set the dacay weight, float value [0,1] (default: 0.5)
decay_weight = 0.5
# set the vcpus weight (default: 100)
vcpus_weight = 50
# set the age weight (default: 10)
age_weight = 10
# set the memory weight (default: 70)
memory_weight = 70
[KeystoneManager]
autostart = True
# set the manager rate (minutes)
rate = 5
# set the Keystone url (v3 only)
auth_url = http://CONTROLLER_HOST:5000/v3
# set the name of user with admin role
#username =
# set the password of user with admin role
#password =
# set the project name to request authorization on
#project_name =
# set the project id to request authorization on
#project_id =
# set the http connection timeout (default: 60)
timeout = 60
# set the user domain name (default: default)
user_domain_name = default
# set the project domain name (default: default)
project_domain_name = default
# set the clock skew. This forces the request for token, a
# delta time before the token expiration (default: 60 sec)
clock_skew = 60
# set the PEM encoded Certificate Authority to use when verifying HTTPs connections
#ssl_ca_file =
# set the SSL client certificate (PEM encoded)
#ssl_cert_file =
[NovaManager]
autostart = True
# set the manager rate (minutes)
rate = 5
#set the http connection timeout (default: 60)
timeout = 60
# set the AMQP backend type (e.g. rabbit, qpid)
#amqp_backend =
# set the AMQP HA cluster host:port pairs
#amqp_hosts =
# set the AMQP broker address where a single node is used (default: localhost)
amqp_host = localhost
# set the AMQP broker port where a single node is used
amqp_port = 5672
# set the AMQP user
#amqp_user =
# set the AMQP user password
#amqp_password =
# set the AMQP virtual host (default: /)
amqp_virtual_host = /
# set the Nova host (default: localhost)
host = CONTROLLER_HOST
# set the Nova conductor topic (default: conductor)
conductor_topic = conductor
# set the Nova compute topic (default: compute)
compute_topic = compute
# set the Nova scheduler topic (default: scheduler)
scheduler_topic = scheduler
# set the Nova database connection
db_connection=DIALECT+DRIVER://USER:PASSWORD@DB_HOST/nova
# set the Nova CPU allocation ratio (default: 16)
cpu_allocation_ratio = 16
# set the Nova RAM allocation ratio (default: 1.5)
ram_allocation_ratio = 1.5
# set the Nova metadata_proxy_shared_secret
metadata_proxy_shared_secret =
# set the PEM encoded Certificate Authority to use when verifying HTTPs connections
#ssl_ca_file =
# set the SSL client certificate (PEM encoded)
#ssl_cert_file =
[QueueManager]
autostart = True
# set the manager rate (minutes)
rate = 60
# set the Synergy database connection:
db_connection = DIALECT+DRIVER://USER:PASSWORD@DB_HOST/synergy
# set the connection pool size (default: 10)
db_pool_size = 10
# set the number of seconds after which a connection is automatically
# recycled (default: 30)
db_pool_recycle = 30
# set the max overflow (default: 5)
db_max_overflow = 5
[QuotaManager]
autostart = True
# set the manager rate (minutes)
rate = 5

6
packaging/debian/rules

@ -26,6 +26,12 @@ override_dh_installinit:
override_dh_auto_test:
override_dh_systemd_start:
dh_systemd_start --no-start --no-restart-on-upgrade
override_dh_systemd_enable:
dh_systemd_enable --no-enable
# debmake generated override targets
# This is example for Cmake (See http://bugs.debian.org/641051 )
#override_dh_auto_configure:

5
packaging/rpm/python-synergy.spec

@ -74,16 +74,11 @@ getent passwd synergy > /dev/null || \
exit 0
%post
%systemd_post synergy.service
%preun
%systemd_preun synergy.service
%postun
%systemd_postun_with_restart synergy.service
if [ "$1" = 0 ]; then
userdel -r synergy 2> /dev/null || true
groupdel synergy 2> /dev/null || true

2
scripts/synergy.service

@ -6,7 +6,7 @@ After=mysql.service postgresql.service slapd.service rabbitmq-server.service ntp
User=synergy
Group=synergy
WorkingDirectory=/var/lib/synergy
ExecStart=/usr/bin/synergy-service
ExecStart=/usr/bin/synergy-service --config-dir /etc/synergy/
[Install]
WantedBy=multi-user.target
Loading…
Cancel
Save