Merge "Fixed test-triggerring regexes"
diff --git a/designate/server/single.yml b/designate/server/single.yml
index bef6e4d..623c357 100644
--- a/designate/server/single.yml
+++ b/designate/server/single.yml
@@ -1,6 +1,5 @@
classes:
- service.designate.server.single
-- service.haproxy.proxy.single
parameters:
designate:
server:
@@ -23,7 +22,7 @@
password: ${_param:mysql_designate_password}
identity:
engine: keystone
- host: ${_param:openstack_control_address}
+ host: ${_param:single_address}
port: 35357
tenant: service
user: designate
@@ -35,3 +34,14 @@
user: openstack
password: ${_param:rabbitmq_openstack_password}
virtual_host: '/openstack'
+ pools:
+ default:
+ description: 'default pool'
+ ns_records: ${_param:designate_pool_ns_records}
+ nameservers: ${_param:designate_pool_nameservers}
+ targets:
+ default:
+ type: ${_param:designate_pool_target_type}
+ description: 'default target'
+ masters: ${_param:designate_pool_target_masters}
+ options: ${_param:designate_pool_target_options}
diff --git a/heka/log_collector/output/sensu.yml b/heka/log_collector/output/sensu.yml
index e7bf79d..23085b7 100644
--- a/heka/log_collector/output/sensu.yml
+++ b/heka/log_collector/output/sensu.yml
@@ -1,3 +1,2 @@
classes:
- service.heka.log_collector.output.sensu
-
diff --git a/heka/log_collector/output/telegraf.yml b/heka/log_collector/output/telegraf.yml
new file mode 100644
index 0000000..94171cb
--- /dev/null
+++ b/heka/log_collector/output/telegraf.yml
@@ -0,0 +1,8 @@
+parameters:
+ _param:
+ log_collector_telegraf_port: 8186
+ heka:
+ log_collector:
+ telegraf_host: 127.0.0.1
+ telegraf_port: ${_param:log_collector_telegraf_port}
+ telegraf_timeout: 2000
diff --git a/heka/remote_collector/output/telegraf.yml b/heka/remote_collector/output/telegraf.yml
new file mode 100644
index 0000000..7f7a5c0
--- /dev/null
+++ b/heka/remote_collector/output/telegraf.yml
@@ -0,0 +1,8 @@
+parameters:
+ _param:
+ remote_collector_telegraf_port: 8186
+ heka:
+ remote_collector:
+ influxdb_host: ${_param:remote_collector_telegraf_host}
+ influxdb_port: ${_param:remote_collector_telegraf_port}
+ influxdb_timeout: 2000
diff --git a/jenkins/client/job/deploy/lab/cicd.yml b/jenkins/client/job/deploy/lab/cicd.yml
index fb1dd92..8a2893c 100644
--- a/jenkins/client/job/deploy/lab/cicd.yml
+++ b/jenkins/client/job/deploy/lab/cicd.yml
@@ -35,13 +35,13 @@
default: "{{lab}}"
HEAT_STACK_ENVIRONMENT:
type: string
- default: "tcpisek"
+ default: "devcloud"
HEAT_STACK_ZONE:
type: string
- default: "mirantis-zone-qa"
+ default: "mcp-mk"
HEAT_STACK_PUBLIC_NET:
type: string
- default: "mirantis-private"
+ default: "public"
HEAT_STACK_DELETE:
type: boolean
default: 'true'
@@ -62,19 +62,19 @@
# openstack api
OPENSTACK_API_URL:
type: string
- default: "https://vpc.tcpisek.cz:5000"
+ default: "https://cloud-cz.bud.mirantis.net:5000"
OPENSTACK_API_CREDENTIALS:
type: string
default: "openstack-qa-credentials"
OPENSTACK_API_PROJECT:
type: string
- default: "mirantis_mk20_qa"
+ default: "mcp-mk"
OPENSTACK_API_CLIENT:
type: string
- default: "liberty"
+ default: ""
OPENSTACK_API_VERSION:
type: string
- default: "2"
+ default: "3"
OPENSTACK_API_PROJECT_DOMAIN:
type: string
default: "default"
diff --git a/jenkins/client/job/deploy/lab/mk/cleanup.yml b/jenkins/client/job/deploy/lab/mk/cleanup.yml
index a400842..626dd4e 100644
--- a/jenkins/client/job/deploy/lab/mk/cleanup.yml
+++ b/jenkins/client/job/deploy/lab/mk/cleanup.yml
@@ -29,19 +29,19 @@
# heat parameters
OPENSTACK_API_URL:
type: string
- default: "https://vpc.tcpisek.cz:5000"
+ default: "https://cloud-cz.bud.mirantis.net:5000"
OPENSTACK_API_CREDENTIALS:
type: string
- default: "openstack-qa-credentials"
+ default: "openstack-devcloud-credentials"
OPENSTACK_API_PROJECT:
type: string
- default: "mirantis_mk20_qa"
+ default: "mcp-mk"
OPENSTACK_API_CLIENT:
type: string
- default: "liberty"
+ default: ""
OPENSTACK_API_VERSION:
type: string
- default: "2"
+ default: "3"
OPENSTACK_API_PROJECT_DOMAIN:
type: string
default: "default"
@@ -79,19 +79,19 @@
# openstack api
OPENSTACK_API_URL:
type: string
- default: "https://vpc.tcpisek.cz:5000"
+ default: "https://cloud-cz.bud.mirantis.net:5000"
OPENSTACK_API_CREDENTIALS:
type: string
- default: "openstack-qa-credentials"
+ default: "openstack-devcloud-credentials"
OPENSTACK_API_PROJECT:
type: string
- default: "mirantis_mk20_qa"
+ default: "mcp-mk"
OPENSTACK_API_CLIENT:
type: string
- default: "liberty"
+ default: ""
OPENSTACK_API_VERSION:
type: string
- default: "2"
+ default: "3"
OPENSTACK_API_PROJECT_DOMAIN:
type: string
default: "default"
diff --git a/jenkins/client/job/deploy/lab/mk/cloud.yml b/jenkins/client/job/deploy/lab/mk/cloud.yml
index a79414b..7461acf 100644
--- a/jenkins/client/job/deploy/lab/mk/cloud.yml
+++ b/jenkins/client/job/deploy/lab/mk/cloud.yml
@@ -99,16 +99,16 @@
# openstack api
OPENSTACK_API_URL:
type: string
- default: "https://vpc.tcpisek.cz:5000"
+ default: "https://cloud-cz.bud.mirantis.net:5000"
OPENSTACK_API_CREDENTIALS:
type: string
- default: "openstack-qa-credentials"
+ default: "openstack-devcloud-credentials"
OPENSTACK_API_PROJECT:
type: string
- default: "mirantis_mk20_qa"
+ default: "mcp-mk"
OPENSTACK_API_CLIENT:
type: string
- default: "liberty"
+ default: ""
OPENSTACK_API_VERSION:
type: string
default: "2"
@@ -128,13 +128,13 @@
# heat
HEAT_STACK_ENVIRONMENT:
type: string
- default: "tcpisek"
+ default: "devcloud"
HEAT_STACK_ZONE:
type: string
- default: "workshop-sunnyvale"
+ default: "mcp-mk"
HEAT_STACK_PUBLIC_NET:
type: string
- default: "mirantis-private"
+ default: "public"
# k8s setttings
K8S_API_SERVER:
diff --git a/jenkins/client/job/deploy/lab/mk/init.yml b/jenkins/client/job/deploy/lab/mk/init.yml
index 1ddd863..dde1fb0 100644
--- a/jenkins/client/job/deploy/lab/mk/init.yml
+++ b/jenkins/client/job/deploy/lab/mk/init.yml
@@ -62,13 +62,13 @@
# heat
HEAT_STACK_ENVIRONMENT:
type: string
- default: "tcpisek"
+ default: "devcloud"
HEAT_STACK_ZONE:
type: string
- default: "mirantis-zone-qa"
+ default: "mcp-mk"
HEAT_STACK_PUBLIC_NET:
type: string
- default: "mirantis-private"
+ default: "public"
# salt master
SALT_MASTER_CREDENTIALS:
@@ -81,19 +81,19 @@
# openstack api
OPENSTACK_API_URL:
type: string
- default: "https://vpc.tcpisek.cz:5000"
+ default: "https://cloud-cz.bud.mirantis.net:5000"
OPENSTACK_API_CREDENTIALS:
type: string
- default: "openstack-qa-credentials"
+ default: "openstack-devcloud-credentials"
OPENSTACK_API_PROJECT:
type: string
- default: "mirantis_mk20_qa"
+ default: "mcp-mk"
OPENSTACK_API_CLIENT:
type: string
- default: "liberty"
+ default: ""
OPENSTACK_API_VERSION:
type: string
- default: "2"
+ default: "3"
OPENSTACK_API_PROJECT_DOMAIN:
type: string
default: "default"
diff --git a/jenkins/client/job/salt-models/tests.yml b/jenkins/client/job/salt-models/tests.yml
index 5341c48..4ed1f62 100644
--- a/jenkins/client/job/salt-models/tests.yml
+++ b/jenkins/client/job/salt-models/tests.yml
@@ -46,6 +46,15 @@
EXTRA_FORMULAS:
type: string
default: "{{extra_formulas}}"
+ FORMULAS_SOURCE:
+ type: string
+ default: "{{formulas_src}}"
+ SYSTEM_GIT_URL:
+ type: string
+ default: ""
+ SYSTEM_GIT_REF:
+ type: string
+ default: ""
test_system_reclass:
name: test-salt-model-{{name}}
template:
@@ -123,3 +132,43 @@
EXTRA_FORMULAS:
type: string
default: "xtrabackup"
+ job:
+ test-salt-model-node:
+ name: test-salt-model-node
+ discard:
+ build:
+ keep_num: 500
+ artifact:
+ keep_num: 10
+ type: workflow-scm
+ concurrent: true
+ scm:
+ type: git
+ url: "${_param:jenkins_gerrit_url}/mk/mk-pipelines"
+ credentials: "gerrit"
+ script: test-salt-model-node.groovy
+ param:
+ NODE_TARGET:
+ type: string
+ default: ""
+ DEFAULT_GIT_URL:
+ type: string
+ default: "${_param:jenkins_gerrit_url}/salt-models/{{name}}"
+ DEFAULT_GIT_REF:
+ type: string
+ default: master
+ CREDENTIALS_ID:
+ type: string
+ default: "gerrit"
+ EXTRA_FORMULAS:
+ type: string
+ default: ""
+ FORMULAS_SOURCE:
+ type: string
+ default: "{{formulas_src}}"
+ SYSTEM_GIT_URL:
+ type: string
+ default: ""
+ SYSTEM_GIT_REF:
+ type: string
+ default: ""
\ No newline at end of file
diff --git a/linux/system/repo_local/mcp/extra.yml b/linux/system/repo_local/mcp/extra.yml
index b7ae91a..c55ecfc 100644
--- a/linux/system/repo_local/mcp/extra.yml
+++ b/linux/system/repo_local/mcp/extra.yml
@@ -10,3 +10,8 @@
source: "deb [arch=amd64] http://${_param:local_repo_url}/ubuntu-${_param:linux_system_codename}/ ${_param:linux_system_repo_mcp_extra_version} extra"
architectures: amd64
key_url: "http://${_param:local_repo_url}/public.gpg"
+ clean_file: true
+ pin:
+ - pin: 'release a=${_param:linux_system_repo_mcp_extra_version}'
+ priority: 1100
+ package: '*'
diff --git a/neutron/compute/cluster.yml b/neutron/compute/cluster.yml
index 64ba477..d6674f0 100644
--- a/neutron/compute/cluster.yml
+++ b/neutron/compute/cluster.yml
@@ -1,9 +1,9 @@
classes:
- service.neutron.compute.single
parameters:
+ _param:
+ neutron_enable_qos: False
neutron:
- _param:
- neutron_enable_qos: False
compute:
dvr: ${_param:neutron_compute_dvr}
qos: ${_param:neutron_enable_qos}
@@ -15,4 +15,4 @@
members:
- host: ${_param:openstack_message_queue_node01_address}
- host: ${_param:openstack_message_queue_node02_address}
- - host: ${_param:openstack_message_queue_node03_address}
\ No newline at end of file
+ - host: ${_param:openstack_message_queue_node03_address}
diff --git a/neutron/gateway/cluster.yml b/neutron/gateway/cluster.yml
index 52462dd..a4f37b1 100644
--- a/neutron/gateway/cluster.yml
+++ b/neutron/gateway/cluster.yml
@@ -1,9 +1,9 @@
classes:
- service.neutron.gateway.single
parameters:
+ _param:
+ neutron_enable_qos: False
neutron:
- _param:
- neutron_enable_qos: False
gateway:
dvr: ${_param:neutron_gateway_dvr}
qos: ${_param:neutron_enable_qos}
diff --git a/prometheus/alertmanager/notification/pushkin.yml b/prometheus/alertmanager/notification/pushkin.yml
new file mode 100644
index 0000000..3d3332d
--- /dev/null
+++ b/prometheus/alertmanager/notification/pushkin.yml
@@ -0,0 +1,30 @@
+parameters:
+ _param:
+ alertmanager_notification_pushkin_host: ${_param:haproxy_pushkin_bind_host}
+ alertmanager_notification_pushkin_port: ${_param:haproxy_pushkin_bind_port}
+parameters:
+ prometheus:
+ alertmanager:
+ config:
+ route:
+ group_by: ['region', 'service']
+ group_wait: 60s
+ group_interval: 5m
+ repeat_interval: 3h
+ receiver: pushkin_notification
+ routes:
+ - match:
+ route: email
+ receiver: email_notification
+ - match:
+ route: salesforce
+ receiver: salesforce_notification
+ receivers:
+ - name: salesforce_notification
+ webhook_configs:
+ - url: "${_param:alertmanager_notification_pushkin_host}:${_param:alertmanager_notification_pushkin_port}/webhook?app=stacklight&route=salesforce&cluster_id=id"
+ send_resolved: true
+ - name: pushkin_notification
+ webhook_configs:
+ - url: "${_param:alertmanager_notification_pushkin_host}:${_param:alertmanager_notification_pushkin_port}/webhook?app=stacklight&route=email&cluster_id=id"
+ send_resolved: true