Merge "Adding watchdog"
diff --git a/gnocchi/server/cluster.yml b/gnocchi/server/cluster.yml
index bbae551..062b60e 100644
--- a/gnocchi/server/cluster.yml
+++ b/gnocchi/server/cluster.yml
@@ -5,6 +5,21 @@
- system.haproxy.proxy.listen.openstack.gnocchi
- system.keepalived.cluster.instance.openstack_telemetry_vip
parameters:
+ _param:
+ gnocchi_memcached_node01_address: ${_param:cluster_node01_address}
+ gnocchi_memcached_node02_address: ${_param:cluster_node02_address}
+ gnocchi_memcached_node03_address: ${_param:cluster_node03_address}
gnocchi:
server:
enable_proxy_headers_parsing: true
+ identity:
+ host: ${_param:openstack_control_address}
+ cache:
+ engine: memcached
+ members:
+ - host: ${_param:gnocchi_memcached_node01_address}
+ port: 11211
+ - host: ${_param:gnocchi_memcached_node02_address}
+ port: 11211
+ - host: ${_param:gnocchi_memcached_node03_address}
+ port: 11211
diff --git a/jenkins/client/job/debian/packages/salt.yml b/jenkins/client/job/debian/packages/salt.yml
index 8bb7c79..ad35faa 100644
--- a/jenkins/client/job/debian/packages/salt.yml
+++ b/jenkins/client/job/debian/packages/salt.yml
@@ -7,672 +7,895 @@
jobs:
- name: aodh
upload_source_package: false
+ upload_to_aptly: true
dist: trusty
- name: apache
upload_source_package: false
+ upload_to_aptly: true
dist: trusty
- name: aptcacher
upload_source_package: false
+ upload_to_aptly: true
dist: trusty
- name: aptly
upload_source_package: false
+ upload_to_aptly: true
dist: trusty
- name: artifactory
upload_source_package: false
+ upload_to_aptly: true
dist: trusty
- name: avinetworks
upload_source_package: false
+ upload_to_aptly: true
dist: trusty
- name: backupninja
upload_source_package: false
+ upload_to_aptly: true
dist: trusty
- name: baremetal-simulator
upload_source_package: false
+ upload_to_aptly: true
dist: trusty
- name: billometer
upload_source_package: false
+ upload_to_aptly: true
dist: trusty
- name: bind
upload_source_package: false
+ upload_to_aptly: true
dist: trusty
- name: bird
upload_source_package: false
+ upload_to_aptly: true
dist: trusty
- name: cadf
upload_source_package: false
+ upload_to_aptly: true
dist: trusty
- name: calico
upload_source_package: false
+ upload_to_aptly: true
dist: trusty
- name: cassandra
upload_source_package: false
+ upload_to_aptly: true
dist: trusty
- name: ccp
upload_source_package: false
+ upload_to_aptly: true
dist: trusty
- name: ceph
upload_source_package: false
+ upload_to_aptly: true
dist: trusty
- name: chrony
upload_source_package: false
+ upload_to_aptly: true
dist: trusty
- name: collectd
upload_source_package: false
+ upload_to_aptly: true
dist: trusty
- name: debmirror
upload_source_package: true
+ upload_to_aptly: true
dist: trusty
- name: dekapod
upload_source_package: false
+ upload_to_aptly: true
dist: trusty
- name: designate
upload_source_package: false
+ upload_to_aptly: true
dist: trusty
- name: devops-portal
upload_source_package: false
+ upload_to_aptly: true
dist: trusty
- name: docker
upload_source_package: false
+ upload_to_aptly: true
dist: trusty
- name: dogtag
upload_source_package: false
+ upload_to_aptly: true
dist: trusty
- name: dovecot
upload_source_package: false
+ upload_to_aptly: true
dist: trusty
- name: elasticsearch
upload_source_package: false
+ upload_to_aptly: true
dist: trusty
- name: etcd
upload_source_package: false
+ upload_to_aptly: true
dist: trusty
- name: fluentbit
upload_source_package: false
+ upload_to_aptly: true
dist: trusty
- name: fluentd
upload_source_package: false
+ upload_to_aptly: true
dist: trusty
- name: foreman
upload_source_package: false
+ upload_to_aptly: true
dist: trusty
- name: freeipa
upload_source_package: false
+ upload_to_aptly: true
dist: trusty
- name: galera
upload_source_package: false
+ upload_to_aptly: true
dist: trusty
- name: gerrit
upload_source_package: false
+ upload_to_aptly: true
dist: trusty
- name: git
upload_source_package: false
+ upload_to_aptly: true
dist: trusty
- name: gitlab
upload_source_package: false
+ upload_to_aptly: true
dist: trusty
- name: glusterfs
upload_source_package: false
+ upload_to_aptly: true
dist: trusty
- name: grafana
upload_source_package: false
+ upload_to_aptly: true
dist: trusty
- name: graphite
upload_source_package: false
+ upload_to_aptly: true
dist: trusty
- name: haproxy
upload_source_package: false
+ upload_to_aptly: true
dist: trusty
- name: heka
upload_source_package: false
+ upload_to_aptly: true
dist: trusty
- name: heketi
upload_source_package: true
+ upload_to_aptly: true
dist: trusty
- name: influxdb
upload_source_package: false
+ upload_to_aptly: true
dist: trusty
- name: iptables
upload_source_package: false
+ upload_to_aptly: true
dist: trusty
- name: ironic
upload_source_package: false
+ upload_to_aptly: true
dist: trusty
- name: isc-dhcp
upload_source_package: false
+ upload_to_aptly: true
dist: trusty
- name: java
upload_source_package: false
+ upload_to_aptly: true
dist: trusty
- name: jenkins
upload_source_package: false
+ upload_to_aptly: true
dist: trusty
- name: kedb
upload_source_package: false
+ upload_to_aptly: true
dist: trusty
- name: keepalived
upload_source_package: false
+ upload_to_aptly: true
dist: trusty
- name: kibana
upload_source_package: false
+ upload_to_aptly: true
dist: trusty
- name: letsencrypt
upload_source_package: false
+ upload_to_aptly: true
dist: trusty
- name: libvirt
upload_source_package: false
+ upload_to_aptly: true
dist: trusty
- name: linux
upload_source_package: false
+ upload_to_aptly: true
dist: trusty
- name: lldp
upload_source_package: false
+ upload_to_aptly: true
dist: trusty
- name: logrotate
upload_source_package: false
+ upload_to_aptly: true
dist: trusty
- name: maas
upload_source_package: false
+ upload_to_aptly: true
dist: trusty
- name: magnum
upload_source_package: false
+ upload_to_aptly: true
dist: trusty
- name: manila
upload_source_package: false
+ upload_to_aptly: true
dist: trusty
- name: memcached
upload_source_package: false
+ upload_to_aptly: true
dist: trusty
- name: mirascan
upload_source_package: false
+ upload_to_aptly: true
dist: trusty
- name: midonet
upload_source_package: false
+ upload_to_aptly: true
dist: trusty
- name: monasca
upload_source_package: false
+ upload_to_aptly: true
dist: trusty
- name: mongodb
upload_source_package: false
+ upload_to_aptly: true
dist: trusty
- name: murano
upload_source_package: false
+ upload_to_aptly: true
dist: trusty
- name: mysql
upload_source_package: false
+ upload_to_aptly: true
dist: trusty
- name: nagios
upload_source_package: false
+ upload_to_aptly: true
dist: trusty
- name: network
upload_source_package: false
+ upload_to_aptly: true
dist: trusty
- name: nfs
upload_source_package: false
+ upload_to_aptly: true
dist: trusty
- name: nginx
upload_source_package: false
+ upload_to_aptly: true
dist: trusty
- name: nodejs
upload_source_package: false
+ upload_to_aptly: true
dist: trusty
- name: ntp
upload_source_package: false
+ upload_to_aptly: true
dist: trusty
- name: octavia
upload_source_package: false
+ upload_to_aptly: true
dist: trusty
- name: opencontrail
upload_source_package: false
+ upload_to_aptly: true
dist: trusty
- name: openldap
upload_source_package: false
+ upload_to_aptly: true
dist: trusty
- name: openssh
upload_source_package: false
+ upload_to_aptly: true
dist: trusty
- name: openvpn
upload_source_package: false
+ upload_to_aptly: true
dist: trusty
- name: openvstorage
upload_source_package: false
+ upload_to_aptly: true
dist: trusty
- name: oslo-templates
upload_source_package: false
+ upload_to_aptly: true
dist: trusty
- name: owncloud
upload_source_package: false
+ upload_to_aptly: true
dist: trusty
- name: postfix
upload_source_package: false
+ upload_to_aptly: true
dist: trusty
- name: postgresql
upload_source_package: false
+ upload_to_aptly: true
dist: trusty
- name: powerdns
upload_source_package: false
+ upload_to_aptly: true
dist: trusty
- name: pritunl
upload_source_package: false
+ upload_to_aptly: true
dist: trusty
- name: prometheus
upload_source_package: false
+ upload_to_aptly: true
dist: trusty
- name: python
upload_source_package: false
+ upload_to_aptly: true
dist: trusty
- name: rabbitmq
upload_source_package: false
+ upload_to_aptly: true
dist: trusty
- name: reclass
upload_source_package: false
+ upload_to_aptly: true
dist: trusty
- name: redis
upload_source_package: false
+ upload_to_aptly: true
dist: trusty
- name: roundcube
upload_source_package: false
+ upload_to_aptly: true
dist: trusty
- name: rsync
upload_source_package: false
+ upload_to_aptly: true
dist: trusty
- name: rsyslog
upload_source_package: false
+ upload_to_aptly: true
dist: trusty
- name: rundeck
upload_source_package: false
+ upload_to_aptly: true
dist: trusty
- name: runtest
upload_source_package: false
+ upload_to_aptly: true
dist: trusty
- name: sahara
upload_source_package: false
+ upload_to_aptly: true
dist: trusty
- name: salt
upload_source_package: false
+ upload_to_aptly: true
dist: trusty
- name: sensu
upload_source_package: false
+ upload_to_aptly: true
dist: trusty
- name: sentry
upload_source_package: false
+ upload_to_aptly: true
dist: trusty
- name: shibboleth
upload_source_package: false
+ upload_to_aptly: true
dist: trusty
- name: sphinx
upload_source_package: false
+ upload_to_aptly: true
dist: trusty
- name: spinnaker
upload_source_package: false
+ upload_to_aptly: true
dist: trusty
- name: statsd
upload_source_package: false
+ upload_to_aptly: true
dist: trusty
- name: supervisor
upload_source_package: false
+ upload_to_aptly: true
dist: trusty
- name: taiga
upload_source_package: false
+ upload_to_aptly: true
dist: trusty
- name: telegraf
upload_source_package: false
+ upload_to_aptly: true
dist: trusty
- name: tinyproxy
upload_source_package: false
+ upload_to_aptly: true
dist: trusty
- name: tftpd-hpa
upload_source_package: false
+ upload_to_aptly: true
dist: trusty
- name: varnish
upload_source_package: false
+ upload_to_aptly: true
dist: trusty
- name: xtrabackup
upload_source_package: false
+ upload_to_aptly: true
dist: trusty
- name: zookeeper
upload_source_package: false
+ upload_to_aptly: true
dist: trusty
- name: aodh
upload_source_package: true
+ upload_to_aptly: true
dist: xenial
- name: apache
upload_source_package: true
+ upload_to_aptly: true
dist: xenial
- name: aptcacher
upload_source_package: true
+ upload_to_aptly: true
dist: xenial
- name: aptly
upload_source_package: true
+ upload_to_aptly: true
dist: xenial
- name: artifactory
upload_source_package: true
+ upload_to_aptly: true
dist: xenial
- name: avinetworks
upload_source_package: true
+ upload_to_aptly: true
dist: xenial
- name: barbican
upload_source_package: true
+ upload_to_aptly: true
dist: xenial
- name: baremetal-simulator
upload_source_package: true
+ upload_to_aptly: true
dist: xenial
- name: backupninja
upload_source_package: true
+ upload_to_aptly: true
dist: xenial
- name: billometer
upload_source_package: true
+ upload_to_aptly: true
dist: xenial
- name: bind
upload_source_package: true
+ upload_to_aptly: true
dist: xenial
- name: bird
upload_source_package: true
+ upload_to_aptly: true
dist: xenial
- name: cadf
upload_source_package: true
+ upload_to_aptly: true
dist: xenial
- name: calico
upload_source_package: true
+ upload_to_aptly: true
dist: xenial
- name: cassandra
upload_source_package: true
+ upload_to_aptly: true
dist: xenial
- name: ccp
upload_source_package: true
+ upload_to_aptly: true
dist: xenial
- name: ceph
upload_source_package: true
+ upload_to_aptly: true
dist: xenial
- name: chrony
upload_source_package: true
+ upload_to_aptly: true
dist: xenial
- name: collectd
upload_source_package: true
+ upload_to_aptly: true
dist: xenial
- name: debmirror
upload_source_package: true
+ upload_to_aptly: true
dist: xenial
- name: dekapod
upload_source_package: true
+ upload_to_aptly: true
dist: xenial
- name: designate
upload_source_package: true
+ upload_to_aptly: true
dist: xenial
- name: devops-portal
upload_source_package: true
+ upload_to_aptly: true
dist: xenial
- name: docker
upload_source_package: true
+ upload_to_aptly: true
dist: xenial
- name: dogtag
upload_source_package: true
+ upload_to_aptly: true
dist: xenial
- name: dovecot
upload_source_package: true
+ upload_to_aptly: true
dist: xenial
- name: elasticsearch
upload_source_package: true
+ upload_to_aptly: true
dist: xenial
- name: etcd
upload_source_package: true
+ upload_to_aptly: true
dist: xenial
- name: fluentbit
upload_source_package: true
+ upload_to_aptly: true
dist: xenial
- name: fluentd
upload_source_package: true
+ upload_to_aptly: true
dist: xenial
- name: foreman
upload_source_package: true
+ upload_to_aptly: true
dist: xenial
- name: freeipa
upload_source_package: true
+ upload_to_aptly: true
dist: xenial
- name: galera
upload_source_package: true
+ upload_to_aptly: true
dist: xenial
- name: gerrit
upload_source_package: true
+ upload_to_aptly: true
dist: xenial
- name: git
upload_source_package: true
+ upload_to_aptly: true
dist: xenial
- name: gitlab
upload_source_package: true
+ upload_to_aptly: true
dist: xenial
- name: glusterfs
upload_source_package: true
+ upload_to_aptly: true
dist: xenial
- name: gnocchi
upload_source_package: true
+ upload_to_aptly: true
dist: xenial
- name: grafana
upload_source_package: true
+ upload_to_aptly: true
dist: xenial
- name: graphite
upload_source_package: true
+ upload_to_aptly: true
dist: xenial
- name: haproxy
upload_source_package: true
+ upload_to_aptly: true
dist: xenial
- name: heka
upload_source_package: true
+ upload_to_aptly: true
dist: xenial
- name: heketi
upload_source_package: true
+ upload_to_aptly: true
dist: xenial
- name: helm
upload_source_package: true
+ upload_to_aptly: true
dist: xenial
- name: influxdb
upload_source_package: true
+ upload_to_aptly: true
dist: xenial
- name: iptables
upload_source_package: true
+ upload_to_aptly: true
dist: xenial
- name: ironic
upload_source_package: true
+ upload_to_aptly: true
dist: xenial
- name: isc-dhcp
upload_source_package: true
+ upload_to_aptly: true
dist: xenial
- name: java
upload_source_package: true
+ upload_to_aptly: true
dist: xenial
- name: jenkins
upload_source_package: true
+ upload_to_aptly: true
dist: xenial
- name: kedb
upload_source_package: true
+ upload_to_aptly: true
dist: xenial
- name: keepalived
upload_source_package: true
+ upload_to_aptly: true
dist: xenial
- name: kibana
upload_source_package: true
+ upload_to_aptly: true
dist: xenial
- name: letsencrypt
upload_source_package: true
+ upload_to_aptly: true
dist: xenial
- name: libvirt
upload_source_package: true
+ upload_to_aptly: true
dist: xenial
- name: linux
upload_source_package: true
+ upload_to_aptly: true
dist: xenial
- name: lldp
upload_source_package: true
+ upload_to_aptly: true
dist: xenial
- name: logrotate
upload_source_package: true
+ upload_to_aptly: true
dist: xenial
- name: maas
upload_source_package: true
+ upload_to_aptly: true
dist: xenial
- name: magnum
upload_source_package: true
+ upload_to_aptly: true
dist: xenial
- name: manila
upload_source_package: true
+ upload_to_aptly: true
dist: xenial
- name: memcached
upload_source_package: true
+ upload_to_aptly: true
dist: xenial
- name: mirascan
upload_source_package: true
+ upload_to_aptly: true
dist: xenial
- name: midonet
upload_source_package: true
+ upload_to_aptly: true
dist: xenial
- name: monasca
upload_source_package: true
+ upload_to_aptly: true
dist: xenial
- name: mongodb
upload_source_package: true
+ upload_to_aptly: true
dist: xenial
- name: murano
upload_source_package: true
+ upload_to_aptly: true
dist: xenial
- name: mysql
upload_source_package: true
+ upload_to_aptly: true
dist: xenial
- name: nagios
upload_source_package: true
+ upload_to_aptly: true
dist: xenial
- name: network
upload_source_package: true
+ upload_to_aptly: true
dist: xenial
- name: nfs
upload_source_package: true
+ upload_to_aptly: true
dist: xenial
- name: nginx
upload_source_package: true
+ upload_to_aptly: true
dist: xenial
- name: nodejs
upload_source_package: true
+ upload_to_aptly: true
dist: xenial
- name: ntp
upload_source_package: true
+ upload_to_aptly: true
dist: xenial
- name: octavia
upload_source_package: true
+ upload_to_aptly: true
dist: xenial
- name: opencontrail
upload_source_package: true
+ upload_to_aptly: true
dist: xenial
- name: openldap
upload_source_package: true
+ upload_to_aptly: true
dist: xenial
- name: openssh
upload_source_package: true
+ upload_to_aptly: true
dist: xenial
- name: openvpn
upload_source_package: true
+ upload_to_aptly: true
dist: xenial
- name: openvstorage
upload_source_package: true
+ upload_to_aptly: true
dist: xenial
- name: oslo-templates
upload_source_package: true
+ upload_to_aptly: true
dist: xenial
- name: owncloud
upload_source_package: true
+ upload_to_aptly: true
dist: xenial
- name: panko
upload_source_package: true
+ upload_to_aptly: true
dist: xenial
- name: postfix
upload_source_package: true
+ upload_to_aptly: true
dist: xenial
- name: postgresql
upload_source_package: true
+ upload_to_aptly: true
dist: xenial
- name: pritunl
upload_source_package: true
+ upload_to_aptly: true
dist: xenial
- name: prometheus
upload_source_package: true
+ upload_to_aptly: true
dist: xenial
- name: powerdns
upload_source_package: true
+ upload_to_aptly: true
dist: xenial
- name: python
upload_source_package: true
+ upload_to_aptly: true
dist: xenial
- name: rabbitmq
upload_source_package: true
+ upload_to_aptly: true
dist: xenial
- name: reclass
upload_source_package: true
+ upload_to_aptly: true
dist: xenial
- name: redis
upload_source_package: true
+ upload_to_aptly: true
dist: xenial
- name: roundcube
upload_source_package: true
+ upload_to_aptly: true
dist: xenial
- name: rsync
upload_source_package: true
+ upload_to_aptly: true
dist: xenial
- name: rundeck
upload_source_package: true
+ upload_to_aptly: true
dist: xenial
- name: rsyslog
upload_source_package: true
+ upload_to_aptly: true
dist: xenial
- name: runtest
upload_source_package: true
+ upload_to_aptly: true
dist: xenial
- name: sahara
upload_source_package: true
+ upload_to_aptly: true
dist: xenial
- name: salt
upload_source_package: true
+ upload_to_aptly: true
dist: xenial
- name: sensu
upload_source_package: true
+ upload_to_aptly: true
dist: xenial
- name: sentry
upload_source_package: true
+ upload_to_aptly: true
dist: xenial
- name: shibboleth
upload_source_package: true
+ upload_to_aptly: true
dist: xenial
- name: sphinx
upload_source_package: true
+ upload_to_aptly: true
dist: xenial
- name: spinnaker
upload_source_package: true
+ upload_to_aptly: true
dist: xenial
- name: statsd
upload_source_package: true
+ upload_to_aptly: true
dist: xenial
- name: supervisor
upload_source_package: true
+ upload_to_aptly: true
dist: xenial
- name: taiga
upload_source_package: true
+ upload_to_aptly: true
dist: xenial
- name: telegraf
upload_source_package: true
+ upload_to_aptly: true
dist: xenial
- name: tinyproxy
upload_source_package: true
+ upload_to_aptly: true
dist: xenial
- name: tftpd-hpa
upload_source_package: true
+ upload_to_aptly: true
dist: xenial
- name: varnish
upload_source_package: true
+ upload_to_aptly: true
dist: xenial
- name: watchdog
upload_source_package: true
+ upload_to_aptly: true
dist: xenial
- name: xtrabackup
upload_source_package: true
+ upload_to_aptly: true
dist: xenial
- name: zookeeper
upload_source_package: true
+ upload_to_aptly: true
dist: xenial
template:
discard:
@@ -746,7 +969,7 @@
default: '{{upload_source_package}}'
UPLOAD_APTLY:
type: boolean
- default: 'true'
+ default: '{{upload_to_aptly}}'
DEBUG:
type: boolean
default: 'false'
diff --git a/jenkins/client/job/oscore/init.yml b/jenkins/client/job/oscore/init.yml
index 18dd008..4666ddd 100644
--- a/jenkins/client/job/oscore/init.yml
+++ b/jenkins/client/job/oscore/init.yml
@@ -2,11 +2,15 @@
- system.jenkins.client.job.oscore.security_tests
- system.jenkins.client.job.oscore.tests
- system.jenkins.client.job.oscore.qa
+ - system.jenkins.client.job.oscore.salt_virtual_models
parameters:
jenkins:
client:
view:
"OSCORE":
enabled: true
- type: ListView
+ type: CategorizedJobsView
include_regex: "^oscore-.*"
+ categories:
+ - group_regex: "oscore-bandit-*"
+ naming_rule: "Bandit"
diff --git a/jenkins/client/job/oscore/salt_virtual_models.yml b/jenkins/client/job/oscore/salt_virtual_models.yml
new file mode 100644
index 0000000..f8ee2f3
--- /dev/null
+++ b/jenkins/client/job/oscore/salt_virtual_models.yml
@@ -0,0 +1,168 @@
+parameters:
+ jenkins:
+ client:
+ job:
+ oscore-test_virtual_model:
+ concurrent: true
+ discard:
+ build:
+ keep_num: 30
+ artifact:
+ keep_num: 30
+ plugin_properties:
+ throttleconcurrents:
+ enabled: true
+ throttle_option: category
+ categories:
+ - oscore-ci-ha-builds
+ display_name: oscore-test-virtual-model
+ name: oscore-test-virtual-model
+ param:
+ CREDENTIALS_ID:
+ default: gerrit
+ type: string
+ description: "Name of creadentials to use when connecting to gerrit"
+ HEAT_STACK_ZONE:
+ type: string
+ description: "Heat stack zone where build stack"
+ default: "mcp-oscore-ci"
+ STACK_RECLASS_ADDRESS:
+ type: string
+ default: 'https://gerrit.mcp.mirantis.net/salt-models/mcp-virtual-lab'
+ description: 'Url to repository with stack salt models'
+ STACK_RECLASS_BRANCH:
+ type: string
+ default: 'master'
+ description: 'Branch of repository with stack salt models'
+ STACK_CLUSTER_NAME:
+ type: string
+ default: ""
+ description: "Cluster name to use from reclass"
+ STACK_DELETE:
+ type: boolean
+ default: 'false'
+ description: "Enable it when stack have to be deleted."
+ FORMULA_PKG_REVISION:
+ type: string
+ description: Version of formulas for salt-master bootstrap
+ default: "nightly"
+ # openstack api
+ OPENSTACK_API_URL:
+ type: string
+ default: "https://cloud-cz.bud.mirantis.net:5000"
+ OPENSTACK_API_CREDENTIALS:
+ type: string
+ default: "openstack-devcloud-credentials"
+ OPENSTACK_API_PROJECT:
+ type: string
+ default: "mcp-oscore-ci"
+ OPENSTACK_API_PROJECT_DOMAIN:
+ type: string
+ default: "default"
+ OPENSTACK_API_PROJECT_ID:
+ type: string
+ default: ""
+ OPENSTACK_API_USER_DOMAIN:
+ type: string
+ default: "default"
+ OPENSTACK_API_CLIENT:
+ type: string
+ default: ""
+ OPENSTACK_API_VERSION:
+ type: string
+ default: "3"
+ # Test params
+ TEST_CONF:
+ type: string
+ description: Tempest configuration file path inside container
+ default: "/home/rally/rally_reports/tempest_generated.conf"
+ TEST_TARGET:
+ type: string
+ description: Node to run tests
+ default: "cfg01*"
+ TEST_CONCURRENCY:
+ type: string
+ description: How much test threads to run
+ default: "2"
+ RUN_SMOKE:
+ type: boolean
+ default: "false"
+ description: Enabling of running smoke tests
+ scm:
+ script: test-virtual-model-pipeline.groovy
+ type: git
+ url: "${_param:jenkins_gerrit_url}/openstack-ci/openstack-pipelines"
+ credentials: "gerrit"
+ type: workflow-scm
+ oscore-test_virtual_models:
+ concurrent: true
+ discard:
+ build:
+ keep_num: 30
+ artifact:
+ keep_num: 30
+ trigger:
+ timer:
+ spec: "H 05 * * *"
+ display_name: oscore-test-virtual-models
+ name: oscore-test-virtual-models
+ param:
+ CREDENTIALS_ID:
+ default: gerrit
+ type: string
+ description: "Name of creadentials to use when connecting to gerrit"
+ HEAT_STACK_ZONE:
+ type: string
+ description: "Heat stack zone where build stack"
+ default: "mcp-oscore-ci"
+ STACK_RECLASS_ADDRESS:
+ type: string
+ default: 'https://gerrit.mcp.mirantis.net/salt-models/mcp-virtual-lab'
+ description: 'Url to repository with stack salt models'
+ STACK_RECLASS_BRANCH:
+ type: string
+ default: 'master'
+ description: 'Branch of repository with stack salt models'
+ STACK_CLUSTER_NAMES:
+ type: string
+ default: "virtual-mcp-pike-ovs,virtual-mcp-pike-dvr,virtual-mcp-pike-dvr-ssl"
+ description: "Comma separated list of cluster names to test."
+ STACK_DELETE:
+ type: boolean
+ default: 'true'
+ description: "Enable it when stack have to be deleted."
+ FORMULA_PKG_REVISION:
+ type: string
+ description: Version of formulas for salt-master bootstrap
+ default: "nightly"
+ # openstack api
+ OPENSTACK_API_URL:
+ type: string
+ default: "https://cloud-cz.bud.mirantis.net:5000"
+ OPENSTACK_API_CREDENTIALS:
+ type: string
+ default: "openstack-devcloud-credentials"
+ OPENSTACK_API_PROJECT:
+ type: string
+ default: "mcp-oscore-ci"
+ OPENSTACK_API_PROJECT_DOMAIN:
+ type: string
+ default: "default"
+ OPENSTACK_API_PROJECT_ID:
+ type: string
+ default: ""
+ OPENSTACK_API_USER_DOMAIN:
+ type: string
+ default: "default"
+ OPENSTACK_API_CLIENT:
+ type: string
+ default: ""
+ OPENSTACK_API_VERSION:
+ type: string
+ default: "3"
+ scm:
+ script: test-virtual-models-pipeline.groovy
+ type: git
+ url: "${_param:jenkins_gerrit_url}/openstack-ci/openstack-pipelines"
+ credentials: "gerrit"
+ type: workflow-scm
diff --git a/jenkins/client/job/salt-models/tests.yml b/jenkins/client/job/salt-models/tests.yml
index 57e15b8..6a80fab 100644
--- a/jenkins/client/job/salt-models/tests.yml
+++ b/jenkins/client/job/salt-models/tests.yml
@@ -273,6 +273,9 @@
RECLASS_MODEL_BRANCH:
type: string
default: master
+ DISTRIB_REVISION:
+ type: string
+ default: 'nightly'
SYSTEM_GIT_URL:
type: string
default: ""
diff --git a/keystone/client/service/aodh.yml b/keystone/client/service/aodh.yml
index c4d49b8..e7b0dbb 100644
--- a/keystone/client/service/aodh.yml
+++ b/keystone/client/service/aodh.yml
@@ -2,6 +2,7 @@
_param:
cluster_public_protocol: https
aodh_service_protocol: http
+ aodh_public_host: ${_param:cluster_public_host}
keystone:
client:
server:
@@ -19,7 +20,7 @@
description: OpenStack Alarming Service
endpoints:
- region: ${_param:openstack_region}
- public_address: ${_param:cluster_public_host}
+ public_address: ${_param:aodh_public_host}
public_protocol: ${_param:cluster_public_protocol}
public_port: 8042
public_path: '/'
diff --git a/keystone/client/service/ceilometer.yml b/keystone/client/service/ceilometer.yml
index 90e0d3e..40f4ebf 100644
--- a/keystone/client/service/ceilometer.yml
+++ b/keystone/client/service/ceilometer.yml
@@ -2,6 +2,7 @@
_param:
cluster_public_protocol: https
ceilometer_service_protocol: http
+ ceilometer_public_host: ${_param:cluster_public_host}
keystone:
client:
server:
@@ -19,7 +20,7 @@
description: OpenStack Telemetry Service
endpoints:
- region: ${_param:openstack_region}
- public_address: ${_param:cluster_public_host}
+ public_address: ${_param:ceilometer_public_host}
public_protocol: ${_param:cluster_public_protocol}
public_port: 8777
public_path: '/'
diff --git a/keystone/client/service/gnocchi.yml b/keystone/client/service/gnocchi.yml
index dec6b83..6707764 100644
--- a/keystone/client/service/gnocchi.yml
+++ b/keystone/client/service/gnocchi.yml
@@ -2,6 +2,7 @@
_param:
cluster_public_protocol: https
gnocchi_service_protocol: http
+ gnocchi_public_host: ${_param:cluster_public_host}
keystone:
client:
server:
@@ -19,7 +20,7 @@
description: OpenStack Metric Service
endpoints:
- region: ${_param:openstack_region}
- public_address: ${_param:cluster_public_host}
+ public_address: ${_param:gnocchi_public_host}
public_protocol: ${_param:cluster_public_protocol}
public_port: 8041
public_path: '/'
diff --git a/keystone/client/service/panko.yml b/keystone/client/service/panko.yml
index b7c9fc3..6f86b36 100644
--- a/keystone/client/service/panko.yml
+++ b/keystone/client/service/panko.yml
@@ -2,6 +2,7 @@
_param:
cluster_public_protocol: https
panko_service_protocol: http
+ panko_public_host: ${_param:cluster_public_host}
keystone:
client:
server:
@@ -19,7 +20,7 @@
description: OpenStack Event Service
endpoints:
- region: ${_param:openstack_region}
- public_address: ${_param:cluster_public_host}
+ public_address: ${_param:panko_public_host}
public_protocol: ${_param:cluster_public_protocol}
public_port: 8977
public_path: '/'
diff --git a/manila/control/cluster.yml b/manila/control/cluster.yml
index 0bf4c69..ff6ca10 100644
--- a/manila/control/cluster.yml
+++ b/manila/control/cluster.yml
@@ -9,5 +9,7 @@
version: ${_param:openstack_version}
api:
enabled: true
+ version: ${_param:openstack_version}
scheduler:
enabled: true
+ version: ${_param:openstack_version}
diff --git a/manila/control/single.yml b/manila/control/single.yml
index 5029c67..3e14e96 100644
--- a/manila/control/single.yml
+++ b/manila/control/single.yml
@@ -8,5 +8,7 @@
version: ${_param:openstack_version}
api:
enabled: true
+ version: ${_param:openstack_version}
scheduler:
enabled: true
+ version: ${_param:openstack_version}
diff --git a/manila/share/backend/lvm.yml b/manila/share/backend/lvm.yml
index 488de4d..4dd589b 100644
--- a/manila/share/backend/lvm.yml
+++ b/manila/share/backend/lvm.yml
@@ -1,4 +1,6 @@
parameters:
+ _param:
+ manila_share_address: ${_param:single_address}
linux:
storage:
lvm:
@@ -14,7 +16,7 @@
type: lvm
enabled: true
lvm_share_export_ips:
- - "${_param:single_address}"
+ - "${_param:manila_share_address}"
dhss: false
share_driver: manila.share.drivers.lvm.LVMShareDriver
lvm_share_volume_group: manila-volume
diff --git a/manila/share/init.yml b/manila/share/init.yml
new file mode 100644
index 0000000..af85c0d
--- /dev/null
+++ b/manila/share/init.yml
@@ -0,0 +1,10 @@
+classes:
+ - system.manila.common.cluster
+parameters:
+ manila:
+ common:
+ dhss: false
+ version: ${_param:openstack_version}
+ share:
+ enabled: true
+ version: ${_param:openstack_version}
diff --git a/panko/server/cluster.yml b/panko/server/cluster.yml
index d2d4b9b..c258c9a 100644
--- a/panko/server/cluster.yml
+++ b/panko/server/cluster.yml
@@ -3,4 +3,24 @@
- service.haproxy.proxy.single
- system.apache.server.site.panko
- system.haproxy.proxy.listen.openstack.panko
-- system.keepalived.cluster.instance.openstack_telemetry_vip
\ No newline at end of file
+- system.keepalived.cluster.instance.openstack_telemetry_vip
+parameters:
+ _param:
+ panko_memcached_node01_address: ${_param:cluster_node01_address}
+ panko_memcached_node02_address: ${_param:cluster_node02_address}
+ panko_memcached_node03_address: ${_param:cluster_node03_address}
+ panko:
+ server:
+ identity:
+ host: ${_param:openstack_control_address}
+ database:
+ host: ${_param:openstack_database_address}
+ cache:
+ engine: memcached
+ members:
+ - host: ${_param:panko_memcached_node01_address}
+ port: 11211
+ - host: ${_param:panko_memcached_node02_address}
+ port: 11211
+ - host: ${_param:panko_memcached_node03_address}
+ port: 11211
\ No newline at end of file
diff --git a/reclass/storage/system/openstack_share_multi.yml b/reclass/storage/system/openstack_share_multi.yml
index a347aec..a70af28 100644
--- a/reclass/storage/system/openstack_share_multi.yml
+++ b/reclass/storage/system/openstack_share_multi.yml
@@ -19,7 +19,7 @@
salt_master_host: ${_param:reclass_config_master}
linux_system_codename: ${_param:linux_system_codename}
single_address: ${_param:openstack_share_node01_address}
- share_address: ${_param:openstack_share_node01_share_address}
+ manila_share_address: ${_param:openstack_share_node01_share_address}
openstack_share_node02:
name: ${_param:openstack_share_node02_hostname}
domain: ${_param:cluster_domain}
@@ -29,7 +29,7 @@
salt_master_host: ${_param:reclass_config_master}
linux_system_codename: ${_param:linux_system_codename}
single_address: ${_param:openstack_share_node02_address}
- share_address: ${_param:openstack_share_node02_share_address}
+ manila_share_address: ${_param:openstack_share_node02_share_address}
openstack_share_node03:
name: ${_param:openstack_share_node03_hostname}
domain: ${_param:cluster_domain}
@@ -39,4 +39,4 @@
salt_master_host: ${_param:reclass_config_master}
linux_system_codename: ${_param:linux_system_codename}
single_address: ${_param:openstack_share_node03_address}
- share_address: ${_param:openstack_share_node03_share_address}
+ manila_share_address: ${_param:openstack_share_node03_share_address}
diff --git a/reclass/storage/system/openstack_share_single.yml b/reclass/storage/system/openstack_share_single.yml
index cb33dde..fca56f2 100644
--- a/reclass/storage/system/openstack_share_single.yml
+++ b/reclass/storage/system/openstack_share_single.yml
@@ -13,4 +13,4 @@
salt_master_host: ${_param:reclass_config_master}
linux_system_codename: ${_param:linux_system_codename}
single_address: ${_param:openstack_share_node01_address}
- share_address: ${_param:openstack_share_node01_share_address}
+ manila_share_address: ${_param:openstack_share_node01_share_address}
diff --git a/salt/control/sizes/ceph.yml b/salt/control/sizes/ceph.yml
index 7b46367..a4be9c9 100644
--- a/salt/control/sizes/ceph.yml
+++ b/salt/control/sizes/ceph.yml
@@ -3,11 +3,11 @@
salt_control_size_cpu_ceph_mon: 8
salt_control_size_ram_ceph_mon: 16384
salt_control_size_disk_profile_ceph_mon: large
- salt_control_size_net_profile_cpu_ceph_mon: default
+ salt_control_size_net_profile_ceph_mon: default
salt_control_size_cpu_ceph_rgw: 8
salt_control_size_ram_ceph_rgw: 16384
salt_control_size_disk_profile_ceph_rgw: small
- salt_control_size_net_profile_cpu_ceph_rgw: default
+ salt_control_size_net_profile_ceph_rgw: default
salt:
control:
size:
diff --git a/salt/control/sizes/cicd.yml b/salt/control/sizes/cicd.yml
index 1099649..a2ada77 100644
--- a/salt/control/sizes/cicd.yml
+++ b/salt/control/sizes/cicd.yml
@@ -3,7 +3,7 @@
salt_control_size_cpu_cicd_control: 8
salt_control_size_ram_cicd_control: 32768
salt_control_size_disk_profile_cicd_control: huge
- salt_control_size_net_profile_cpu_cicd_control: default
+ salt_control_size_net_profile_cicd_control: default
salt:
control:
size:
diff --git a/salt/control/sizes/opencontrail.yml b/salt/control/sizes/opencontrail.yml
index 85a348d..41b858d 100644
--- a/salt/control/sizes/opencontrail.yml
+++ b/salt/control/sizes/opencontrail.yml
@@ -3,11 +3,11 @@
salt_control_size_cpu_opencontrail_control: 8
salt_control_size_ram_opencontrail_control: 65536
salt_control_size_disk_profile_opencontrail_control: large
- salt_control_size_net_profile_cpu_opencontrail_control: default
+ salt_control_size_net_profile_opencontrail_control: default
salt_control_size_cpu_opencontrail_analytics: 16
salt_control_size_ram_opencontrail_analytics: 98304
salt_control_size_disk_profile_opencontrail_analytics: huge
- salt_control_size_net_profile_cpu_opencontrail_analytics: default
+ salt_control_size_net_profile_opencontrail_analytics: default
salt:
control:
size:
diff --git a/salt/control/sizes/openstack.yml b/salt/control/sizes/openstack.yml
index 4283c73..b75161b 100644
--- a/salt/control/sizes/openstack.yml
+++ b/salt/control/sizes/openstack.yml
@@ -3,23 +3,23 @@
salt_control_size_cpu_openstack_control: 8
salt_control_size_ram_openstack_control: 65536
salt_control_size_disk_profile_openstack_control: large
- salt_control_size_net_profile_cpu_openstack_control: default
+ salt_control_size_net_profile_openstack_control: default
salt_control_size_cpu_openstack_database: 8
salt_control_size_ram_openstack_database: 32768
salt_control_size_disk_profile_openstack_database: large
- salt_control_size_net_profile_cpu_openstack_database: default
+ salt_control_size_net_profile_openstack_database: default
salt_control_size_cpu_openstack_message_queue: 16
salt_control_size_ram_openstack_message_queue: 65536
salt_control_size_disk_profile_openstack_message_queue: xxlarge
- salt_control_size_net_profile_cpu_openstack_message_queue: default
+ salt_control_size_net_profile_openstack_message_queue: default
salt_control_size_cpu_openstack_proxy: 4
salt_control_size_ram_openstack_proxy: 16384
salt_control_size_disk_profile_openstack_proxy: large
- salt_control_size_net_profile_cpu_openstack_proxy: default
+ salt_control_size_net_profile_openstack_proxy: default
salt_control_size_cpu_openstack_upgrade: 8
salt_control_size_ram_openstack_upgrade: 16384
salt_control_size_disk_profile_openstack_upgrade: medium
- salt_control_size_net_profile_cpu_openstack_upgrade: default
+ salt_control_size_net_profile_openstack_upgrade: default
salt:
control:
size:
diff --git a/salt/control/sizes/stacklight.yml b/salt/control/sizes/stacklight.yml
index 50f2803..5b09c14 100644
--- a/salt/control/sizes/stacklight.yml
+++ b/salt/control/sizes/stacklight.yml
@@ -1,13 +1,17 @@
parameters:
_param:
- salt_control_size_cpu_stacklight_log: 8
- salt_control_size_ram_stacklight_log: 16384
- salt_control_size_disk_profile_stacklight_log: large
- salt_control_size_net_profile_cpu_stacklight_log: default
- salt_control_size_cpu_stacklight_server: 8
- salt_control_size_ram_stacklight_server: 16384
- salt_control_size_disk_profile_stacklight_server: large
- salt_control_size_net_profile_cpu_stacklight_server: default
+ salt_control_size_cpu_stacklight_log: 16
+ salt_control_size_ram_stacklight_log: 49152
+ salt_control_size_disk_profile_stacklight_log: xxhuge
+ salt_control_size_net_profile_stacklight_log: default
+ salt_control_size_cpu_stacklight_server: 12
+ salt_control_size_ram_stacklight_server: 65536
+ salt_control_size_disk_profile_stacklight_server: xxlarge
+ salt_control_size_net_profile_stacklight_server: default
+ salt_control_size_cpu_stacklight_telemetry: 12
+ salt_control_size_ram_stacklight_telemetry: 98304
+ salt_control_size_disk_profile_stacklight_telemetryr: huge
+ salt_control_size_net_profile_stacklight_telemetry: default
salt:
control:
size:
@@ -20,4 +24,9 @@
cpu: ${_param:salt_control_size_cpu_stacklight_server}
ram: ${_param:salt_control_size_ram_stacklight_server}
disk_profile: ${_param:salt_control_size_disk_profile_stacklight_server}
- net_profile: ${_param:salt_control_size_net_profile_stacklight_server}
\ No newline at end of file
+ net_profile: ${_param:salt_control_size_net_profile_stacklight_server}
+ stacklight.telemetry:
+ cpu: ${_param:salt_control_size_cpu_stacklight_telemetry}
+ ram: ${_param:salt_control_size_ram_stacklight_telemetry}
+ disk_profile: ${_param:salt_control_size_disk_profile_stacklight_telemetry}
+ net_profile: ${_param:salt_control_size_net_profile_stacklight_telemetry}
\ No newline at end of file