Merge "Changed body request max size accepted by proxy for rados-gw service. Was 10240MB, now 20MB." into release/proposed/2019.2.0
diff --git a/defaults/docker_images.yml b/defaults/docker_images.yml
index a8aa495..2466a14 100644
--- a/defaults/docker_images.yml
+++ b/defaults/docker_images.yml
@@ -11,14 +11,14 @@
docker_image_mongodb: "${_param:mcp_docker_registry}/mirantis/external/mongo:2019.2.6"
###
# phpldapadmin:0.6.12
- docker_image_phpldapadmin: "${_param:mcp_docker_registry}/mirantis/cicd/phpldapadmin:2019.2.5"
+ docker_image_phpldapadmin: "${_param:mcp_docker_registry}/mirantis/cicd/phpldapadmin:2019.2.9"
# gerrit:2.15.17
docker_image_gerrit: "${_param:mcp_docker_registry}/mirantis/cicd/gerrit:2019.2.7"
# mysql:5.6
docker_image_mysql: "${_param:mcp_docker_registry}/mirantis/cicd/mysql:2019.2.6"
# jenkins:2.150.3
docker_image_jenkins: "${_param:mcp_docker_registry}/mirantis/cicd/jenkins:2019.2.8"
- docker_image_jenkins_jnlp_slave: "${_param:mcp_docker_registry}/mirantis/cicd/jnlp-slave:2019.2.8"
+ docker_image_jenkins_jnlp_slave: "${_param:mcp_docker_registry}/mirantis/cicd/jnlp-slave:2019.2.9"
# TODO: fix tag
docker_image_jenkins_ssh_slave: "${_param:mcp_docker_registry}/mirantis/cicd/ssh-slave:2019.2.5"
# model-generator
@@ -33,9 +33,9 @@
docker_image_grafana: "${_param:mcp_docker_registry}/openstack-docker/grafana:2019.2.6"
docker_image_prometheus_es_exporter: "${_param:mcp_docker_registry}/openstack-docker/prometheus-es-exporter:2019.2.6"
docker_image_prometheus: "${_param:mcp_docker_registry}/openstack-docker/prometheus:2019.2.6"
- docker_image_prometheus_gainsight: "${_param:mcp_docker_registry}/openstack-docker/gainsight:2019.2.4"
+ docker_image_prometheus_gainsight: "${_param:mcp_docker_registry}/openstack-docker/sf-reporter:2019.2.9"
docker_image_prometheus_gainsight_elasticsearch: "${_param:mcp_docker_registry}/openstack-docker/gainsight_elasticsearch:2019.2.6"
- docker_image_prometheus_relay: "${_param:mcp_docker_registry}/openstack-docker/prometheus-relay:2019.2.5"
+ docker_image_prometheus_relay: "${_param:mcp_docker_registry}/openstack-docker/prometheus-relay:2019.2.9"
docker_image_pushgateway: "${_param:mcp_docker_registry}/openstack-docker/pushgateway:2019.2.6"
docker_image_remote_agent: "${_param:mcp_docker_registry}/openstack-docker/telegraf:2019.2.8"
docker_image_remote_collector: "${_param:mcp_docker_registry}/openstack-docker/heka:2019.2.6"
@@ -47,16 +47,16 @@
docker_image_keycloak_server: "${_param:mcp_docker_registry}/mirantis/external/jboss/keycloak:4.5.0.Final"
docker_image_keycloak_proxy: "${_param:mcp_docker_registry}/mirantis/external/jboss/keycloak:3.4.2.Final"
# CVP
- docker_image_cvp_sanity_checks: "${_param:mcp_docker_registry}/mirantis/cvp/cvp-sanity-checks:2019.2.8"
+ docker_image_cvp_sanity_checks: "${_param:mcp_docker_registry}/mirantis/cvp/cvp-sanity-checks:2019.2.9"
docker_image_cvp_tempest: "${_param:mcp_docker_registry}/mirantis/cicd/ci-tempest:${_param:openstack_version}"
docker_image_cvp_shaker_checks: "${_param:mcp_docker_registry}/mirantis/cvp/cvp-shaker:2019.2.3"
docker_image_cvp_rally: "${_param:mcp_docker_registry}/mirantis/cvp/cvp-rally:2019.2.5"
docker_image_cvp_xrally: "${_param:mcp_docker_registry}/mirantis/external/xrally/xrally-openstack:0.11.2"
# aptly
docker_image_aptly:
- base: "${_param:mcp_docker_registry}/mirantis/cicd/aptly:2019.2.6"
- public: "${_param:mcp_docker_registry}/mirantis/cicd/aptly-public:2019.2.6"
- publisher: "${_param:mcp_docker_registry}/mirantis/cicd/aptly-publisher:2019.2.6"
+ base: "${_param:mcp_docker_registry}/mirantis/cicd/aptly:2019.2.9"
+ public: "${_param:mcp_docker_registry}/mirantis/cicd/aptly-public:2019.2.9"
+ publisher: "${_param:mcp_docker_registry}/mirantis/cicd/aptly-publisher:2019.2.9"
# List of images, to be placed into offline image, during separate image build process
# WARNING: registry|target_registry and names - must be exactly same as list above!
@@ -82,21 +82,21 @@
name: postgres:9.6.10
- registry: ${_param:mcp_docker_registry}/mirantis/cicd
target_registry: ${_param:default_local_mirrror_content:docker_client_registry_target_registry}/mirantis/cicd
- name: phpldapadmin:2019.2.5
+ name: phpldapadmin:2019.2.9
- registry: ${_param:mcp_docker_registry}/mirantis/cicd
target_registry: ${_param:default_local_mirrror_content:docker_client_registry_target_registry}/mirantis/cicd
- name: aptly:2019.2.6
+ name: aptly:2019.2.9
- registry: ${_param:mcp_docker_registry}/mirantis/cicd
target_registry: ${_param:default_local_mirrror_content:docker_client_registry_target_registry}/mirantis/cicd
- name: aptly-public:2019.2.6
+ name: aptly-public:2019.2.9
- registry: ${_param:mcp_docker_registry}/mirantis/cicd
target_registry: ${_param:default_local_mirrror_content:docker_client_registry_target_registry}/mirantis/cicd
- name: aptly-publisher:2019.2.6
+ name: aptly-publisher:2019.2.9
- registry: ${_param:mcp_docker_registry}/mirantis/cicd
target_registry: ${_param:default_local_mirrror_content:docker_client_registry_target_registry}/mirantis/cicd
- name: jnlp-slave:2019.2.8
+ name: jnlp-slave:2019.2.9
- registry: ${_param:mcp_docker_registry}/mirantis/cicd
target_registry: ${_param:default_local_mirrror_content:docker_client_registry_target_registry}/mirantis/cicd
name: ssh-slave:2019.2.5
@@ -130,7 +130,7 @@
name: prometheus:2019.2.6
- registry: ${_param:mcp_docker_registry}/openstack-docker
target_registry: ${_param:default_local_mirrror_content:docker_client_registry_target_registry}/openstack-docker
- name: gainsight:2019.2.4
+ name: sf-reporter:2019.2.9
- registry: ${_param:mcp_docker_registry}/openstack-docker
target_registry: ${_param:default_local_mirrror_content:docker_client_registry_target_registry}/openstack-docker
name: telegraf:2019.2.8
@@ -139,7 +139,7 @@
name: remote_storage_adapter:2019.2.6
- registry: ${_param:mcp_docker_registry}/openstack-docker
target_registry: ${_param:default_local_mirrror_content:docker_client_registry_target_registry}/openstack-docker
- name: prometheus-relay:2019.2.5
+ name: prometheus-relay:2019.2.9
- registry: ${_param:mcp_docker_registry}/openstack-docker
target_registry: ${_param:default_local_mirrror_content:docker_client_registry_target_registry}/openstack-docker
name: grafana:2019.2.6
@@ -182,7 +182,7 @@
name: cvp-shaker:2019.2.3
- registry: ${_param:mcp_docker_registry}/mirantis/cvp
target_registry: ${_param:default_local_mirrror_content:docker_client_registry_target_registry}/mirantis/cvp
- name: cvp-sanity-checks:2019.2.8
+ name: cvp-sanity-checks:2019.2.9
- registry: ${_param:mcp_docker_registry}/mirantis/external/xrally
target_registry: ${_param:default_local_mirrror_content:docker_client_registry_target_registry}/mirantis/external/xrally
name: xrally-openstack:0.11.2
diff --git a/defaults/stacklight.yml b/defaults/stacklight.yml
index 625d20c..9ed6a8f 100644
--- a/defaults/stacklight.yml
+++ b/defaults/stacklight.yml
@@ -8,3 +8,10 @@
# ELK stack versions
elasticsearch_version: 5
kibana_version: 5
+ # Salesforce
+ sf_notifier_sfdc_auth_url: "default"
+ sf_notifier_sfdc_username: "default"
+ sf_notifier_sfdc_password: "default"
+ sf_notifier_sfdc_organization_id: "default"
+ sf_notifier_sfdc_environment_id: "default"
+ sf_notifier_sfdc_sandbox_enabled: "True"
diff --git a/docker/swarm/stack/monitoring/gainsight.yml b/docker/swarm/stack/monitoring/gainsight.yml
index 554c8ec..4cd45f7 100644
--- a/docker/swarm/stack/monitoring/gainsight.yml
+++ b/docker/swarm/stack/monitoring/gainsight.yml
@@ -2,19 +2,17 @@
- system.prometheus.gainsight.container
parameters:
_param:
- gainsight_enabled: 'true'
- gainsight_csv_upload_url: 'http://localhost:9999'
- gainsight_account_id: 'default'
- gainsight_environment_id: 'default'
- gainsight_app_org_id: 'default'
- gainsight_access_key: 'default'
- gainsight_job_id: 'default'
- gainsight_login: 'default'
+ 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_path: "${_param:gainsight_config_directory}/config.ini"
- gainsight_csv_retention: 180
+ gainsight_sfdc_auth_url: "${_param:sf_notifier_sfdc_auth_url}"
+ gainsight_sfdc_username: "${_param:sf_notifier_sfdc_username}"
+ gainsight_sfdc_password: "${_param:sf_notifier_sfdc_password}"
+ gainsight_sfdc_organization_id: "${_param:sf_notifier_sfdc_organization_id}"
+ gainsight_sfdc_environment_id: "${_param:sf_notifier_sfdc_environment_id}"
+ gainsight_sfdc_sandbox_enabled: "${_param:sf_notifier_sfdc_sandbox_enabled}"
docker:
client:
stack:
@@ -40,16 +38,13 @@
volumes:
- ${prometheus:gainsight:dir:config}:${_param:gainsight_config_directory}
- ${prometheus:gainsight:dir:crontab}:${_param:gainsight_crontab_directory}
- - ${prometheus:gainsight:dir:csv}:/opt/gainsight/csv
environment:
- CSV_UPLOAD_URL: "${_param:gainsight_csv_upload_url}"
- ACCOUNT_ID: "${_param:gainsight_account_id}"
- ENVIRONMENT_ID: "${_param:gainsight_environment_id}"
- APP_ORG_ID: "${_param:gainsight_app_org_id}"
- ACCESS_KEY: "${_param:gainsight_access_key}"
- JOB_ID: "${_param:gainsight_job_id}"
- LOGIN: "${_param:gainsight_login}"
+ CLUSTER_ID: "${_param:gainsight_cluster_id}"
PROMETHEUS_URL: "${_param:gainsight_prometheus_url}"
CONFIG_PATH: "${_param:gainsight_config_path}"
- ENABLED: "${_param:gainsight_enabled}"
- RETENTION: ${_param:gainsight_csv_retention}
+ 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/haproxy/proxy/listen/openstack/designate.yml b/haproxy/proxy/listen/openstack/designate.yml
index 1310be4..0f19a1f 100644
--- a/haproxy/proxy/listen/openstack/designate.yml
+++ b/haproxy/proxy/listen/openstack/designate.yml
@@ -20,3 +20,7 @@
host: ${_param:cluster_node02_address}
port: ${_param:haproxy_designate_port}
params: ${_param:haproxy_designate_check_params}
+ - name: ${_param:cluster_node03_hostname}
+ host: ${_param:cluster_node03_address}
+ port: ${_param:haproxy_designate_port}
+ params: ${_param:haproxy_designate_check_params}
diff --git a/haproxy/proxy/listen/openstack/designate_large.yml b/haproxy/proxy/listen/openstack/designate_large.yml
new file mode 100644
index 0000000..01d92aa
--- /dev/null
+++ b/haproxy/proxy/listen/openstack/designate_large.yml
@@ -0,0 +1,34 @@
+parameters:
+ _param:
+ haproxy_designate_check_params: check inter 10s fastinter 2s downinter 3s rise 3 fall 3
+ haproxy_designate_port: 9001
+ haproxy:
+ proxy:
+ listen:
+ designate_api:
+ type: openstack-service
+ service_name: designate
+ binds:
+ - address: ${_param:cluster_vip_address}
+ port: ${_param:haproxy_designate_port}
+ servers:
+ - name: ${_param:cluster_node01_hostname}
+ host: ${_param:cluster_node01_address}
+ port: ${_param:haproxy_designate_port}
+ params: ${_param:haproxy_designate_check_params}
+ - name: ${_param:cluster_node02_hostname}
+ host: ${_param:cluster_node02_address}
+ port: ${_param:haproxy_designate_port}
+ params: ${_param:haproxy_designate_check_params}
+ - name: ${_param:cluster_node03_hostname}
+ host: ${_param:cluster_node03_address}
+ port: ${_param:haproxy_designate_port}
+ params: ${_param:haproxy_designate_check_params}
+ - name: ${_param:cluster_node04_hostname}
+ host: ${_param:cluster_node04_address}
+ port: ${_param:haproxy_designate_port}
+ params: ${_param:haproxy_designate_check_params}
+ - name: ${_param:cluster_node05_hostname}
+ host: ${_param:cluster_node05_address}
+ port: ${_param:haproxy_designate_port}
+ params: ${_param:haproxy_designate_check_params}
diff --git a/jenkins/client/job/deploy/update/upgrade_stacklight.yml b/jenkins/client/job/deploy/update/upgrade_stacklight.yml
index 57747e4..f043de8 100644
--- a/jenkins/client/job/deploy/update/upgrade_stacklight.yml
+++ b/jenkins/client/job/deploy/update/upgrade_stacklight.yml
@@ -39,3 +39,11 @@
type: boolean
default: 'true'
description: "Set to True if upgrade for components running in Docker Swarm is desired"
+ OS_UPGRADE:
+ type: boolean
+ default: 'false'
+ description: 'Run apt-get upgrade on Stacklight nodes'
+ OS_DIST_UPGRADE:
+ type: boolean
+ default: 'false'
+ description: 'Run apt-get dist-upgrade on Stacklight nodes and reboot to apply changes'
diff --git a/jenkins/client/job/validate.yml b/jenkins/client/job/validate.yml
index 92d369c..aeb9553 100644
--- a/jenkins/client/job/validate.yml
+++ b/jenkins/client/job/validate.yml
@@ -21,6 +21,8 @@
artifact:
keep_num: 50
concurrent: false
+ disabled: true
+ description: "Pipeline is outdated and no longer supported. Please do not use in production"
scm:
type: git
url: "${_param:jenkins_gerrit_url}/mk/mk-pipelines"
diff --git a/maas/region/single.yml b/maas/region/single.yml
index 601b883..580ca18 100644
--- a/maas/region/single.yml
+++ b/maas/region/single.yml
@@ -5,6 +5,13 @@
_param:
maas_admin_username: mirantis
maas_region_main_archive: ${_param:linux_system_repo_update_url}/ubuntu/
+ # Pin distro-info-data package. See PROD-34940 for details
+ linux:
+ system:
+ package:
+ distro-info-data:
+ version: 0.28ubuntu0.9
+ hold: true
maas:
cluster:
enabled: true
diff --git a/nginx/server/proxy/salt_api.yml b/nginx/server/proxy/salt_api.yml
index bb8d7c7..4a1f5b1 100644
--- a/nginx/server/proxy/salt_api.yml
+++ b/nginx/server/proxy/salt_api.yml
@@ -23,6 +23,7 @@
protocol: ${_param:nginx_proxy_salt_api_proxy_protocol}
# Prevent nginx from caching request body
request_buffer: false
+ timeout: 1800
host:
name: ${_param:infra_config_hostname}.${_param:cluster_domain}
port: ${_param:nginx_proxy_salt_api_site_port}
diff --git a/prometheus/gainsight/container.yml b/prometheus/gainsight/container.yml
index f98e052..fda03e8 100644
--- a/prometheus/gainsight/container.yml
+++ b/prometheus/gainsight/container.yml
@@ -1,3 +1,2 @@
classes:
- service.prometheus.gainsight.container
-
diff --git a/prometheus/gainsight/elasticsearch_container.yml b/prometheus/gainsight/elasticsearch_container.yml
index 8a10fbf..a32320f 100644
--- a/prometheus/gainsight/elasticsearch_container.yml
+++ b/prometheus/gainsight/elasticsearch_container.yml
@@ -1,3 +1,2 @@
classes:
- service.prometheus.gainsight.elasticsearch_container
-
diff --git a/salt/control/virt.yml b/salt/control/virt.yml
index 03891c5..a408218 100644
--- a/salt/control/virt.yml
+++ b/salt/control/virt.yml
@@ -5,6 +5,7 @@
control:
enabled: True
virt_enabled: True
+ file_mask: 022
virt:
nic:
default:
diff --git a/sphinx/server/doc/reclass.yml b/sphinx/server/doc/reclass.yml
index 53fa5dd..651ec48 100644
--- a/sphinx/server/doc/reclass.yml
+++ b/sphinx/server/doc/reclass.yml
@@ -3,6 +3,9 @@
parameters:
_param:
nginx_static_reclass_doc_host: ${_param:cluster_public_host}
+ nginx_proxy_sphinx_user: sphinx
+ nginx_proxy_sphinx_password: ${_param:sphinx_proxy_password_generated}
+ nginx_proxy_sphinx_htpasswd_file: .htpasswd_sphinx
sphinx:
server:
doc:
@@ -13,12 +16,22 @@
engine: reclass
nginx:
server:
+ user:
+ sphinx:
+ enabled: true
+ name: ${_param:nginx_proxy_sphinx_user}
+ password: ${_param:nginx_proxy_sphinx_password}
+ htpasswd: ${_param:nginx_proxy_sphinx_htpasswd_file}
site:
nginx_static_reclass_doc:
enabled: true
type: nginx_static
name: reclass_doc
+ auth:
+ engine: basic
+ htpasswd: ${_param:nginx_proxy_sphinx_htpasswd_file}
host:
name: ${_param:nginx_static_reclass_doc_host}
port: 8090
protocol: http
+