Merge "Creating user cinder in computes"
diff --git a/aodh/server/cluster.yml b/aodh/server/cluster.yml
index 444050a..9bc2971 100644
--- a/aodh/server/cluster.yml
+++ b/aodh/server/cluster.yml
@@ -10,11 +10,6 @@
openstack_event_alarm_topic: alarm.all
# Keep alarm history in database for 30 days
aodh_alarm_history_ttl: 2592000
- openstack_mysql_x509_enabled: False
- galera_ssl_enabled: False
- openstack_rabbitmq_x509_enabled: False
- rabbitmq_ssl_enabled: False
- openstack_rabbitmq_port: 5672
linux:
system:
cron:
diff --git a/aodh/server/single.yml b/aodh/server/single.yml
index 2dfdea9..106a1b6 100644
--- a/aodh/server/single.yml
+++ b/aodh/server/single.yml
@@ -7,11 +7,6 @@
openstack_event_alarm_topic: alarm.all
# Keep alarm history in database for 30 days
aodh_alarm_history_ttl: 2592000
- openstack_mysql_x509_enabled: False
- galera_ssl_enabled: False
- openstack_rabbitmq_x509_enabled: False
- rabbitmq_ssl_enabled: False
- openstack_rabbitmq_port: 5672
linux:
system:
cron:
diff --git a/barbican/server/cluster.yml b/barbican/server/cluster.yml
index 60700a7..52c8712 100644
--- a/barbican/server/cluster.yml
+++ b/barbican/server/cluster.yml
@@ -6,11 +6,6 @@
parameters:
_param:
cluster_internal_protocol: 'http'
- openstack_mysql_x509_enabled: False
- galera_ssl_enabled: False
- openstack_rabbitmq_x509_enabled: False
- rabbitmq_ssl_enabled: False
- openstack_rabbitmq_port: 5672
barbican:
server:
role: ${_param:openstack_node_role}
diff --git a/barbican/server/single.yml b/barbican/server/single.yml
index f004c85..6897cbd 100644
--- a/barbican/server/single.yml
+++ b/barbican/server/single.yml
@@ -5,11 +5,6 @@
parameters:
_param:
internal_protocol: 'http'
- openstack_mysql_x509_enabled: False
- galera_ssl_enabled: False
- openstack_rabbitmq_x509_enabled: False
- rabbitmq_ssl_enabled: False
- openstack_rabbitmq_port: 5672
barbican:
server:
database:
diff --git a/ceilometer/agent/cluster.yml b/ceilometer/agent/cluster.yml
index 4e028f1..681e990 100644
--- a/ceilometer/agent/cluster.yml
+++ b/ceilometer/agent/cluster.yml
@@ -2,11 +2,6 @@
- service.ceilometer.agent.cluster
- system.salt.minion.cert.rabbitmq.clients.openstack.ceilometer
parameters:
- _param:
- openstack_rabbitmq_port: 5672
- openstack_rabbitmq_x509_enabled: False
- rabbitmq_ssl_enabled: False
- ceilometer_agent_ssl_enabled: False
ceilometer:
agent:
region: ${_param:openstack_region}
diff --git a/ceilometer/agent/single.yml b/ceilometer/agent/single.yml
index dc75fc5..ada8cd5 100644
--- a/ceilometer/agent/single.yml
+++ b/ceilometer/agent/single.yml
@@ -2,11 +2,6 @@
- service.ceilometer.agent.single
- system.salt.minion.cert.rabbitmq.clients.openstack.ceilometer
parameters:
- _param:
- openstack_rabbitmq_port: 5672
- openstack_rabbitmq_x509_enabled: False
- rabbitmq_ssl_enabled: False
- ceilometer_agent_ssl_enabled: False
ceilometer:
agent:
libvirt:
diff --git a/ceilometer/agent/telemetry/cluster.yml b/ceilometer/agent/telemetry/cluster.yml
index a110361..73f6d5a 100644
--- a/ceilometer/agent/telemetry/cluster.yml
+++ b/ceilometer/agent/telemetry/cluster.yml
@@ -2,11 +2,6 @@
- service.ceilometer.agent.cluster.common
- system.salt.minion.cert.rabbitmq.clients.openstack.ceilometer
parameters:
- _param:
- openstack_rabbitmq_port: 5672
- openstack_rabbitmq_x509_enabled: False
- rabbitmq_ssl_enabled: False
- ceilometer_agent_ssl_enabled: False
ceilometer:
agent:
region: ${_param:openstack_region}
diff --git a/ceilometer/agent/telemetry/single.yml b/ceilometer/agent/telemetry/single.yml
index 0f87d73..c86bee4 100644
--- a/ceilometer/agent/telemetry/single.yml
+++ b/ceilometer/agent/telemetry/single.yml
@@ -2,11 +2,6 @@
- service.ceilometer.agent.single.common
- system.salt.minion.cert.rabbitmq.clients.openstack.ceilometer
parameters:
- _param:
- openstack_rabbitmq_port: 5672
- openstack_rabbitmq_x509_enabled: False
- rabbitmq_ssl_enabled: False
- ceilometer_agent_ssl_enabled: False
ceilometer:
agent:
libvirt:
diff --git a/ceilometer/server/cluster.yml b/ceilometer/server/cluster.yml
index 31a0abe..5e3c9a2 100644
--- a/ceilometer/server/cluster.yml
+++ b/ceilometer/server/cluster.yml
@@ -6,10 +6,6 @@
- system.keepalived.cluster.instance.openstack_telemetry_vip
- system.salt.minion.cert.rabbitmq.clients.openstack.ceilometer
parameters:
- _param:
- openstack_rabbitmq_port: 5672
- openstack_rabbitmq_x509_enabled: False
- rabbitmq_ssl_enabled: False
ceilometer:
server:
enabled: true
diff --git a/ceilometer/server/single.yml b/ceilometer/server/single.yml
index 37feddc..9045f68 100644
--- a/ceilometer/server/single.yml
+++ b/ceilometer/server/single.yml
@@ -2,10 +2,6 @@
- service.ceilometer.server.single
- system.salt.minion.cert.rabbitmq.clients.openstack.ceilometer
parameters:
- _param:
- openstack_rabbitmq_port: 5672
- openstack_rabbitmq_x509_enabled: False
- rabbitmq_ssl_enabled: False
ceilometer:
server:
role: ${_param:openstack_node_role}
diff --git a/ceilometer/server/telemetry/cluster.yml b/ceilometer/server/telemetry/cluster.yml
index a887536..81f6c38 100644
--- a/ceilometer/server/telemetry/cluster.yml
+++ b/ceilometer/server/telemetry/cluster.yml
@@ -4,10 +4,6 @@
- system.keepalived.cluster.instance.openstack_telemetry_vip
- system.salt.minion.cert.rabbitmq.clients.openstack.ceilometer
parameters:
- _param:
- openstack_rabbitmq_port: 5672
- openstack_rabbitmq_x509_enabled: False
- rabbitmq_ssl_enabled: False
ceilometer:
server:
enabled: true
diff --git a/ceilometer/server/telemetry/single.yml b/ceilometer/server/telemetry/single.yml
index 9ff35d1..66b9431 100644
--- a/ceilometer/server/telemetry/single.yml
+++ b/ceilometer/server/telemetry/single.yml
@@ -2,10 +2,6 @@
- service.ceilometer.server.single.common
- system.salt.minion.cert.rabbitmq.clients.openstack.ceilometer
parameters:
- _param:
- openstack_rabbitmq_port: 5672
- openstack_rabbitmq_x509_enabled: False
- rabbitmq_ssl_enabled: False
ceilometer:
server:
role: ${_param:openstack_node_role}
diff --git a/cinder/control/cluster.yml b/cinder/control/cluster.yml
index e4a0718..e34f55c 100644
--- a/cinder/control/cluster.yml
+++ b/cinder/control/cluster.yml
@@ -8,11 +8,6 @@
parameters:
_param:
cluster_internal_protocol: 'http'
- openstack_mysql_x509_enabled: False
- galera_ssl_enabled: False
- openstack_rabbitmq_x509_enabled: False
- rabbitmq_ssl_enabled: False
- openstack_rabbitmq_port: 5672
linux:
system:
package:
diff --git a/cinder/control/single.yml b/cinder/control/single.yml
index 0d29e31..46bf972 100644
--- a/cinder/control/single.yml
+++ b/cinder/control/single.yml
@@ -5,11 +5,6 @@
parameters:
_param:
internal_protocol: 'http'
- openstack_mysql_x509_enabled: False
- galera_ssl_enabled: False
- openstack_rabbitmq_x509_enabled: False
- rabbitmq_ssl_enabled: False
- openstack_rabbitmq_port: 5672
linux:
system:
package:
diff --git a/cinder/volume/backend/lvm.yml b/cinder/volume/backend/lvm.yml
index 768fb6b..6559e46 100644
--- a/cinder/volume/backend/lvm.yml
+++ b/cinder/volume/backend/lvm.yml
@@ -1,6 +1,8 @@
parameters:
_param:
- cinder_lvm_devices: [ "/dev/loop0" ]
+ cinder_lvm_default_device: "/dev/loop0"
+ cinder_lvm_devices:
+ - ${_param:cinder_lvm_default_device}
linux:
storage:
lvm:
diff --git a/cinder/volume/local.yml b/cinder/volume/local.yml
index b0e179a..52f45db 100644
--- a/cinder/volume/local.yml
+++ b/cinder/volume/local.yml
@@ -3,12 +3,6 @@
- system.salt.minion.cert.mysql.clients.openstack.cinder
- system.salt.minion.cert.rabbitmq.clients.openstack.cinder
parameters:
- _param:
- openstack_mysql_x509_enabled: False
- galera_ssl_enabled: False
- openstack_rabbitmq_x509_enabled: False
- rabbitmq_ssl_enabled: False
- openstack_rabbitmq_port: 5672
cinder:
volume:
enabled: True
diff --git a/cinder/volume/single.yml b/cinder/volume/single.yml
index 03c4b3c..35902b8 100644
--- a/cinder/volume/single.yml
+++ b/cinder/volume/single.yml
@@ -5,11 +5,6 @@
parameters:
_param:
cluster_internal_protocol: 'http'
- openstack_mysql_x509_enabled: False
- galera_ssl_enabled: False
- openstack_rabbitmq_x509_enabled: False
- rabbitmq_ssl_enabled: False
- openstack_rabbitmq_port: 5672
linux:
system:
package:
diff --git a/defaults/galera/init.yml b/defaults/galera/init.yml
new file mode 100644
index 0000000..a99b281
--- /dev/null
+++ b/defaults/galera/init.yml
@@ -0,0 +1,4 @@
+parameters:
+ _param:
+ # SSL
+ galera_ssl_enabled: False
diff --git a/defaults/init.yml b/defaults/init.yml
index 022f44c..9674799 100644
--- a/defaults/init.yml
+++ b/defaults/init.yml
@@ -1,12 +1,22 @@
+# This is list of all default soft params, across reclass-system lvl.
+# Please always include those 'init.yml', and don't use direct sub-lvls.
+# Some rules approach:
+# - Always use uniq names, which exactly identify key
+# - Avoid any component intersection's
+# - No if\else\whatever logic allowed.
+
classes:
- system.defaults.linux_system_repo
+- system.defaults.openstack
+- system.defaults.galera
+- system.defaults.rabbitmq
- system.defaults.debmirror
parameters:
-# Transition in progress.
-# Please ignore 'G' transition marker - it uses only for internal purposes
_param:
apt_mk_version: "stable"
linux_system_architecture: 'amd64'
linux_system_repo_url: "http://mirror.mirantis.com/${_param:apt_mk_version}/"
- # Openstack
- openstack_version: 'pike'
+ # Openstack globals
+ openstack_version: 'queens'
+ # Docker artifact globals
+ mcp_docker_registry: 'docker-prod-local.artifactory.mirantis.com'
diff --git a/defaults/openstack/init.yml b/defaults/openstack/init.yml
new file mode 100644
index 0000000..e2856a0
--- /dev/null
+++ b/defaults/openstack/init.yml
@@ -0,0 +1,8 @@
+parameters:
+ _param:
+ # SSL
+ ceilometer_agent_ssl_enabled: False
+ openstack_mysql_x509_enabled: False
+ # for non-ssl use 5672 / for ssl 5671
+ openstack_rabbitmq_port: 5672
+ openstack_rabbitmq_x509_enabled: False
diff --git a/defaults/rabbitmq/init.yml b/defaults/rabbitmq/init.yml
new file mode 100644
index 0000000..2cad9ec
--- /dev/null
+++ b/defaults/rabbitmq/init.yml
@@ -0,0 +1,4 @@
+parameters:
+ _param:
+ # SSL
+ rabbitmq_ssl_enabled: False
diff --git a/designate/server/cluster/default.yml b/designate/server/cluster/default.yml
index 1e8076e..db453f7 100644
--- a/designate/server/cluster/default.yml
+++ b/designate/server/cluster/default.yml
@@ -9,11 +9,6 @@
_param:
designate_admin_api_enabled: false
cluster_internal_protocol: 'http'
- openstack_mysql_x509_enabled: False
- galera_ssl_enabled: False
- openstack_rabbitmq_x509_enabled: False
- rabbitmq_ssl_enabled: False
- openstack_rabbitmq_port: 5672
linux:
system:
package:
diff --git a/designate/server/cluster/simple.yml b/designate/server/cluster/simple.yml
index 459ab96..bf520a4 100644
--- a/designate/server/cluster/simple.yml
+++ b/designate/server/cluster/simple.yml
@@ -6,11 +6,6 @@
_param:
designate_admin_api_enabled: false
cluster_internal_protocol: 'http'
- openstack_mysql_x509_enabled: False
- galera_ssl_enabled: False
- openstack_rabbitmq_x509_enabled: False
- rabbitmq_ssl_enabled: False
- openstack_rabbitmq_port: 5672
linux:
system:
package:
diff --git a/designate/server/single.yml b/designate/server/single.yml
index e89afe1..10aac33 100644
--- a/designate/server/single.yml
+++ b/designate/server/single.yml
@@ -6,11 +6,6 @@
_param:
designate_admin_api_enabled: false
internal_protocol: 'http'
- openstack_mysql_x509_enabled: False
- galera_ssl_enabled: False
- openstack_rabbitmq_x509_enabled: False
- rabbitmq_ssl_enabled: False
- openstack_rabbitmq_port: 5672
linux:
system:
package:
diff --git a/docker/swarm/stack/decapod.yml b/docker/swarm/stack/decapod.yml
index 2d915fc..c0cf8a6 100644
--- a/docker/swarm/stack/decapod.yml
+++ b/docker/swarm/stack/decapod.yml
@@ -1,6 +1,5 @@
parameters:
_param:
- mcp_docker_registry: 'docker-prod-local.artifactory.mirantis.com'
docker_decapod_fe_replicas: 3
decapod_version: latest
docker_image_admin: ${_param:mcp_docker_registry}/mirantis/ceph/decapod/admin:${_param:decapod_version}
diff --git a/docker/swarm/stack/devops_portal.yml b/docker/swarm/stack/devops_portal.yml
index c7790d8..495526a 100644
--- a/docker/swarm/stack/devops_portal.yml
+++ b/docker/swarm/stack/devops_portal.yml
@@ -1,6 +1,5 @@
parameters:
_param:
- mcp_docker_registry: 'docker-prod-local.artifactory.mirantis.com'
docker_devops_portal_replicas: 1
docker_image_devops_portal: ${_param:mcp_docker_registry}/mirantis/oss/devops-portal:latest
docker:
diff --git a/docker/swarm/stack/hce.yml b/docker/swarm/stack/hce.yml
index a2d4505..38e92ff 100644
--- a/docker/swarm/stack/hce.yml
+++ b/docker/swarm/stack/hce.yml
@@ -1,6 +1,5 @@
parameters:
_param:
- mcp_docker_registry: 'docker-prod-local.artifactory.mirantis.com'
docker_hce_replicas: 1
docker_image_hce: ${_param:mcp_docker_registry}/mirantis/oss/hce
hce_bind_host: hce-api
diff --git a/docker/swarm/stack/janitor_monkey.yml b/docker/swarm/stack/janitor_monkey.yml
index 4793b1a..fb926e8 100644
--- a/docker/swarm/stack/janitor_monkey.yml
+++ b/docker/swarm/stack/janitor_monkey.yml
@@ -1,6 +1,5 @@
parameters:
_param:
- mcp_docker_registry: 'docker-prod-local.artifactory.mirantis.com'
docker_janitor_monkey_replicas: 1
docker_image_mongodb: library/mongo:3.4
docker_mongodb_admin_username: admin
diff --git a/docker/swarm/stack/monitoring/alerta.yml b/docker/swarm/stack/monitoring/alerta.yml
index 8c9d7aa..0f82821 100644
--- a/docker/swarm/stack/monitoring/alerta.yml
+++ b/docker/swarm/stack/monitoring/alerta.yml
@@ -2,7 +2,6 @@
- system.prometheus.alerta
parameters:
_param:
- mcp_docker_registry: 'docker-prod-local.artifactory.mirantis.com'
docker_image_alerta: ${_param:mcp_docker_registry}/mirantis/external/alerta-web:latest
alerta_mongodb_uri: "mongodb://${_param:cluster_node01_address}:27017,${_param:cluster_node02_address}:27017,${_param:cluster_node03_address}:27017/alerta?replicaSet=stacklight"
alerta_admin_username: "admin@alerta.io"
diff --git a/docker/swarm/stack/monitoring/elasticsearch_client_node.yml b/docker/swarm/stack/monitoring/elasticsearch_client_node.yml
index 2e509f1..d642dd2 100644
--- a/docker/swarm/stack/monitoring/elasticsearch_client_node.yml
+++ b/docker/swarm/stack/monitoring/elasticsearch_client_node.yml
@@ -1,6 +1,5 @@
parameters:
_param:
- mcp_docker_registry: 'docker-prod-local.artifactory.mirantis.com'
docker_image_elasticsearch: ${_param:mcp_docker_registry}/mirantis/external/elasticsearch:nightly
elasticsearch_client_node_publish_host: ${_param:cluster_public_host}
elasticsearch_cluster_name: elasticsearch
diff --git a/docker/swarm/stack/monitoring/gainsight.yml b/docker/swarm/stack/monitoring/gainsight.yml
index 5748034..06c87aa 100644
--- a/docker/swarm/stack/monitoring/gainsight.yml
+++ b/docker/swarm/stack/monitoring/gainsight.yml
@@ -2,7 +2,6 @@
- system.prometheus.gainsight.container
parameters:
_param:
- mcp_docker_registry: 'docker-prod-local.artifactory.mirantis.com'
gainsight_enabled: 'true'
gainsight_csv_upload_url: 'http://localhost:9999'
gainsight_account_id: 'default'
diff --git a/docker/swarm/stack/pushkin.yml b/docker/swarm/stack/pushkin.yml
index 65d400e..2ee26e4 100644
--- a/docker/swarm/stack/pushkin.yml
+++ b/docker/swarm/stack/pushkin.yml
@@ -1,6 +1,5 @@
parameters:
_param:
- mcp_docker_registry: 'docker-prod-local.artifactory.mirantis.com'
docker_pushkin_replicas: 1
docker_image_pushkin: ${_param:mcp_docker_registry}/mirantis/oss/pushkin
pushkin_bind_host: pushkin-api
diff --git a/docker/swarm/stack/rundeck.yml b/docker/swarm/stack/rundeck.yml
index b680eea..a1e8f5a 100644
--- a/docker/swarm/stack/rundeck.yml
+++ b/docker/swarm/stack/rundeck.yml
@@ -1,6 +1,5 @@
parameters:
_param:
- mcp_docker_registry: 'docker-prod-local.artifactory.mirantis.com'
docker_rundeck_replicas: 1
docker_image_rundeck: ${_param:mcp_docker_registry}/mirantis/oss/rundeck:latest
rundeck_bind_host: rundeck-api
diff --git a/docker/swarm/stack/security_monkey.yml b/docker/swarm/stack/security_monkey.yml
index 2c46878..5db205e 100644
--- a/docker/swarm/stack/security_monkey.yml
+++ b/docker/swarm/stack/security_monkey.yml
@@ -1,6 +1,5 @@
parameters:
_param:
- mcp_docker_registry: 'docker-prod-local.artifactory.mirantis.com'
docker_security_monkey_api_replicas: 1
docker_security_monkey_scheduler_replicas: 1
secmonkey_login_id: 11
diff --git a/glance/control/cluster.yml b/glance/control/cluster.yml
index c69cf55..da4b9e8 100644
--- a/glance/control/cluster.yml
+++ b/glance/control/cluster.yml
@@ -6,12 +6,6 @@
- system.salt.minion.cert.mysql.clients.openstack.glance
- system.salt.minion.cert.rabbitmq.clients.openstack.glance
parameters:
- _param:
- openstack_mysql_x509_enabled: False
- galera_ssl_enabled: False
- openstack_rabbitmq_x509_enabled: False
- rabbitmq_ssl_enabled: False
- openstack_rabbitmq_port: 5672
linux:
system:
cron:
diff --git a/glance/control/single.yml b/glance/control/single.yml
index a789a56..34e3e96 100644
--- a/glance/control/single.yml
+++ b/glance/control/single.yml
@@ -3,12 +3,6 @@
- system.salt.minion.cert.mysql.clients.openstack.glance
- system.salt.minion.cert.rabbitmq.clients.openstack.glance
parameters:
- _param:
- openstack_mysql_x509_enabled: False
- galera_ssl_enabled: False
- openstack_rabbitmq_x509_enabled: False
- rabbitmq_ssl_enabled: False
- openstack_rabbitmq_port: 5672
linux:
system:
cron:
diff --git a/gnocchi/common/cluster.yml b/gnocchi/common/cluster.yml
index 8d7ae5e..a841b56 100644
--- a/gnocchi/common/cluster.yml
+++ b/gnocchi/common/cluster.yml
@@ -2,9 +2,6 @@
- service.gnocchi.common.cluster
- system.salt.minion.cert.mysql.clients.openstack.gnocchi
parameters:
- _param:
- openstack_mysql_x509_enabled: False
- galera_ssl_enabled: False
gnocchi:
common:
database:
diff --git a/gnocchi/common/single.yml b/gnocchi/common/single.yml
index 1f68f5c..b7d9d96 100644
--- a/gnocchi/common/single.yml
+++ b/gnocchi/common/single.yml
@@ -2,9 +2,6 @@
- service.gnocchi.common.single
- system.salt.minion.cert.mysql.clients.openstack.gnocchi
parameters:
- _param:
- openstack_mysql_x509_enabled: False
- galera_ssl_enabled: False
gnocchi:
common:
database:
diff --git a/heat/server/cluster.yml b/heat/server/cluster.yml
index e11feae..52b3582 100644
--- a/heat/server/cluster.yml
+++ b/heat/server/cluster.yml
@@ -9,11 +9,6 @@
_param:
cluster_public_protocol: 'https'
cluster_internal_protocol: 'http'
- openstack_mysql_x509_enabled: False
- openstack_rabbitmq_x509_enabled: False
- galera_ssl_enabled: False
- rabbitmq_ssl_enabled: False
- openstack_rabbitmq_port: 5672
linux:
system:
package:
diff --git a/heat/server/single.yml b/heat/server/single.yml
index 1ecb122..c0dc700 100644
--- a/heat/server/single.yml
+++ b/heat/server/single.yml
@@ -3,12 +3,6 @@
- system.salt.minion.cert.mysql.clients.openstack.heat
- system.salt.minion.cert.rabbitmq.clients.openstack.heat
parameters:
- _param:
- openstack_mysql_x509_enabled: False
- openstack_rabbitmq_x509_enabled: False
- galera_ssl_enabled: False
- rabbitmq_ssl_enabled: False
- openstack_rabbitmq_port: 5672
linux:
system:
package:
diff --git a/ironic/api/cluster.yml b/ironic/api/cluster.yml
index 849b923..fe90091 100644
--- a/ironic/api/cluster.yml
+++ b/ironic/api/cluster.yml
@@ -3,12 +3,6 @@
- system.salt.minion.cert.rabbitmq.clients.openstack.ironic
- service.ironic.api.cluster
parameters:
- _param:
- openstack_mysql_x509_enabled: False
- galera_ssl_enabled: False
- openstack_rabbitmq_x509_enabled: False
- rabbitmq_ssl_enabled: False
- openstack_rabbitmq_port: 5672
linux:
system:
package:
@@ -38,4 +32,4 @@
key_file: ${_param:rabbitmq_ironic_client_ssl_key_file}
cert_file: ${_param:rabbitmq_ironic_client_ssl_cert_file}
ssl:
- enabled: ${_param:rabbitmq_ssl_enabled}
\ No newline at end of file
+ enabled: ${_param:rabbitmq_ssl_enabled}
diff --git a/ironic/api/single.yml b/ironic/api/single.yml
index 3313eb2..1ca654b 100644
--- a/ironic/api/single.yml
+++ b/ironic/api/single.yml
@@ -3,12 +3,6 @@
- system.salt.minion.cert.rabbitmq.clients.openstack.ironic
- service.ironic.api.single
parameters:
- _param:
- openstack_mysql_x509_enabled: False
- galera_ssl_enabled: False
- openstack_rabbitmq_x509_enabled: False
- rabbitmq_ssl_enabled: False
- openstack_rabbitmq_port: 5672
linux:
system:
package:
diff --git a/ironic/conductor/cluster.yml b/ironic/conductor/cluster.yml
index 81fa2b5..a839f5d 100644
--- a/ironic/conductor/cluster.yml
+++ b/ironic/conductor/cluster.yml
@@ -3,12 +3,6 @@
- system.salt.minion.cert.rabbitmq.clients.openstack.ironic
- service.ironic.conductor.cluster
parameters:
- _param:
- openstack_mysql_x509_enabled: False
- galera_ssl_enabled: False
- openstack_rabbitmq_x509_enabled: False
- rabbitmq_ssl_enabled: False
- openstack_rabbitmq_port: 5672
linux:
system:
package:
diff --git a/ironic/conductor/single.yml b/ironic/conductor/single.yml
index 7a24028..b08239e 100644
--- a/ironic/conductor/single.yml
+++ b/ironic/conductor/single.yml
@@ -3,12 +3,6 @@
- system.salt.minion.cert.rabbitmq.clients.openstack.ironic
- service.ironic.conductor.single
parameters:
- _param:
- openstack_mysql_x509_enabled: False
- galera_ssl_enabled: False
- openstack_rabbitmq_x509_enabled: False
- rabbitmq_ssl_enabled: False
- openstack_rabbitmq_port: 5672
linux:
system:
package:
diff --git a/jenkins/client/job/aptly.yml b/jenkins/client/job/aptly.yml
index 55c7f88..a713427 100644
--- a/jenkins/client/job/aptly.yml
+++ b/jenkins/client/job/aptly.yml
@@ -1,155 +1,2 @@
-parameters:
- jenkins:
- client:
- view:
- Aptly:
- enabled: true
- type: CategorizedJobsView
- include_regex: "aptly-.*"
- categories:
- - group_regex: "aptly-.*-nightly-testing"
- naming_rule: "Nightly -> Testing"
- - group_regex: "aptly-.*-testing-stable"
- naming_rule: "Testing -> Stable"
- job_template:
- aptly:
- name: aptly-{{operation}}-{{dist}}-{{source}}-{{target}}
- jobs:
- - operation: promote
- diff_only: false
- dist: trusty
- source: nightly
- target: testing
- - operation: promote
- dist: trusty
- source: testing
- target: stable
- - operation: promote
- dist: xenial
- source: nightly
- target: testing
- - operation: promote
- dist: xenial
- source: testing
- target: stable
- - operation: diff
- diff_only: true
- dist: trusty
- source: nightly
- target: testing
- - operation: diff
- diff_only: true
- dist: trusty
- source: testing
- target: stable
- - operation: diff
- diff_only: true
- dist: xenial
- source: nightly
- target: testing
- - operation: diff
- diff_only: true
- dist: xenial
- source: testing
- target: stable
- template:
- discard:
- build:
- keep_num: 25
- artifact:
- keep_num: 25
- type: workflow-scm
- concurrent: false
- scm:
- type: git
- url: "${_param:jenkins_gerrit_url}/mk/mk-pipelines"
- branch: "${_param:jenkins_pipelines_branch}"
- credentials: "gerrit"
- script: aptly-promote-pipeline.groovy
- param:
- SOURCE:
- type: string
- default: "{{dist}}/{{source}}"
- TARGET:
- type: string
- default: "{{dist}}/{{target}}"
- RECREATE:
- type: boolean
- default: 'false'
- DUMP_PUBLISH:
- type: boolean
- default: 'true'
- DIFF_ONLY:
- type: boolean
- default: '{{diff_only}}'
- APTLY_URL:
- type: string
- default: "${_param:jenkins_aptly_api_url}"
- COMPONENTS:
- type: string
- default: "all"
- description: "Comma separated list (,)"
- PACKAGES:
- type: string
- default: "all"
- description: "Comma separated list (,)"
- STORAGES:
- type: string
- default: "${_param:jenkins_aptly_storages}"
- description: "Comma separated list of storage"
- aptly-all:
- name: aptly-{{operation}}-all-{{source}}-{{target}}
- jobs:
- - operation: promote
- diff_only: false
- source: nightly
- target: testing
- - operation: promote
- diff_only: false
- source: testing
- target: stable
- template:
- discard:
- build:
- keep_num: 25
- artifact:
- keep_num: 25
- type: workflow-scm
- concurrent: false
- scm:
- type: git
- url: "${_param:jenkins_gerrit_url}/mk/mk-pipelines"
- branch: "${_param:jenkins_pipelines_branch}"
- credentials: "gerrit"
- script: aptly-promote-pipeline.groovy
- param:
- SOURCE:
- type: string
- default: "(.*)/{{source}}"
- TARGET:
- type: string
- default: "{0}/{{target}}"
- RECREATE:
- type: boolean
- default: 'false'
- DUMP_PUBLISH:
- type: boolean
- default: 'true'
- DIFF_ONLY:
- type: boolean
- default: '{{diff_only}}'
- APTLY_URL:
- type: string
- default: "${_param:jenkins_aptly_api_url}"
- COMPONENTS:
- type: string
- default: "all"
- description: "Comma separated list (,)"
- PACKAGES:
- type: string
- default: "all"
- description: "Comma separated list (,)"
- STORAGES:
- type: string
- default: "${_param:jenkins_aptly_storages}"
- description: "Comma separated list of storage"
+# This file will be removed in Q3
+# jobs was moved into salt-models/infra repo
\ No newline at end of file
diff --git a/jenkins/client/job/deploy/lab/deploy.yml b/jenkins/client/job/deploy/lab/deploy.yml
index 1914ec5..7e419f6 100644
--- a/jenkins/client/job/deploy/lab/deploy.yml
+++ b/jenkins/client/job/deploy/lab/deploy.yml
@@ -1,6 +1,5 @@
parameters:
_param:
- mcp_docker_registry: 'docker-prod-local.artifactory.mirantis.com'
jenkins_deploy_jobs: []
heat_stack_zone_job_param:
type: string
diff --git a/jenkins/client/job/gating.yml b/jenkins/client/job/gating.yml
index 513df82..a713427 100644
--- a/jenkins/client/job/gating.yml
+++ b/jenkins/client/job/gating.yml
@@ -1,68 +1,2 @@
-parameters:
- jenkins:
- client:
- view:
- Gating:
- enabled: true
- type: ListView
- include_regex: "gate-.*"
- job_template:
- gate-gerrit-namespace:
- name: gate-gerrit-{{name}}
- jobs:
- - name: mk
- regex: 'mk\/.*'
- - name: debian
- regex: 'debian\/.*'
- - name: contrail
- regex: 'contrail\/.*'
- - name: salt-models
- regex: 'salt-models\/.*'
- - name: salt-formulas
- regex: 'salt-formulas\/.*'
- - name: oss
- regex: 'oss\/devops-portal'
- template:
- discard:
- build:
- keep_num: 150
- artifact:
- keep_num: 150
- type: workflow-scm
- concurrent: true
- scm:
- type: git
- url: "${_param:jenkins_gerrit_url}/mk/mk-pipelines"
- branch: "${_param:jenkins_pipelines_branch}"
- credentials: "gerrit"
- script: gating-pipeline.groovy
- quiet_period: 60
- trigger:
- gerrit:
- project:
- '{{regex}}':
- compare_type: REG_EXP
- branches:
- - master
- - compare_type: ANT
- name: release/*
- skip_vote:
- - successful
- - failed
- - unstable
- - not_built
- event:
- comment:
- - added:
- verdictCategory: 'Workflow'
- commentAddedTriggerApprovalValue: '+1'
- param:
- JOBS_NAMESPACE:
- type: string
- default: "{{name}}"
- SKIP_TEST:
- type: string
- default: false
- CREDENTIALS_ID:
- type: string
- default: "gerrit"
+# This file will be removed in Q3
+# jobs was moved into salt-models/infra repo
\ No newline at end of file
diff --git a/jenkins/client/job/k8s-test/mcp-k8s-formula-test-pipeline.yml b/jenkins/client/job/k8s-test/mcp-k8s-formula-test-pipeline.yml
index 976ed1a..fe0f959 100644
--- a/jenkins/client/job/k8s-test/mcp-k8s-formula-test-pipeline.yml
+++ b/jenkins/client/job/k8s-test/mcp-k8s-formula-test-pipeline.yml
@@ -18,6 +18,27 @@
url: "${_param:jenkins_gerrit_url}/kubernetes-ci/kubernetes-pipelines"
credentials: "gerrit"
script: pipelines/mcp-formula-change-test-pipeline.groovy
+ trigger:
+ gerrit:
+ project:
+ kubernetes/kubernetes:
+ branches:
+ - compare_type: "ANT"
+ name: "**"
+ skip_vote:
+ - successful
+ - failed
+ - unstable
+ - not_built
+ event:
+ patchset:
+ - created:
+ excludeDrafts: false
+ excludeTrivialRebase: false
+ excludeNoCodeChange: false
+ comment:
+ - addedContains:
+ commentAddedCommentContains: '^(?s:Patch Set \d+:.*(test|recheck|reverify)\s*)$'
param:
SOURCE_CREDENTIALS:
type: string
diff --git a/jenkins/client/job/k8s-test/mcp-k8s-generic-merge-pipeline.yml b/jenkins/client/job/k8s-test/mcp-k8s-generic-merge-pipeline.yml
index 0c01626..ad66033 100644
--- a/jenkins/client/job/k8s-test/mcp-k8s-generic-merge-pipeline.yml
+++ b/jenkins/client/job/k8s-test/mcp-k8s-generic-merge-pipeline.yml
@@ -1,7 +1,4 @@
parameters:
- _param:
- mcp_docker_registry: 'docker-dev-local.docker.mirantis.net'
- mcp_prod_docker_registry: 'docker-prod-local.docker.mirantis.net'
jenkins:
client:
job_template:
@@ -57,9 +54,9 @@
param:
KUBE_DOCKER_REGISTRY:
type: string
- default: ${_param:mcp_docker_registry}
+ default: docker-dev-local.docker.mirantis.net
description: 'Docker registry for binaries and images'
KUBE_PROD_DOCKER_REGISTRY:
type: string
- default: ${_param:mcp_prod_docker_registry}
+ default: ${_param:mcp_docker_registry}
description: 'Prod docker registry for binaries and images'
diff --git a/jenkins/client/job/k8s-test/mcp-k8s-generic-test-pipeline.yml b/jenkins/client/job/k8s-test/mcp-k8s-generic-test-pipeline.yml
index de5e5a6..3bf77cb 100644
--- a/jenkins/client/job/k8s-test/mcp-k8s-generic-test-pipeline.yml
+++ b/jenkins/client/job/k8s-test/mcp-k8s-generic-test-pipeline.yml
@@ -1,6 +1,4 @@
parameters:
- _param:
- mcp_docker_registry: 'docker-dev-local.docker.mirantis.net'
jenkins:
client:
job_template:
@@ -65,5 +63,5 @@
param:
KUBE_DOCKER_REGISTRY:
type: string
- default: ${_param:mcp_docker_registry}
+ default: 'docker-dev-local.docker.mirantis.net'
description: 'Docker registry for binaries and images'
diff --git a/jenkins/client/job/k8s-test/mcp-k8s-merge-pipeline.yml b/jenkins/client/job/k8s-test/mcp-k8s-merge-pipeline.yml
index e7697a0..042e8d3 100644
--- a/jenkins/client/job/k8s-test/mcp-k8s-merge-pipeline.yml
+++ b/jenkins/client/job/k8s-test/mcp-k8s-merge-pipeline.yml
@@ -1,6 +1,4 @@
parameters:
- _param:
- mcp_docker_registry: 'docker-dev-local.docker.mirantis.net'
jenkins:
client:
job:
@@ -34,5 +32,5 @@
param:
KUBE_DOCKER_REGISTRY:
type: string
- default: ${_param:mcp_docker_registry}
+ default: docker-dev-local.docker.mirantis.net
description: 'Docker registry for binaries and images'
diff --git a/jenkins/client/job/k8s-test/mcp-k8s-metallb-merge-pipeline.yml b/jenkins/client/job/k8s-test/mcp-k8s-metallb-merge-pipeline.yml
index c4f2af0..c5ffe4e 100644
--- a/jenkins/client/job/k8s-test/mcp-k8s-metallb-merge-pipeline.yml
+++ b/jenkins/client/job/k8s-test/mcp-k8s-metallb-merge-pipeline.yml
@@ -1,7 +1,4 @@
parameters:
- _param:
- mcp_docker_registry: 'docker-dev-local.docker.mirantis.net'
- mcp_prod_docker_registry: 'docker-prod-local.docker.mirantis.net'
jenkins:
client:
job:
@@ -35,9 +32,9 @@
param:
KUBE_DOCKER_REGISTRY:
type: string
- default: ${_param:mcp_docker_registry}
+ default: docker-dev-local.docker.mirantis.net
description: 'Docker registry for binaries and images'
KUBE_PROD_DOCKER_REGISTRY:
type: string
- default: ${_param:mcp_prod_docker_registry}
+ default: ${_param:mcp_docker_registry}
description: 'Prod docker registry for binaries and images'
diff --git a/jenkins/client/job/k8s-test/mcp-k8s-metallb-test-pipeline.yml b/jenkins/client/job/k8s-test/mcp-k8s-metallb-test-pipeline.yml
index 8ebd8eb..fbce687 100644
--- a/jenkins/client/job/k8s-test/mcp-k8s-metallb-test-pipeline.yml
+++ b/jenkins/client/job/k8s-test/mcp-k8s-metallb-test-pipeline.yml
@@ -1,6 +1,4 @@
parameters:
- _param:
- mcp_docker_registry: 'docker-dev-local.docker.mirantis.net'
jenkins:
client:
job:
@@ -43,6 +41,6 @@
param:
KUBE_DOCKER_REGISTRY:
type: string
- default: ${_param:mcp_docker_registry}
+ default: 'docker-dev-local.docker.mirantis.net'
description: 'Docker registry for binaries and images'
diff --git a/jenkins/client/job/k8s-test/mcp-k8s-test-pipeline.yml b/jenkins/client/job/k8s-test/mcp-k8s-test-pipeline.yml
index 99a3884..3e01ea2 100644
--- a/jenkins/client/job/k8s-test/mcp-k8s-test-pipeline.yml
+++ b/jenkins/client/job/k8s-test/mcp-k8s-test-pipeline.yml
@@ -1,6 +1,4 @@
parameters:
- _param:
- mcp_docker_registry: 'docker-dev-local.docker.mirantis.net'
jenkins:
client:
job:
@@ -43,7 +41,7 @@
param:
KUBE_DOCKER_REGISTRY:
type: string
- default: ${_param:mcp_docker_registry}
+ default: docker-dev-local.docker.mirantis.net
description: 'Docker registry for binaries and images'
CALICO_DOCKER_REGISTRY:
type: string
diff --git a/jenkins/client/job/kill_stuck_jobs.yml b/jenkins/client/job/kill_stuck_jobs.yml
index cc69c6b..a713427 100644
--- a/jenkins/client/job/kill_stuck_jobs.yml
+++ b/jenkins/client/job/kill_stuck_jobs.yml
@@ -1,26 +1,2 @@
-parameters:
- jenkins:
- client:
- job:
- kill-stuck-jobs:
- name: kill-stuck-jobs
- discard:
- build:
- keep_num: 3
- artifact:
- keep_num: 3
- type: workflow-scm
- concurrent: true
- scm:
- type: git
- url: "${_param:jenkins_gerrit_url}/mk/mk-pipelines"
- branch: "${_param:jenkins_pipelines_branch}"
- credentials: "gerrit"
- script: abort-long-running-jobs.groovy
- trigger:
- timer:
- spec: "H H * * *"
- param:
- MAX_DURATION_IN_HOURS:
- type: string
- default: "24"
+# This file will be removed in Q3
+# jobs was moved into salt-models/infra repo
\ No newline at end of file
diff --git a/jenkins/client/job/salt-formulas/git-mirrors/2way.yml b/jenkins/client/job/salt-formulas/git-mirrors/2way.yml
index 152e951..a713427 100644
--- a/jenkins/client/job/salt-formulas/git-mirrors/2way.yml
+++ b/jenkins/client/job/salt-formulas/git-mirrors/2way.yml
@@ -1,493 +1,2 @@
-parameters:
- _param:
- jenkins_pollscm_spec: "H/60 * * * *"
- job_description_2way: <br>Syncronizes code projects with GitHub.<br>
- jenkins:
- client:
- job_template:
- git-mirror-2way-salt-formula:
- name: git-mirror-2way-salt-formula-{{name}}
- jobs:
- - name: aodh
- branches: ${_param:salt_formulas_branches}
- notification_recipients: ${_param:salt_formulas_notification_recipients}
- - name: apache
- branches: ${_param:salt_formulas_branches}
- notification_recipients: ${_param:salt_formulas_notification_recipients}
- - name: aptcacher
- branches: ${_param:salt_formulas_branches}
- notification_recipients: ${_param:salt_formulas_notification_recipients}
- - name: aptly
- branches: ${_param:salt_formulas_branches}
- notification_recipients: ${_param:salt_formulas_notification_recipients}
- - name: artifactory
- branches: ${_param:salt_formulas_branches}
- notification_recipients: ${_param:salt_formulas_notification_recipients}
- - name: avinetworks
- branches: ${_param:salt_formulas_branches}
- notification_recipients: ${_param:salt_formulas_notification_recipients}
- - name: auditd
- branches: ${_param:salt_formulas_branches}
- notification_recipients: ${_param:salt_formulas_notification_recipients}
- - name: backupninja
- branches: ${_param:salt_formulas_branches}
- notification_recipients: ${_param:salt_formulas_notification_recipients}
- - name: barbican
- branches: ${_param:salt_formulas_branches}
- notification_recipients: ${_param:salt_formulas_notification_recipients}
- - name: baremetal-simulator
- branches: ${_param:salt_formulas_branches}
- notification_recipients: ${_param:salt_formulas_notification_recipients}
- - name: billometer
- branches: ${_param:salt_formulas_branches}
- notification_recipients: ${_param:salt_formulas_notification_recipients}
- - name: bind
- branches: ${_param:salt_formulas_branches}
- notification_recipients: ${_param:salt_formulas_notification_recipients}
- - name: bird
- branches: ${_param:salt_formulas_branches}
- notification_recipients: ${_param:salt_formulas_notification_recipients}
- - name: cadf
- branches: ${_param:salt_formulas_branches}
- notification_recipients: ${_param:salt_formulas_notification_recipients}
- - name: calico
- branches: ${_param:salt_formulas_branches}
- notification_recipients: ${_param:salt_formulas_notification_recipients}
- - name: cassandra
- branches: ${_param:salt_formulas_branches}
- notification_recipients: ${_param:salt_formulas_notification_recipients}
- - name: ccp
- branches: ${_param:salt_formulas_branches}
- notification_recipients: ${_param:salt_formulas_notification_recipients}
- - name: ceilometer
- branches: ${_param:salt_formulas_extra_branches}
- notification_recipients: ${_param:salt_formulas_notification_recipients}
- - name: ceph
- branches: ${_param:salt_formulas_branches}
- notification_recipients: ${_param:salt_formulas_notification_recipients}
- - name: chrony
- branches: ${_param:salt_formulas_branches}
- notification_recipients: ${_param:salt_formulas_notification_recipients}
- - name: cinder
- branches: ${_param:salt_formulas_extra_branches}
- notification_recipients: ${_param:salt_formulas_notification_recipients}
- - name: collectd
- branches: ${_param:salt_formulas_branches}
- notification_recipients: ${_param:salt_formulas_notification_recipients}
- - name: debmirror
- branches: ${_param:salt_formulas_branches}
- notification_recipients: ${_param:salt_formulas_notification_recipients}
- - name: dekapod
- branches: ${_param:salt_formulas_branches}
- notification_recipients: ${_param:salt_formulas_notification_recipients}
- - name: devops-portal
- branches: ${_param:salt_formulas_branches}
- notification_recipients: ${_param:salt_formulas_notification_recipients}
- - name: docker
- branches: ${_param:salt_formulas_branches}
- notification_recipients: ${_param:salt_formulas_notification_recipients}
- - name: dogtag
- branches: ${_param:salt_formulas_branches}
- notification_recipients: ${_param:salt_formulas_notification_recipients}
- - name: dovecot
- branches: ${_param:salt_formulas_branches}
- notification_recipients: ${_param:salt_formulas_notification_recipients}
- - name: elasticsearch
- branches: ${_param:salt_formulas_branches}
- notification_recipients: ${_param:salt_formulas_notification_recipients}
- - name: etcd
- branches: ${_param:salt_formulas_branches}
- notification_recipients: ${_param:salt_formulas_notification_recipients}
- - name: fluentbit
- branches: ${_param:salt_formulas_branches}
- notification_recipients: ${_param:salt_formulas_notification_recipients}
- - name: fluentd
- branches: ${_param:salt_formulas_branches}
- notification_recipients: ${_param:salt_formulas_notification_recipients}
- - name: foreman
- branches: ${_param:salt_formulas_branches}
- notification_recipients: ${_param:salt_formulas_notification_recipients}
- - name: freeipa
- branches: ${_param:salt_formulas_branches}
- notification_recipients: ${_param:salt_formulas_notification_recipients}
- - name: galera
- branches: ${_param:salt_formulas_branches}
- notification_recipients: ${_param:salt_formulas_notification_recipients}
- - name: gerrit
- branches: ${_param:salt_formulas_branches}
- notification_recipients: ${_param:salt_formulas_notification_recipients}
- - name: git
- branches: ${_param:salt_formulas_branches}
- notification_recipients: ${_param:salt_formulas_notification_recipients}
- - name: gitlab
- branches: ${_param:salt_formulas_branches}
- notification_recipients: ${_param:salt_formulas_notification_recipients}
- - name: glance
- branches: ${_param:salt_formulas_extra_branches}
- notification_recipients: ${_param:salt_formulas_notification_recipients}
- - name: glusterfs
- branches: ${_param:salt_formulas_branches}
- notification_recipients: ${_param:salt_formulas_notification_recipients}
- - name: gnocchi
- branches: ${_param:salt_formulas_branches}
- notification_recipients: ${_param:salt_formulas_notification_recipients}
- - name: grafana
- branches: ${_param:salt_formulas_branches}
- notification_recipients: ${_param:salt_formulas_notification_recipients}
- - name: graphite
- branches: ${_param:salt_formulas_branches}
- notification_recipients: ${_param:salt_formulas_notification_recipients}
- - name: haproxy
- branches: ${_param:salt_formulas_branches}
- notification_recipients: ${_param:salt_formulas_notification_recipients}
- - name: heat
- branches: ${_param:salt_formulas_extra_branches}
- notification_recipients: ${_param:salt_formulas_notification_recipients}
- - name: heka
- branches: ${_param:salt_formulas_branches}
- notification_recipients: ${_param:salt_formulas_notification_recipients}
- - name: heketi
- branches: ${_param:salt_formulas_branches}
- notification_recipients: ${_param:salt_formulas_notification_recipients}
- - name: helm
- branches: ${_param:salt_formulas_branches}
- notification_recipients: ${_param:salt_formulas_notification_recipients}
- - name: horizon
- branches: ${_param:salt_formulas_extra_branches}
- notification_recipients: ${_param:salt_formulas_notification_recipients}
- - name: influxdb
- branches: ${_param:salt_formulas_branches}
- notification_recipients: ${_param:salt_formulas_notification_recipients}
- - name: iptables
- branches: ${_param:salt_formulas_branches}
- notification_recipients: ${_param:salt_formulas_notification_recipients}
- - name: ironic
- branches: ${_param:salt_formulas_branches}
- notification_recipients: ${_param:salt_formulas_notification_recipients}
- - name: isc-dhcp
- branches: ${_param:salt_formulas_branches}
- notification_recipients: ${_param:salt_formulas_notification_recipients}
- - name: java
- branches: ${_param:salt_formulas_branches}
- notification_recipients: ${_param:salt_formulas_notification_recipients}
- - name: jenkins
- branches: ${_param:salt_formulas_branches}
- notification_recipients: ${_param:salt_formulas_notification_recipients}
- - name: kedb
- branches: ${_param:salt_formulas_branches}
- notification_recipients: ${_param:salt_formulas_notification_recipients}
- - name: keepalived
- branches: ${_param:salt_formulas_branches}
- notification_recipients: ${_param:salt_formulas_notification_recipients}
- - name: keystone
- branches: ${_param:salt_formulas_extra_branches}
- notification_recipients: ${_param:salt_formulas_notification_recipients}
- - name: kibana
- branches: ${_param:salt_formulas_branches}
- notification_recipients: ${_param:salt_formulas_notification_recipients}
- - name: kubernetes
- branches: ${_param:salt_formulas_extra_branches}
- notification_recipients: ${_param:salt_formulas_notification_recipients}
- - name: letsencrypt
- branches: ${_param:salt_formulas_branches}
- notification_recipients: ${_param:salt_formulas_notification_recipients}
- - name: libvirt
- branches: ${_param:salt_formulas_branches}
- notification_recipients: ${_param:salt_formulas_notification_recipients}
- - name: linux
- branches: ${_param:salt_formulas_branches}
- notification_recipients: ${_param:salt_formulas_notification_recipients}
- - name: lldp
- branches: ${_param:salt_formulas_branches}
- notification_recipients: ${_param:salt_formulas_notification_recipients}
- - name: logrotate
- branches: ${_param:salt_formulas_branches}
- notification_recipients: ${_param:salt_formulas_notification_recipients}
- - name: maas
- branches: ${_param:salt_formulas_branches}
- notification_recipients: ${_param:salt_formulas_notification_recipients}
- - name: magnum
- branches: ${_param:salt_formulas_branches}
- notification_recipients: ${_param:salt_formulas_notification_recipients}
- - name: manila
- branches: ${_param:salt_formulas_branches}
- notification_recipients: ${_param:salt_formulas_notification_recipients}
- - name: memcached
- branches: ${_param:salt_formulas_branches}
- notification_recipients: ${_param:salt_formulas_notification_recipients}
- - name: mirascan
- branches: ${_param:salt_formulas_branches}
- notification_recipients: ${_param:salt_formulas_notification_recipients}
- - name: midonet
- branches: ${_param:salt_formulas_branches}
- notification_recipients: ${_param:salt_formulas_notification_recipients}
- - name: monasca
- branches: ${_param:salt_formulas_branches}
- notification_recipients: ${_param:salt_formulas_notification_recipients}
- - name: mongodb
- branches: ${_param:salt_formulas_branches}
- notification_recipients: ${_param:salt_formulas_notification_recipients}
- - name: murano
- branches: ${_param:salt_formulas_branches}
- notification_recipients: ${_param:salt_formulas_notification_recipients}
- - name: mysql
- branches: ${_param:salt_formulas_branches}
- notification_recipients: ${_param:salt_formulas_notification_recipients}
- - name: nagios
- branches: ${_param:salt_formulas_branches}
- notification_recipients: ${_param:salt_formulas_notification_recipients}
- - name: network
- branches: ${_param:salt_formulas_branches}
- notification_recipients: ${_param:salt_formulas_notification_recipients}
- - name: neutron
- branches: ${_param:salt_formulas_extra_branches}
- notification_recipients: ${_param:salt_formulas_notification_recipients}
- - name: nfs
- branches: ${_param:salt_formulas_branches}
- notification_recipients: ${_param:salt_formulas_notification_recipients}
- - name: nginx
- branches: ${_param:salt_formulas_branches}
- notification_recipients: ${_param:salt_formulas_notification_recipients}
- - name: nodejs
- branches: ${_param:salt_formulas_branches}
- notification_recipients: ${_param:salt_formulas_notification_recipients}
- - name: nova
- branches: ${_param:salt_formulas_extra_branches}
- notification_recipients: ${_param:salt_formulas_notification_recipients}
- - name: ntp
- branches: ${_param:salt_formulas_branches}
- notification_recipients: ${_param:salt_formulas_notification_recipients}
- - name: octavia
- branches: ${_param:salt_formulas_branches}
- notification_recipients: ${_param:salt_formulas_notification_recipients}
- - name: opencontrail
- branches: ${_param:salt_formulas_branches}
- notification_recipients: ${_param:salt_formulas_notification_recipients}
- - name: openldap
- branches: ${_param:salt_formulas_branches}
- notification_recipients: ${_param:salt_formulas_notification_recipients}
- - name: openssh
- branches: ${_param:salt_formulas_branches}
- notification_recipients: ${_param:salt_formulas_notification_recipients}
- - name: openvpn
- branches: ${_param:salt_formulas_branches}
- notification_recipients: ${_param:salt_formulas_notification_recipients}
- - name: openvstorage
- branches: ${_param:salt_formulas_branches}
- notification_recipients: ${_param:salt_formulas_notification_recipients}
- - name: oslo-templates
- branches: ${_param:salt_formulas_branches}
- notification_recipients: ${_param:salt_formulas_notification_recipients}
- - name: owncloud
- branches: ${_param:salt_formulas_branches}
- notification_recipients: ${_param:salt_formulas_notification_recipients}
- - name: panko
- branches: ${_param:salt_formulas_branches}
- notification_recipients: ${_param:salt_formulas_notification_recipients}
- - name: postfix
- branches: ${_param:salt_formulas_branches}
- notification_recipients: ${_param:salt_formulas_notification_recipients}
- - name: postgresql
- branches: ${_param:salt_formulas_branches}
- notification_recipients: ${_param:salt_formulas_notification_recipients}
- - name: powerdns
- branches: ${_param:salt_formulas_branches}
- notification_recipients: ${_param:salt_formulas_notification_recipients}
- - name: pritunl
- branches: ${_param:salt_formulas_branches}
- notification_recipients: ${_param:salt_formulas_notification_recipients}
- - name: prometheus
- branches: ${_param:salt_formulas_branches}
- notification_recipients: ${_param:salt_formulas_notification_recipients}
- - name: python
- branches: ${_param:salt_formulas_branches}
- notification_recipients: ${_param:salt_formulas_notification_recipients}
- - name: rabbitmq
- branches: ${_param:salt_formulas_branches}
- notification_recipients: ${_param:salt_formulas_notification_recipients}
- - name: reclass
- branches: ${_param:salt_formulas_branches}
- notification_recipients: ${_param:salt_formulas_notification_recipients}
- - name: redis
- branches: ${_param:salt_formulas_branches}
- notification_recipients: ${_param:salt_formulas_notification_recipients}
- - name: roundcube
- branches: ${_param:salt_formulas_branches}
- notification_recipients: ${_param:salt_formulas_notification_recipients}
- - name: rsync
- branches: ${_param:salt_formulas_branches}
- notification_recipients: ${_param:salt_formulas_notification_recipients}
- - name: rsyslog
- branches: ${_param:salt_formulas_branches}
- notification_recipients: ${_param:salt_formulas_notification_recipients}
- - name: rundeck
- branches: ${_param:salt_formulas_branches}
- notification_recipients: ${_param:salt_formulas_notification_recipients}
- - name: runtest
- branches: ${_param:salt_formulas_branches}
- notification_recipients: ${_param:salt_formulas_notification_recipients}
- - name: sahara
- branches: ${_param:salt_formulas_branches}
- notification_recipients: ${_param:salt_formulas_notification_recipients}
- - name: salt
- branches: ${_param:salt_formulas_branches}
- notification_recipients: ${_param:salt_formulas_notification_recipients}
- - name: sensu
- branches: ${_param:salt_formulas_branches}
- notification_recipients: ${_param:salt_formulas_notification_recipients}
- - name: sentry
- branches: ${_param:salt_formulas_branches}
- notification_recipients: ${_param:salt_formulas_notification_recipients}
- - name: shibboleth
- branches: ${_param:salt_formulas_branches}
- notification_recipients: ${_param:salt_formulas_notification_recipients}
- - name: sphinx
- branches: ${_param:salt_formulas_branches}
- notification_recipients: ${_param:salt_formulas_notification_recipients}
- - name: spinnaker
- branches: ${_param:salt_formulas_branches}
- notification_recipients: ${_param:salt_formulas_notification_recipients}
- - name: statsd
- branches: ${_param:salt_formulas_branches}
- notification_recipients: ${_param:salt_formulas_notification_recipients}
- - name: supervisor
- branches: ${_param:salt_formulas_branches}
- notification_recipients: ${_param:salt_formulas_notification_recipients}
- - name: swift
- branches: ${_param:salt_formulas_extra_branches}
- notification_recipients: ${_param:salt_formulas_notification_recipients}
- - name: taiga
- branches: ${_param:salt_formulas_branches}
- notification_recipients: ${_param:salt_formulas_notification_recipients}
- - name: telegraf
- branches: ${_param:salt_formulas_branches}
- notification_recipients: ${_param:salt_formulas_notification_recipients}
- - name: tinyproxy
- branches: ${_param:salt_formulas_branches}
- notification_recipients: ${_param:salt_formulas_notification_recipients}
- - name: varnish
- branches: ${_param:salt_formulas_branches}
- notification_recipients: ${_param:salt_formulas_notification_recipients}
- - name: watchdog
- branches: ${_param:salt_formulas_branches}
- notification_recipients: ${_param:salt_formulas_notification_recipients}
- - name: xtrabackup
- branches: ${_param:salt_formulas_branches}
- notification_recipients: ${_param:salt_formulas_notification_recipients}
- - name: zookeeper
- branches: ${_param:salt_formulas_branches}
- notification_recipients: ${_param:salt_formulas_notification_recipients}
- template:
- description: ${_param:job_description_2way}
- discard:
- build:
- keep_num: 10
- artifact:
- keep_num: 10
- type: workflow-scm
- concurrent: false
- scm:
- type: git
- url: "${_param:jenkins_gerrit_url}/mk/mk-pipelines"
- branch: "${_param:jenkins_pipelines_branch}"
- credentials: "gerrit"
- script: git-mirror-2way-pipeline.groovy
- github:
- url: "https://github.com/salt-formulas/salt-formula-{{name}}"
- trigger:
- github:
- pollscm:
- spec: ${_param:jenkins_pollscm_spec}
- gerrit:
- project:
- salt-formulas/{{name}}:
- branches:
- - master
- event:
- ref:
- - updated
- param:
- SOURCE_URL:
- type: string
- default: "${_param:jenkins_gerrit_url}/salt-formulas/{{name}}.git"
- TARGET_URL:
- type: string
- default: "git@github.com:salt-formulas/salt-formula-{{name}}.git"
- CREDENTIALS_ID:
- type: string
- default: "gerrit"
- BRANCHES:
- type: string
- default: "{{branches}}"
- NOTIFICATION_RECIPIENTS:
- type: string
- default: "{{notification_recipients}}"
- job:
- git-mirror-2way-salt-formulas-scripts:
- description: ${_param:job_description_2way}
- discard:
- build:
- keep_num: 10
- artifact:
- keep_num: 10
- type: workflow-scm
- concurrent: false
- scm:
- type: git
- url: "${_param:jenkins_gerrit_url}/mk/mk-pipelines"
- branch: "${_param:jenkins_pipelines_branch}"
- credentials: "gerrit"
- script: git-mirror-2way-pipeline.groovy
- github:
- url: "https://github.com/salt-formulas/salt-formulas-scripts"
- trigger:
- github:
- pollscm:
- spec: ${_param:jenkins_pollscm_spec}
- param:
- SOURCE_URL:
- type: string
- default: "${_param:jenkins_gerrit_url}/salt-formulas/salt-formulas-scripts.git"
- TARGET_URL:
- type: string
- default: "git@github.com:salt-formulas/salt-formulas-scripts.git"
- CREDENTIALS_ID:
- type: string
- default: "gerrit"
- BRANCHES:
- type: string
- default: "master,release/2018.8.1,release/2018.11.0"
- git-mirror-2way-salt-formulas-cookiecutter:
- description: ${_param:job_description_2way}
- discard:
- build:
- keep_num: 10
- artifact:
- keep_num: 10
- type: workflow-scm
- concurrent: false
- scm:
- type: git
- url: "${_param:jenkins_gerrit_url}/mk/mk-pipelines"
- branch: "${_param:jenkins_pipelines_branch}"
- credentials: "gerrit"
- script: git-mirror-2way-pipeline.groovy
- github:
- url: "https://github.com/salt-formulas/salt-formulas-cookiecutter"
- trigger:
- github:
- pollscm:
- spec: ${_param:jenkins_pollscm_spec}
- param:
- SOURCE_URL:
- type: string
- default: "${_param:jenkins_gerrit_url}/salt-formulas/cookiecutter-salt-formula"
- TARGET_URL:
- type: string
- default: "git@github.com:salt-formulas/cookiecutter-salt-formula"
- CREDENTIALS_ID:
- type: string
- default: "gerrit"
- BRANCHES:
- type: string
- default: "master"
+# This file will be removed in Q3
+# jobs was moved into salt-models/infra repo
\ No newline at end of file
diff --git a/jenkins/client/job/salt-formulas/git-mirrors/init.yml b/jenkins/client/job/salt-formulas/git-mirrors/init.yml
index 676fe4e..a713427 100644
--- a/jenkins/client/job/salt-formulas/git-mirrors/init.yml
+++ b/jenkins/client/job/salt-formulas/git-mirrors/init.yml
@@ -1,7 +1,2 @@
-classes:
- - system.jenkins.client.job.salt-formulas.git-mirrors.2way
-parameters:
- _param:
- salt_formulas_branches: "master"
- salt_formulas_extra_branches: "master,debian/xenial,debian/trusty"
- salt_formulas_notification_recipients: "ci-notifications@mirantis.com"
+# This file will be removed in Q3
+# jobs was moved into salt-models/infra repo
\ No newline at end of file
diff --git a/jenkins/client/job/salt-formulas/init.yml b/jenkins/client/job/salt-formulas/init.yml
index 8c8c2e2..a713427 100644
--- a/jenkins/client/job/salt-formulas/init.yml
+++ b/jenkins/client/job/salt-formulas/init.yml
@@ -1,17 +1,2 @@
-classes:
- - system.jenkins.client.job.salt-formulas.git-mirrors
- - system.jenkins.client.job.salt-formulas.tests
- - system.jenkins.client.job.salt-formulas.release
-parameters:
- jenkins:
- client:
- view:
- "Salt formulas":
- enabled: true
- type: CategorizedJobsView
- include_regex: "build-debian-salt-formula-.*"
- categories:
- - group_regex: ".*-ubuntu-trusty"
- naming_rule: "Ubuntu Trusty"
- - group_regex: ".*-ubuntu-xenial"
- naming_rule: "Ubuntu Xenial"
+# This file will be removed in Q3
+# jobs was moved into salt-models/infra repo
\ No newline at end of file
diff --git a/jenkins/client/job/salt-formulas/release.yml b/jenkins/client/job/salt-formulas/release.yml
index eca83f6..a713427 100644
--- a/jenkins/client/job/salt-formulas/release.yml
+++ b/jenkins/client/job/salt-formulas/release.yml
@@ -1,32 +1,2 @@
-parameters:
- jenkins:
- client:
- job:
- release-salt-formulas:
- type: workflow-scm
- concurrent: false
- discard:
- build:
- keep_num: 10
- artifact:
- keep_num: 10
- scm:
- type: git
- url: "${_param:jenkins_gerrit_url}/mk/mk-pipelines"
- branch: "${_param:jenkins_pipelines_branch}"
- credentials: "gerrit"
- script: release-salt-formulas-pipeline.groovy
- github:
- url: "https://github.com/salt-formulas/salt-formulas"
- param:
- TAG:
- type: string
- SOURCE_URL:
- type: string
- default: "https://github.com/salt-formulas/salt-formulas.git"
- GERRIT_BASE:
- type: string
- default: "${_param:jenkins_gerrit_url}/salt-formulas"
- CREDENTIALS_ID:
- type: string
- default: "gerrit"
+# This file will be removed in Q3
+# jobs was moved into salt-models/infra repo
\ No newline at end of file
diff --git a/jenkins/client/job/salt-formulas/tests.yml b/jenkins/client/job/salt-formulas/tests.yml
index b5b286d..a713427 100644
--- a/jenkins/client/job/salt-formulas/tests.yml
+++ b/jenkins/client/job/salt-formulas/tests.yml
@@ -1,231 +1,2 @@
-parameters:
- jenkins:
- client:
- job_template:
- test-salt-formula:
- name: test-salt-formula-{{name}}-latest
- jobs:
- - name: aodh
- - name: apache
- - name: aptcacher
- - name: aptly
- - name: artifactory
- - name: auditd
- - name: avinetworks
- - name: backupninja
- - name: barbican
- - name: baremetal-simulator
- - name: billometer
- - name: bind
- - name: bird
- - name: cadf
- - name: calico
- - name: cassandra
- - name: ccp
- - name: ceilometer
- - name: ceph
- - name: chrony
- - name: cinder
- - name: collectd
- - name: designate
- - name: debmirror
- - name: dekapod
- - name: devops-portal
- - name: docker
- - name: dogtag
- - name: dovecot
- - name: elasticsearch
- - name: etcd
- - name: fluentbit
- - name: fluentd
- - name: foreman
- - name: freeipa
- - name: galera
- - name: gerrit
- - name: git
- - name: gitlab
- - name: glance
- - name: glusterfs
- - name: gnocchi
- - name: grafana
- - name: graphite
- - name: haproxy
- - name: heat
- - name: heka
- - name: heketi
- - name: helm
- - name: horizon
- - name: hubble
- - name: influxdb
- - name: iptables
- - name: ironic
- - name: isc-dhcp
- - name: java
- - name: jenkins
- - name: kedb
- - name: keepalived
- - name: keycloak
- - name: keystone
- - name: kibana
- - name: kubernetes
- - name: letsencrypt
- - name: libvirt
- - name: linux
- - name: lldp
- - name: logrotate
- - name: maas
- - name: magnum
- - name: manila
- - name: memcached
- - name: midonet
- - name: mirascan
- - name: monasca
- - name: mongodb
- - name: murano
- - name: mysql
- - name: nagios
- - name: network
- - name: neutron
- - name: nfs
- - name: nginx
- - name: nodejs
- - name: nova
- - name: ntp
- - name: octavia
- - name: opencontrail
- - name: openldap
- - name: openscap
- - name: openssh
- - name: openvpn
- - name: openvstorage
- - name: oslo-templates
- - name: owncloud
- - name: panko
- - name: postfix
- - name: postgresql
- - name: powerdns
- - name: pritunl
- - name: prometheus
- - name: python
- - name: rabbitmq
- - name: reclass
- - name: redis
- - name: roundcube
- - name: rsync
- - name: rsyslog
- - name: rundeck
- - name: runtest
- - name: sahara
- - name: salt
- - name: sensu
- - name: sentry
- - name: shibboleth
- - name: sphinx
- - name: spinnaker
- - name: statsd
- - name: supervisor
- - name: swift
- - name: taiga
- - name: telegraf
- - name: tinyproxy
- - name: tftpd-hpa
- - name: varnish
- - name: watchdog
- - name: xtrabackup
- - name: zookeeper
- template:
- discard:
- build:
- keep_num: 25
- artifact:
- keep_num: 25
- type: workflow-scm
- concurrent: true
- scm:
- type: git
- url: "${_param:jenkins_gerrit_url}/mk/mk-pipelines"
- branch: "${_param:jenkins_pipelines_branch}"
- credentials: "gerrit"
- script: test-salt-formulas-pipeline.groovy
- trigger:
- gerrit:
- project:
- salt-formulas/{{name}}:
- branches:
- - master
- - '2018.8.1'
- event:
- comment:
- - addedContains:
- commentAddedCommentContains: '^(?s:Patch Set \d+:.*(test|recheck|reverify)\s*)$'
- param:
- SALT_VERSION:
- type: string
- default: "2017.7.7"
- description: "Version of salt for use in test, empty string means latest (default)"
- SALT_OPTS:
- type: string
- default: "--force-color"
- CREDENTIALS_ID:
- type: string
- default: "gerrit"
- DEFAULT_GIT_URL:
- type: string
- description: "Run against alternate system reclass"
- default: "${_param:jenkins_gerrit_url}/salt-formulas/{{name}}"
- DEFAULT_GIT_REF:
- type: string
- default: master
- CUSTOM_KITCHEN_ENVS:
- type: text
- PARALLEL_GROUP_SIZE:
- type: string
- default: "8"
- RUN_TEST_IN_DOCKER:
- type: boolean
- description: "Run test stage in docker environment"
- default: 'true'
- SMOKE_TEST_DOCKER_IMG:
- type: string
- default: "ubuntu:16.04"
- job:
- test-salt-formulas-env:
- name: test-salt-formulas-env
- discard:
- build:
- keep_num: 1000
- artifact:
- keep_num: 10
- type: workflow-scm
- concurrent: true
- plugin_properties:
- throttleconcurrents:
- enabled: true
- throttle_option: category
- categories:
- - test-formula
- scm:
- type: git
- url: "${_param:jenkins_gerrit_url}/mk/mk-pipelines"
- branch: "${_param:jenkins_pipelines_branch}"
- credentials: "gerrit"
- script: test-salt-formulas-env.groovy
- param:
- SALT_VERSION:
- type: string
- default: "latest"
- SALT_OPTS:
- type: string
- default: "--force-color"
- CREDENTIALS_ID:
- type: string
- default: "gerrit"
- DEFAULT_GIT_URL:
- type: string
- description: "Run against alternate system reclass"
- default: "${_param:jenkins_gerrit_url}/salt-formulas/{{name}}"
- DEFAULT_GIT_REF:
- type: string
- default: master
- KITCHEN_ENV:
- type: text
+# This file will be removed in Q3
+# jobs was moved into salt-models/infra repo
\ No newline at end of file
diff --git a/jenkins/client/job/salt-models/generate.yml b/jenkins/client/job/salt-models/generate.yml
index c768fb4..783be95 100644
--- a/jenkins/client/job/salt-models/generate.yml
+++ b/jenkins/client/job/salt-models/generate.yml
@@ -20,7 +20,7 @@
type: git
url: "${_param:jenkins_gerrit_url}/mk/mk-pipelines"
branch: "${_param:jenkins_pipelines_branch}"
- credentials: "jenkins-mk"
+ credentials: "gerrit"
script: generate-cookiecutter-products.groovy
param:
# Cookiecutter
diff --git a/jenkins/client/job/salt-models/tests.yml b/jenkins/client/job/salt-models/tests.yml
index 3ec8300..e9ba541 100644
--- a/jenkins/client/job/salt-models/tests.yml
+++ b/jenkins/client/job/salt-models/tests.yml
@@ -245,7 +245,7 @@
type: git
url: "${_param:jenkins_gerrit_url}/mk/mk-pipelines"
branch: "${_param:jenkins_pipelines_branch}"
- credentials: "jenkins-mk"
+ credentials: "gerrit"
script: test-cookiecutter-reclass.groovy
trigger:
gerrit:
diff --git a/jenkins/client/job/test_pipelines.yml b/jenkins/client/job/test_pipelines.yml
index 4d661da..2500254 100644
--- a/jenkins/client/job/test_pipelines.yml
+++ b/jenkins/client/job/test_pipelines.yml
@@ -1,65 +1,2 @@
-parameters:
- _param:
- mcp_docker_registry: 'docker-dev-local.docker.mirantis.net'
- jenkins:
- client:
- job_template:
- test-pipelines:
- name: test-{{name}}
- jobs:
- - name: mk-mk-pipelines
- repo: mk/mk-pipelines
- - name: mcp-ci-pipeline-library
- repo: mcp-ci/pipeline-library
- - name: oss-jenkins-pipelines
- repo: oss/jenkins/pipelines
- - name: map-map-pipelines
- repo: map/map-pipelines
- template:
- discard:
- build:
- keep_num: 25
- artifact:
- keep_num: 25
- type: workflow-scm
- concurrent: true
- scm:
- type: git
- url: "${_param:jenkins_gerrit_url}/mk/mk-pipelines"
- branch: "${_param:jenkins_pipelines_branch}"
- credentials: "gerrit"
- script: test-groovy-pipeline.groovy
- trigger:
- gerrit:
- project:
- "{{repo}}":
- branches:
- - master
- - compare_type: ANT
- name: release/*
- event:
- patchset:
- - created:
- excludeDrafts: false
- excludeTrivialRebase: false
- excludeNoCodeChange: false
- comment:
- - addedContains:
- commentAddedCommentContains: '(recheck|reverify)'
- param:
- CREDENTIALS_ID:
- type: string
- default: "gerrit"
- GRADLE_IMAGE:
- type: string
- default: "${_param:mcp_docker_registry}/mirantis/cicd/niaquinto_gradle"
- GRADLE_CMD:
- type: string
- default: "check --info"
- DEFAULT_GIT_URL:
- type: string
- description: "Run against alternate system reclass"
- default: "${_param:jenkins_gerrit_url}/{{repo}}"
- DEFAULT_GIT_REF:
- type: string
- default: master
+# This file will be removed in Q3
+# jobs was moved into salt-models/infra repo
diff --git a/jenkins/client/job/validate.yml b/jenkins/client/job/validate.yml
index c0ebf40..03082ac 100644
--- a/jenkins/client/job/validate.yml
+++ b/jenkins/client/job/validate.yml
@@ -2,7 +2,6 @@
_param:
jenkins_salt_api_url: "http://${_param:salt_master_host}:6969"
cvp_sanity_default_repo: "https://github.com/Mirantis/cvp-sanity-checks"
- mcp_docker_registry: 'docker-prod-local.artifactory.mirantis.com'
jenkins:
client:
view:
@@ -198,6 +197,14 @@
credentials: "gerrit"
script: cvp-runner.groovy
param:
+ DEBUG_MODE:
+ type: boolean
+ default: 'false'
+ description: Enable if you need to keep container after the test and debug
+ IMAGE:
+ type: string
+ default: 'cvp-sanity-checks'
+ description: Docker image with tests and all pip dependecies to use for testing
SALT_MASTER_URL:
type: string
default: "${_param:jenkins_salt_api_url}"
@@ -255,7 +262,7 @@
description: Credentials to the Salt API
TEST_IMAGE:
type: string
- default: "xrally/xrally-openstack:0.9.2"
+ default: "xrally/xrally-openstack:0.10.1"
description: Docker image to use for running Rally/Tempest
TARGET_NODE:
type: string
@@ -314,7 +321,7 @@
description: Node where container with tempest will be run
TEST_IMAGE:
type: string
- default: "xrally/xrally-openstack:0.9.2"
+ default: "xrally/xrally-openstack:0.10.1"
description: Docker image to use for running Rally/Tempest
TARGET_NODES:
type: string
@@ -378,7 +385,7 @@
description: Path to scenario file in container
TEST_IMAGE:
type: string
- default: "xrally/xrally-openstack:0.9.2"
+ default: "xrally/xrally-openstack:0.10.1"
description: Docker image to use for running Rally/Tempest
SALT_MASTER_URL:
type: string
@@ -415,7 +422,7 @@
url: "${_param:jenkins_gerrit_url}/mk/mk-pipelines"
branch: "${_param:jenkins_pipelines_branch}"
credentials: "gerrit"
- script: cvp-runner.groovy
+ script: cvp-stacklight.groovy
param:
SALT_MASTER_URL:
type: string
@@ -455,8 +462,16 @@
url: "${_param:jenkins_gerrit_url}/mk/mk-pipelines"
branch: "${_param:jenkins_pipelines_branch}"
credentials: "gerrit"
- script: cvp-spt.groovy
+ script: cvp-runner.groovy
param:
+ DEBUG_MODE:
+ type: boolean
+ default: 'false'
+ description: Enable if you need to keep container after the test and debug
+ IMAGE:
+ type: string
+ default: 'cvp-spt'
+ description: Docker image with tests and all pip dependecies to use for testing
SALT_MASTER_URL:
type: string
default: "${_param:jenkins_salt_api_url}"
diff --git a/keystone/server/cluster.yml b/keystone/server/cluster.yml
index a42d3b6..f83b039 100644
--- a/keystone/server/cluster.yml
+++ b/keystone/server/cluster.yml
@@ -11,11 +11,6 @@
_param:
keystone_tokens_expiration: 3600
openstack_node_role: primary
- openstack_mysql_x509_enabled: False
- openstack_rabbitmq_x509_enabled: False
- galera_ssl_enabled: False
- rabbitmq_ssl_enabled: False
- openstack_rabbitmq_port: 5672
linux:
system:
package:
diff --git a/keystone/server/single.yml b/keystone/server/single.yml
index 10a5331..cbfeb40 100644
--- a/keystone/server/single.yml
+++ b/keystone/server/single.yml
@@ -13,11 +13,6 @@
mysql_keystone_password: password
keystone_tokens_expiration: 3600
openstack_node_role: primary
- openstack_mysql_x509_enabled: False
- openstack_rabbitmq_x509_enabled: False
- galera_ssl_enabled: False
- rabbitmq_ssl_enabled: False
- openstack_rabbitmq_port: 5672
linux:
system:
package:
diff --git a/kubernetes/common/init.yml b/kubernetes/common/init.yml
index 1ecec2d..8028f51 100644
--- a/kubernetes/common/init.yml
+++ b/kubernetes/common/init.yml
@@ -1,6 +1,5 @@
parameters:
_param:
- mcp_docker_registry: 'docker-prod-local.artifactory.mirantis.com'
kubernetes_calico_calicoctl_repo: ${_param:mcp_docker_registry}/mirantis/projectcalico/calico
kubernetes_calico_repo: ${_param:mcp_docker_registry}/mirantis/projectcalico/calico
kubernetes_calico_cni_repo: ${_param:mcp_docker_registry}/mirantis/projectcalico/calico
@@ -22,6 +21,7 @@
kubernetes_coredns_repo: ${_param:mcp_docker_registry}/mirantis/coredns
kubernetes_ingressnginx_repo: ${_param:mcp_docker_registry}/mirantis/kubernetes-ingress-nginx
kubernetes_corends_etcd_operator_repo: quay.io/coreos
+ kubernetes_containerd_repo: https://github.com/kubernetes-sigs/cri-tools/releases/download
# component docker images
kubernetes_docker_package: docker-engine=1.13.1-0~ubuntu-xenial
@@ -57,6 +57,8 @@
kubernetes_coredns_image: ${_param:kubernetes_coredns_repo}/coredns:v1.2.2-12
kubernetes_ingressnginx_controller_image: ${_param:kubernetes_ingressnginx_repo}/nginx-ingress-controller-amd64:nginx-0.19.0-1
kubernetes_corends_etcd_operator_image: ${_param:kubernetes_corends_etcd_operator_repo}/etcd-operator:v0.9.2
+ kubernetes_containerd_source: ${_param:kubernetes_containerd_repo}/v1.12.0/crictl-v1.12.0-linux-amd64.tar.gz
+ kubernetes_containerd_source_hash: md5=ff60b9ddfa5617f7ed14b3f3b6a60056
kubelet_fail_on_swap: true
kubernetes_dashboard_enabled: true
@@ -75,6 +77,7 @@
kubernetes_sriov_enabled: false
kubernetes_telegraf_enabled: false
kubernetes_ingressnginx_enabled: false
+ kubernetes_containerd_enabled: false
kubernetes_ingressnginx_controller_replicas: 1
@@ -106,6 +109,11 @@
kubernetes:
common:
+ containerd:
+ enabled: ${_param:kubernetes_containerd_enabled}
+ crictl:
+ source: ${_param:kubernetes_containerd_source}
+ hash: ${_param:kubernetes_containerd_source_hash}
hyperkube:
image: ${_param:kubernetes_hyperkube_image}
pause_image: ${_param:kubernetes_pause_image}
diff --git a/linux/system/repo/keystorage/mirantis_com/mirror_mirantis.yml b/linux/system/repo/keystorage/mirantis_com/mirror_mirantis.yml
index 9b08546..d0c9368 100644
--- a/linux/system/repo/keystorage/mirantis_com/mirror_mirantis.yml
+++ b/linux/system/repo/keystorage/mirantis_com/mirror_mirantis.yml
@@ -1,11 +1,42 @@
parameters:
_param:
- # pub 2048R/4C5289EF 2018-07-25
+ # pub 2048R/1FA22B08 2015-07-21
+ # pub 2048R/4C5289EF 2018-07-25 - pike +
# https://mirror.mirantis.com
linux_system_repo_mirror_mirantis_key: |-
-----BEGIN PGP PUBLIC KEY BLOCK-----
Version: GnuPG v1
+ mQENBFWt8ogBCACtT/j4WMGuhEI486Vv9zVV0GWGefHE5hBlgJSjSgrExLFqQ2Fo
+ ScaABCfvzUeuXHNoh/c2eLjx3YE6oFrdiw5tam0NFlZMM+PSufciTxQz8vrXHGx7
+ VB5rg2TXKoqOv9cW690FsRAeOtKTtBxZvYVTLEPn2GJW09Xy9CBa+n23XBHTBvKs
+ j3hxkn25Oy70Wgxk/BJqpynXGno+NzuAnIbb+f+X7i6fiXwrvtp5zOYOJeUwS+fU
+ IM/mXbetOd/sHtJqc9NUYpTip4nElEqAYRCsXDTbuMNdzSr8VlSMM8b61mBGelLH
+ XJe+EPP+Logc5KXO8adoGgWhqlbD6n7w+ynHABEBAAG0LmZ1ZWwtaW5mcmEgKEV4
+ YW1wbGUga2V5KSA8ZGV2b3BzQG1pcmFudGlzLmNvbT6JATgEEwECACIFAlWt8ogC
+ GwMGCwkIBwMCBhUIAgkKCwQWAgMBAh4BAheAAAoJELzlzEYfoisIkuQIAJl0cFJ5
+ BSKMXHhRYf0BeDzhdh3pmcOXs/jSznTIxB4OE5OdwrMgKyoIkSIP8AEttvB+BuOv
+ BHmhTL7kvRhP5xiKdbCwmDtoERoaqxhRRbZJcJ+pHvl7mkEu8Gj2KZe2lfE4Z6ZF
+ 6q00Gx9HYfse1+VgUR5ymh41nZCvRTNEnYBp1RQcPogiLy2rYvZbxYnUtg4jaD7D
+ vuuEQwrfEHdKFUlWBCIVbl+e3K6ZSniOcqqyHK72/HI0SYuZpGfCzzw5deODcjWm
+ Gz4nZr41cB3eHXkfmG3ngdhmb2MpVr83u+JebOovjzusf71oIdZBTFNYsZNSVKrn
+ l0rrRuDIMHbQMuS5AQ0EVa3yiAEIALZqdLGXSGZAgUXl7zhPH5wnIQtdo6iMIovZ
+ zQNW95RDT2nm/3YddiRy6FuOTbaHXw07D4ZUl4dGVHzEwBllhULxcHV3OOdQ3gVp
+ 4mBAZ8kv0EelzqPfDQWR2Cq0hi7IJ4Q4ePpZhQFiasz8qbV7D7CYbZdDAmQKxqAk
+ 0XYOjbB3jzB2r6MHflAKmJzTp3+NAE9bDLAwXa0ot2THDbpPdB4R6pxpD6Y3jweW
+ uLUCnIfvyIBwhHobaU28pw/BA+0dkC9jnLnoO+TrzB9YD5839Lc3ctrdPBLiFPMG
+ wdfAVRCyfgLjOyULqjTudx1Mo+Dgz9+xrcTFoehI7UYoZnraEKkAEQEAAYkBHwQY
+ AQIACQUCVa3yiAIbDAAKCRC85cxGH6IrCPH5B/0Uc+OhMSCkRos1Yv5tA4bsEcjt
+ 8+sJ2S6pUqCbZxmXpzKspKpnjp3DJjmQKDB2q4UPDVElVDMMdBlstTx1RRZDf8yk
+ nDvRBSzawk7Xhfloro8N2Lxv6gWhhMvHUYItyO6KMbAZuZ2M1I1/OFHG/f//7oPM
+ 0QpNbihf+GqE/dWRz9ZDz+xlSFli6AR/3ldq7N6gkCsEFdi3j6ZDf0qLsZpazPUI
+ wiCC/aAYLkRDtTJV1G6EsWijmOTNNlCEFS/XDLQ3N2Ev/1sgAO0AlBMdXqSnqUI1
+ 1h/eSKCiGmkwFWlCf/4HnJVP7QpSeRPLyw785Fvt3p9vT+64isZ0ZK6cpcj8
+ =0aQD
+ -----END PGP PUBLIC KEY BLOCK-----
+ -----BEGIN PGP PUBLIC KEY BLOCK-----
+ Version: GnuPG v1
+
mQENBFtYVY8BCAC3oli93husG0ZVtv/L8I4/bcW60LFCyB0DuwEznGlSaj1fjOQu
C7QX9wvGRq8mRZ8mfZ6sbxGmgs0LnV5QIBle1l5I3B+AMGksf6UGEWgoN/vq86g+
0Jg6kJP/D0sjGXvdlfy+bgAqjsx2bWOLjQGtHSIxhe4cE9HPBfMiYsFwGQua3XN3
diff --git a/linux/system/repo/mcp/apt_mirantis/openstack.yml b/linux/system/repo/mcp/apt_mirantis/openstack.yml
index ae259af..c1483ac 100644
--- a/linux/system/repo/mcp/apt_mirantis/openstack.yml
+++ b/linux/system/repo/mcp/apt_mirantis/openstack.yml
@@ -1,24 +1,38 @@
classes:
- system.linux.system.repo.keystorage.mirantis_com
parameters:
- _param:
- linux_system_repo_mk_openstack_version: ${_param:apt_mk_version}
linux:
system:
repo:
mirantis_openstack:
- source: "deb [arch=amd64] http://apt.mirantis.com/${_param:linux_system_codename}/openstack/${_param:openstack_version} ${_param:linux_system_repo_mk_openstack_version} main"
- architectures: amd64
- key: ${_param:linux_system_repo_apt_mirantis_key}
+ source: "deb ${_param:linux_system_repo_mirantis_openstack_url}/${_param:linux_system_codename} ${_param:linux_system_codename} main"
+ key: ${_param:linux_system_repo_mirror_mirantis_key}
+ architectures: ${_param:linux_system_architecture}
+ clean_file: true
pin:
- - pin: 'release l=${_param:openstack_version}'
+ - pin: 'release o=Mirantis'
priority: 1100
package: '*'
- mk_openstack:
- source: "deb [arch=amd64] http://apt.mirantis.com/${_param:linux_system_codename}/ ${_param:linux_system_repo_mk_openstack_version} ${_param:openstack_version}"
- architectures: amd64
- key: ${_param:linux_system_repo_apt_mirantis_key}
- pin:
- - pin: 'release l=${_param:linux_system_repo_mk_openstack_version}'
- priority: 1100
- package: '*'
+# DEPRECATED since 2018.10+ release.
+#parameters:
+# _param:
+# linux_system_repo_mk_openstack_version: ${_param:apt_mk_version}
+# linux:
+# system:
+# repo:
+# mirantis_openstack:
+# source: "deb [arch=amd64] http://apt.mirantis.com/${_param:linux_system_codename}/openstack/${_param:openstack_version} ${_param:linux_system_repo_mk_openstack_version} main"
+# architectures: amd64
+# key: ${_param:linux_system_repo_apt_mirantis_key}
+# pin:
+# - pin: 'release l=${_param:openstack_version}'
+# priority: 1100
+# package: '*'
+# mk_openstack:
+# source: "deb [arch=amd64] http://apt.mirantis.com/${_param:linux_system_codename}/ ${_param:linux_system_repo_mk_openstack_version} ${_param:openstack_version}"
+# architectures: amd64
+# key: ${_param:linux_system_repo_apt_mirantis_key}
+# pin:
+# - pin: 'release l=${_param:linux_system_repo_mk_openstack_version}'
+# priority: 1100
+# package: '*'
diff --git a/linux/system/repo/mcp/mirror/v1/openstack.yml b/linux/system/repo/mcp/mirror/v1/openstack.yml
deleted file mode 100644
index 8a9a3a7..0000000
--- a/linux/system/repo/mcp/mirror/v1/openstack.yml
+++ /dev/null
@@ -1,15 +0,0 @@
-classes:
-- system.linux.system.repo.keystorage.mirantis_com
-parameters:
- linux:
- system:
- repo:
- mirantis_openstack:
- source: "deb ${_param:linux_system_repo_mirantis_openstack_url}/${_param:linux_system_codename} ${_param:linux_system_codename} main"
- key: ${_param:linux_system_repo_mirror_mirantis_key}
- architectures: ${_param:linux_system_architecture}
- clean_file: true
- pin:
- - pin: 'release o=Mirantis'
- priority: 1100
- package: '*'
diff --git a/linux/system/repo/mcp/mirror/v1/openstack.yml b/linux/system/repo/mcp/mirror/v1/openstack.yml
new file mode 120000
index 0000000..d53dbf7
--- /dev/null
+++ b/linux/system/repo/mcp/mirror/v1/openstack.yml
@@ -0,0 +1 @@
+../../apt_mirantis/openstack.yml
\ No newline at end of file
diff --git a/manila/common/cluster.yml b/manila/common/cluster.yml
index ad1254b..71d848d 100644
--- a/manila/common/cluster.yml
+++ b/manila/common/cluster.yml
@@ -4,12 +4,7 @@
- system.salt.minion.cert.rabbitmq.clients.openstack.manila
parameters:
_param:
- openstack_mysql_x509_enabled: False
- galera_ssl_enabled: False
manila_cluster_vip_address: ${_param:cluster_vip_address}
- openstack_rabbitmq_x509_enabled: False
- rabbitmq_ssl_enabled: False
- openstack_rabbitmq_port: 5672
cluster_internal_protocol: 'http'
manila:
common:
diff --git a/manila/common/single.yml b/manila/common/single.yml
index c5a6f97..2ff514b 100644
--- a/manila/common/single.yml
+++ b/manila/common/single.yml
@@ -4,11 +4,6 @@
- system.salt.minion.cert.rabbitmq.clients.openstack.manila
parameters:
_param:
- openstack_mysql_x509_enabled: False
- galera_ssl_enabled: False
- openstack_rabbitmq_x509_enabled: False
- rabbitmq_ssl_enabled: False
- openstack_rabbitmq_port: 5672
cluster_internal_protocol: 'http'
manila:
common:
diff --git a/neutron/client/service/ironic.yml b/neutron/client/service/ironic.yml
index 6c5744a..e0814cd 100644
--- a/neutron/client/service/ironic.yml
+++ b/neutron/client/service/ironic.yml
@@ -1,11 +1,6 @@
classes:
- service.neutron.client
parameters:
- _param:
- # TODO Remove below variables with typo in next release
- openstack_baremetal_neutron_subnet_cidr: ${_param:openstack_baremeta_neutron_subnet_cidr}
- openstack_baremetal_neutron_subnet_allocation_start: ${_param:openstack_baremeta_neutron_subnet_allocation_start}
- openstack_baremetal_neutron_subnet_allocation_end: ${_param:openstack_baremeta_neutron_subnet_allocation_end}
neutron:
client:
server:
diff --git a/neutron/compute/cluster.yml b/neutron/compute/cluster.yml
index 92e3a2e..a9cf9c1 100644
--- a/neutron/compute/cluster.yml
+++ b/neutron/compute/cluster.yml
@@ -7,9 +7,6 @@
neutron_enable_vlan_aware_vms: False
neutron_enable_bgp_vpn: False
neutron_bgp_vpn_driver: bagpipe
- openstack_rabbitmq_x509_enabled: False
- rabbitmq_ssl_enabled: False
- openstack_rabbitmq_port: 5672
linux:
system:
package:
diff --git a/neutron/control/cluster.yml b/neutron/control/cluster.yml
index ceaed1d..52a91ea 100644
--- a/neutron/control/cluster.yml
+++ b/neutron/control/cluster.yml
@@ -9,11 +9,6 @@
parameters:
_param:
cluster_internal_protocol: 'http'
- openstack_mysql_x509_enabled: False
- openstack_rabbitmq_x509_enabled: False
- galera_ssl_enabled: False
- rabbitmq_ssl_enabled: False
- openstack_rabbitmq_port: 5672
linux:
system:
package:
diff --git a/neutron/control/single.yml b/neutron/control/single.yml
index 27d16e1..40bdea3 100644
--- a/neutron/control/single.yml
+++ b/neutron/control/single.yml
@@ -6,11 +6,6 @@
parameters:
_param:
internal_protocol: 'http'
- openstack_mysql_x509_enabled: False
- openstack_rabbitmq_x509_enabled: False
- galera_ssl_enabled: False
- rabbitmq_ssl_enabled: False
- openstack_rabbitmq_port: 5672
linux:
system:
package:
diff --git a/neutron/gateway/cluster.yml b/neutron/gateway/cluster.yml
index 03ab583..8f84fa1 100644
--- a/neutron/gateway/cluster.yml
+++ b/neutron/gateway/cluster.yml
@@ -5,9 +5,6 @@
_param:
neutron_enable_qos: False
neutron_enable_vlan_aware_vms: False
- openstack_rabbitmq_x509_enabled: False
- rabbitmq_ssl_enabled: False
- openstack_rabbitmq_port: 5672
linux:
system:
kernel:
diff --git a/nova/compute/cluster.yml b/nova/compute/cluster.yml
index b281f4d..3a1314d 100644
--- a/nova/compute/cluster.yml
+++ b/nova/compute/cluster.yml
@@ -37,9 +37,6 @@
SG9MrLHCd5l60aCUQg0UA5ed7Hd6SA314k+HwxJno9/wJ+voBeacMg==
-----END RSA PRIVATE KEY-----
cluster_internal_protocol: 'http'
- openstack_rabbitmq_x509_enabled: False
- rabbitmq_ssl_enabled: False
- openstack_rabbitmq_port: 5672
openssh:
client:
enabled: True
diff --git a/nova/compute/single.yml b/nova/compute/single.yml
index 32d5087..aff1bd3 100644
--- a/nova/compute/single.yml
+++ b/nova/compute/single.yml
@@ -37,9 +37,6 @@
SG9MrLHCd5l60aCUQg0UA5ed7Hd6SA314k+HwxJno9/wJ+voBeacMg==
-----END RSA PRIVATE KEY-----
cluster_internal_protocol: 'http'
- openstack_rabbitmq_x509_enabled: False
- rabbitmq_ssl_enabled: False
- openstack_rabbitmq_port: 5672
openssh:
client:
enabled: True
diff --git a/nova/control/cluster.yml b/nova/control/cluster.yml
index 3f0a644..31f2d6e 100644
--- a/nova/control/cluster.yml
+++ b/nova/control/cluster.yml
@@ -14,11 +14,6 @@
nova_disk_allocation_ratio: 1.0
metadata_password: metadataPass
cluster_internal_protocol: 'http'
- openstack_mysql_x509_enabled: False
- galera_ssl_enabled: False
- openstack_rabbitmq_x509_enabled: False
- rabbitmq_ssl_enabled: False
- openstack_rabbitmq_port: 5672
linux:
system:
package:
diff --git a/nova/control/single.yml b/nova/control/single.yml
index 2a28cc7..07c8dc2 100644
--- a/nova/control/single.yml
+++ b/nova/control/single.yml
@@ -5,11 +5,6 @@
parameters:
_param:
cluster_internal_protocol: 'http'
- openstack_mysql_x509_enabled: False
- galera_ssl_enabled: False
- openstack_rabbitmq_x509_enabled: False
- rabbitmq_ssl_enabled: False
- openstack_rabbitmq_port: 5672
linux:
system:
package:
diff --git a/opencontrail/control/analytics4_0.yml b/opencontrail/control/analytics4_0.yml
index b779aed..bfdbadb 100644
--- a/opencontrail/control/analytics4_0.yml
+++ b/opencontrail/control/analytics4_0.yml
@@ -6,7 +6,6 @@
- system.haproxy.proxy.listen.opencontrail.analytics
parameters:
_param:
- mcp_docker_registry: 'docker-prod-local.artifactory.mirantis.com'
opencontrail_kafka_log_cleanup_mtime: '+7'
opencontrail_kafka_log_cleanup_dir: '/usr/share/kafka/logs/'
opencontrail_version: 4.0
diff --git a/opencontrail/control/cluster4_0.yml b/opencontrail/control/cluster4_0.yml
index c97196f..acd6a0b 100644
--- a/opencontrail/control/cluster4_0.yml
+++ b/opencontrail/control/cluster4_0.yml
@@ -6,7 +6,6 @@
- system.haproxy.proxy.listen.opencontrail.analytics
parameters:
_param:
- mcp_docker_registry: 'docker-prod-local.artifactory.mirantis.com'
opencontrail_kafka_log_cleanup_mtime: '+7'
opencontrail_kafka_log_cleanup_dir: '/usr/share/kafka/logs/'
opencontrail_version: 4.0
diff --git a/opencontrail/control/control4_0.yml b/opencontrail/control/control4_0.yml
index 123392c..782e2cb 100644
--- a/opencontrail/control/control4_0.yml
+++ b/opencontrail/control/control4_0.yml
@@ -5,7 +5,6 @@
- system.haproxy.proxy.listen.opencontrail.control
parameters:
_param:
- mcp_docker_registry: 'docker-prod-local.artifactory.mirantis.com'
opencontrail_version: 4.0
linux_repo_contrail_component: oc40
opencontrail_image_tag: latest
diff --git a/opencontrail/control/single4_0.yml b/opencontrail/control/single4_0.yml
index 9826b28..1288af4 100644
--- a/opencontrail/control/single4_0.yml
+++ b/opencontrail/control/single4_0.yml
@@ -4,7 +4,6 @@
- service.haproxy.proxy.single
parameters:
_param:
- mcp_docker_registry: 'docker-prod-local.artifactory.mirantis.com'
opencontrail_kafka_log_cleanup_mtime: '+7'
opencontrail_kafka_log_cleanup_dir: '/usr/share/kafka/logs/'
opencontrail_version: 4.0
diff --git a/openscap/server/init.yml b/openscap/server/init.yml
index 0f2a76f..7964aea 100644
--- a/openscap/server/init.yml
+++ b/openscap/server/init.yml
@@ -1,2 +1,8 @@
classes:
- service.openscap.cis
+parameters:
+ _param:
+ openscap_enabled: true
+ openscap:
+ service:
+ enabled: ${_param:openscap_enabled}
diff --git a/panko/server/cluster.yml b/panko/server/cluster.yml
index 7954944..354ac58 100644
--- a/panko/server/cluster.yml
+++ b/panko/server/cluster.yml
@@ -12,8 +12,6 @@
panko_memcached_node03_address: ${_param:cluster_node03_address}
# Keep events in database for 30 days
panko_event_time_to_live: 2592000
- openstack_mysql_x509_enabled: False
- galera_ssl_enabled: False
linux:
system:
cron:
diff --git a/panko/server/single.yml b/panko/server/single.yml
index 968267c..5e91db1 100644
--- a/panko/server/single.yml
+++ b/panko/server/single.yml
@@ -6,8 +6,6 @@
_param:
# Keep events in database for 30 days
panko_event_time_to_live: 2592000
- openstack_mysql_x509_enabled: False
- galera_ssl_enabled: False
linux:
system:
cron:
diff --git a/prometheus/gainsight/query/openstack.yml b/prometheus/gainsight/query/openstack.yml
index 34c81c3..877ad32 100644
--- a/prometheus/gainsight/query/openstack.yml
+++ b/prometheus/gainsight/query/openstack.yml
@@ -2,17 +2,17 @@
prometheus:
gainsight:
queries:
- vcpu_used: "'vCPU Used','sum(avg_over_time(openstack_nova_used_vcpus[24h]))'"
- vcpu_free: "'vCPU Free','sum(avg_over_time(openstack_nova_free_vcpus[24h]))'"
- vstorage_used: "'vStorage Used','sum(avg_over_time(openstack_nova_used_disk[24h]))'"
- vstorage_free: "'vStorage Free','sum(avg_over_time(openstack_nova_free_disk[24h]))'"
- vram_used: "'vRAM Used','sum(avg_over_time(openstack_nova_used_ram[24h]))'"
- vram_free: "'vRAM Free','sum(avg_over_time(openstack_nova_free_ram[24h]))'"
- instances: "'Instances','sum(avg_over_time(openstack_nova_instances[24h]))'"
- compute_nodes: "'Compute Nodes','sum(openstack_nova_services{service=~\"nova.compute\"})'"
- tenants: "'Tenants','sum(avg_over_time(openstack_keystone_tenants_total[24h]))'"
- cinder_api: "'Cinder API','avg(avg_over_time(openstack_api_check_status{service=\"cinderv2\"}[24h]))'"
- nova_api: "'Nova API','avg(avg_over_time(openstack_api_check_status{service=\"nova\"}[24h]))'"
- keystone_api: "'Keystone API','avg(avg_over_time(openstack_api_check_status{service=\"keystone\"}[24h]))'"
- glance_api: "'Glance API','avg(avg_over_time(openstack_api_check_status{service=\"glance\"}[24h]))'"
- neutron_api: "'Neutron API','avg(avg_over_time(openstack_api_check_status{service=\"neutron\"}[24h]))'"
+ vcpu_used: "'vCPU Used','avg(sum(avg_over_time(openstack_nova_used_vcpus[24h])) by (instance))'"
+ vcpu_free: "'vCPU Free','avg(sum(avg_over_time(openstack_nova_free_vcpus[24h])) by (instance))'"
+ vstorage_used: "'vStorage Used','avg(sum(avg_over_time(openstack_nova_used_disk[24h])) by (instance))'"
+ vstorage_free: "'vStorage Free','avg(sum(avg_over_time(openstack_nova_free_disk[24h])) by (instance))'"
+ vram_used: "'vRAM Used','avg(sum(avg_over_time(openstack_nova_used_ram[24h])) by (instance))'"
+ vram_free: "'vRAM Free','avg(sum(avg_over_time(openstack_nova_free_ram[24h])) by (instance))'"
+ instances: "'Active Instances','avg(sum(avg_over_time(openstack_nova_instances{state=\"active\"}[24h])) by (instance))'"
+ compute_nodes: "'Compute Nodes','avg(sum(openstack_nova_services{binary=~\"nova.compute\"}) by (instance))'"
+ tenants: "'Tenants','avg(sum(avg_over_time(openstack_keystone_tenants_total[24h])) by (instance))'"
+ cinder_api: "'Cinder API','avg(avg_over_time(openstack_api_check_status{name=\"cinderv2\"}[24h]))'"
+ nova_api: "'Nova API','avg(avg_over_time(openstack_api_check_status{name=\"nova\"}[24h]))'"
+ keystone_api: "'Keystone API','avg(avg_over_time(openstack_api_check_status{name=\"keystone\"}[24h]))'"
+ glance_api: "'Glance API','avg(avg_over_time(openstack_api_check_status{name=\"glance\"}[24h]))'"
+ neutron_api: "'Neutron API','avg(avg_over_time(openstack_api_check_status{name=\"neutron\"}[24h]))'"
diff --git a/rabbitmq/server/ssl/init.yml b/rabbitmq/server/ssl/init.yml
index 961d28d..06962d1 100644
--- a/rabbitmq/server/ssl/init.yml
+++ b/rabbitmq/server/ssl/init.yml
@@ -2,10 +2,6 @@
- system.salt.minion.cert.rabbitmq_server
- service.rabbitmq.server.ssl
parameters:
- _param:
- rabbitmq_ssl_enabled: true
- openstack_rabbitmq_x509_enabled: false
- openstack_rabbitmq_port: 5671 # for non-ssl use 5672 / for ssl 5671
rabbitmq:
server:
ssl:
diff --git a/rundeck/client/project/cicd.yml b/rundeck/client/project/cicd.yml
index 6038fcc..e09d9f1 100644
--- a/rundeck/client/project/cicd.yml
+++ b/rundeck/client/project/cicd.yml
@@ -1,6 +1,5 @@
parameters:
_param:
- mcp_docker_registry: 'docker-prod-local.artifactory.mirantis.com'
rundeck_cis_jobs_repository: https://gerrit.mcp.mirantis.net/oss/rundeck-cis-jobs
rundeck_cis_jobs_revision: master
rundeck_cis_elasticsearch_url: yourelastic:9200