Merge "change team for tjaroszyk and remove mlos from services" into release/proposed/2019.2.0
diff --git a/debmirror/mirror_mirantis_com/init.yml b/debmirror/mirror_mirantis_com/init.yml
index 753a3a4..89c1e7f 100644
--- a/debmirror/mirror_mirantis_com/init.yml
+++ b/debmirror/mirror_mirantis_com/init.yml
@@ -3,6 +3,7 @@
- system.debmirror.mirror_mirantis_com.update.cassandra.xenial
- system.debmirror.mirror_mirantis_com.ceph-luminous.xenial
- system.debmirror.mirror_mirantis_com.update.ceph-luminous.xenial
+- system.debmirror.mirror_mirantis_com.update.ceph-nautilus.xenial
- system.debmirror.mirror_mirantis_com.docker.xenial
- system.debmirror.mirror_mirantis_com.update.docker.xenial
- system.debmirror.mirror_mirantis_com.elasticsearch-5.x.xenial
diff --git a/debmirror/mirror_mirantis_com/update/ceph-nautilus/xenial.yml b/debmirror/mirror_mirantis_com/update/ceph-nautilus/xenial.yml
new file mode 100644
index 0000000..20d73b7
--- /dev/null
+++ b/debmirror/mirror_mirantis_com/update/ceph-nautilus/xenial.yml
@@ -0,0 +1,22 @@
+classes:
+- system.defaults.debmirror
+parameters:
+ debmirror:
+ client:
+ enabled: true
+ mirrors:
+ mirror_mirantis_com_update_ceph_nautilus_xenial:
+ force: ${_param:mirror_mirantis_com_ceph_nautilus_xenial_force}
+ lock_target: True
+ extra_flags: [ '--verbose', '--progress', '--nosource', '--no-check-gpg', '--rsync-extra=none' ]
+ method: "${_param:debmirror_mirrors_sync_method}"
+ arch: [ 'amd64' ]
+ mirror_host: "${_param:debmirror_mirrors_host}"
+ mirror_root: "${_param:debmirror_mirrors_update_root}/ceph-nautilus/xenial/"
+ target_dir: "${_param:debmirror_mirrors_update_target_dir}/ceph-nautilus/xenial/"
+ cache_dir: "${_param:debmirror_mirrors_common_cache_dir}/ceph-nautilus/"
+ log_file: "/var/log/debmirror/mirror_mirantis_com_update_ceph_nautilus_xenial.log"
+ dist: [ xenial ]
+ section: [ main ]
+ filter:
+ 001: "--exclude='(-dbg_|-dbg-)'"
diff --git a/defaults/debmirror.yml b/defaults/debmirror.yml
index 8c636ac..cef73b5 100644
--- a/defaults/debmirror.yml
+++ b/defaults/debmirror.yml
@@ -13,6 +13,7 @@
# Per repo modificators
mirror_mirantis_com_cassandra_xenial_force: False
mirror_mirantis_com_ceph_luminous_xenial_force: False
+ mirror_mirantis_com_ceph_nautilus_xenial_force: False
mirror_mirantis_com_docker_xenial_force: False
mirror_mirantis_com_elasticsearch_5_x_xenial_force: False
mirror_mirantis_com_elasticsearch_6_x_xenial_force: False
diff --git a/docker/swarm/stack/monitoring/gainsight.yml b/docker/swarm/stack/monitoring/gainsight.yml
index 4cd45f7..472b047 100644
--- a/docker/swarm/stack/monitoring/gainsight.yml
+++ b/docker/swarm/stack/monitoring/gainsight.yml
@@ -2,10 +2,10 @@
- system.prometheus.gainsight.container
parameters:
_param:
- gainsight_cluster_id: '${_param:cluster_domain}'
+ gainsight_cluster_id: "${_param:cluster_domain}"
gainsight_prometheus_url: "http://${_param:stacklight_monitor_address}:15010"
- gainsight_config_directory: '/srv/gainsight'
- gainsight_crontab_directory: '/etc/cron.d'
+ gainsight_config_directory: "/srv/gainsight"
+ gainsight_crontab_directory: "/etc/cron.d"
gainsight_config_path: "${_param:gainsight_config_directory}/config.ini"
gainsight_sfdc_auth_url: "${_param:sf_notifier_sfdc_auth_url}"
gainsight_sfdc_username: "${_param:sf_notifier_sfdc_username}"
@@ -39,12 +39,12 @@
- ${prometheus:gainsight:dir:config}:${_param:gainsight_config_directory}
- ${prometheus:gainsight:dir:crontab}:${_param:gainsight_crontab_directory}
environment:
- CLUSTER_ID: "${_param:gainsight_cluster_id}"
- PROMETHEUS_URL: "${_param:gainsight_prometheus_url}"
- CONFIG_PATH: "${_param:gainsight_config_path}"
- SFDC_AUTH_URL: "${_param:gainsight_sfdc_auth_url}"
- SFDC_USERNAME: "${_param:gainsight_sfdc_username}"
- SFDC_PASSWORD: "${_param:gainsight_sfdc_password}"
- SFDC_ORGANIZATION_ID: "${_param:gainsight_sfdc_organization_id}"
- SFDC_ENVIRONMENT_ID: "${_param:gainsight_sfdc_environment_id}"
- SFDC_SANDBOX_ENABLED: "${_param:gainsight_sfdc_sandbox_enabled}"
+ - CLUSTER_ID='${_param:gainsight_cluster_id}'
+ - PROMETHEUS_URL='${_param:gainsight_prometheus_url}'
+ - CONFIG_PATH='${_param:gainsight_config_path}'
+ - SFDC_AUTH_URL='${_param:gainsight_sfdc_auth_url}'
+ - SFDC_USERNAME='${_param:gainsight_sfdc_username}'
+ - SFDC_PASSWORD='${_param:gainsight_sfdc_password}'
+ - SFDC_ORGANIZATION_ID='${_param:gainsight_sfdc_organization_id}'
+ - SFDC_ENVIRONMENT_ID='${_param:gainsight_sfdc_environment_id}'
+ - SFDC_SANDBOX_ENABLED='${_param:gainsight_sfdc_sandbox_enabled}'
diff --git a/docker/swarm/stack/monitoring/sf_notifier.yml b/docker/swarm/stack/monitoring/sf_notifier.yml
index b8b2dd6..a77b457 100644
--- a/docker/swarm/stack/monitoring/sf_notifier.yml
+++ b/docker/swarm/stack/monitoring/sf_notifier.yml
@@ -30,13 +30,13 @@
ports:
- 15018:5000
environment:
- SF_NOTIFIER_WORKERS: ${_param:sf_notifier_workers}
- SF_NOTIFIER_BUFFER_SIZE: ${_param:sf_notifier_buffer_size}
- SF_NOTIFIER_APP_PORT: ${prometheus:sf_notifier:uwsgi:bind_port}
- SF_NOTIFIER_ALERT_ID_HASH_FUNC: ${_param:sf_notifier_alert_id_hash_func}
- SFDC_AUTH_URL: "${_param:sf_notifier_sfdc_auth_url}"
- SFDC_USERNAME: "${_param:sf_notifier_sfdc_username}"
- SFDC_PASSWORD: "${_param:sf_notifier_sfdc_password}"
- SFDC_ORGANIZATION_ID: "${_param:sf_notifier_sfdc_organization_id}"
- SFDC_ENVIRONMENT_ID: "${_param:sf_notifier_sfdc_environment_id}"
- SFDC_SANDBOX_ENABLED: "${_param:sf_notifier_sfdc_sandbox_enabled}"
+ - SF_NOTIFIER_WORKERS=${_param:sf_notifier_workers}
+ - SF_NOTIFIER_BUFFER_SIZE=${_param:sf_notifier_buffer_size}
+ - SF_NOTIFIER_APP_PORT=${prometheus:sf_notifier:uwsgi:bind_port}
+ - SF_NOTIFIER_ALERT_ID_HASH_FUNC='${_param:sf_notifier_alert_id_hash_func}'
+ - SFDC_AUTH_URL='${_param:sf_notifier_sfdc_auth_url}'
+ - SFDC_USERNAME='${_param:sf_notifier_sfdc_username}'
+ - SFDC_PASSWORD='${_param:sf_notifier_sfdc_password}'
+ - SFDC_ORGANIZATION_ID='${_param:sf_notifier_sfdc_organization_id}'
+ - SFDC_ENVIRONMENT_ID='${_param:sf_notifier_sfdc_environment_id}'
+ - SFDC_SANDBOX_ENABLED='${_param:sf_notifier_sfdc_sandbox_enabled}'