Merge "remove match_re param"
diff --git a/debmirror/mirror_mirantis_com/ubuntu/xenial.yml b/debmirror/mirror_mirantis_com/ubuntu/xenial.yml
index a0f8657..09dee22 100644
--- a/debmirror/mirror_mirantis_com/ubuntu/xenial.yml
+++ b/debmirror/mirror_mirantis_com/ubuntu/xenial.yml
@@ -18,13 +18,17 @@
log_file: "/var/log/debmirror/mirror_mirantis_com_ubuntu_xenial.log"
dist: [ xenial , xenial-security, xenial-updates ]
section: [ main , multiverse, restricted, universe ]
- exclude_deb_section: [ games, gnome, Xfce, sound, electronics, graphics, hamradio , doc, localization, kde, video, translations, news, x11,
- multiverse/games, multiverse/gnome, multiverse/Xfce, multiverse/sound, multiverse/electronics, multiverse/graphics,
- multiverse/hamradio , multiverse/doc, multiverse/localization, multiverse/kde, multiverse/video, multiverse/translations, multiverse/news, multiverse/x11,
- universe/games, universe/gnome, universe/Xfce, universe/sound, universe/electronics, universe/hamradio , universe/doc, universe/localization, universe/kde,
- universe/video, universe/translations, universe/news, universe/x11, universe/graphics,
- restricted/games, restricted/gnome, restricted/Xfce, restricted/sound, restricted/electronics, restricted/graphics, restricted/hamradio , restricted/doc,
- restricted/localization, restricted/kde, restricted/video, restricted/translations, restricted/news, restricted/x11 ]
+ exclude_deb_section: [games, gnome, Xfce, sound, electronics, graphics, hamradio,
+ doc, localization, kde, video, translations, news, x11, multiverse/games, multiverse/gnome,
+ multiverse/Xfce, multiverse/sound, multiverse/electronics, multiverse/graphics,
+ multiverse/hamradio, multiverse/doc, multiverse/localization, multiverse/kde, multiverse/video,
+ multiverse/translations, multiverse/news, multiverse/x11, universe/games, universe/gnome,
+ universe/Xfce, universe/sound, universe/electronics, universe/hamradio, universe/doc,
+ universe/localization, universe/kde, universe/video, universe/translations, universe/news,
+ universe/x11, universe/graphics, restricted/games, restricted/gnome, restricted/Xfce,
+ restricted/sound, restricted/electronics, restricted/graphics, restricted/hamradio,
+ restricted/doc, restricted/localization, restricted/kde, restricted/video, restricted/translations,
+ restricted/news, restricted/x11]
filter:
1: "--exclude='android*'"
2: "--exclude='/firefox*'"
@@ -62,6 +66,8 @@
97: "--exclude='linux-*-(.*azure|.*aws|gke|.*azure-edge|.*linux-oem)'"
98: "--exclude='/.*(arm64|powerpc|s390x|armel|armhf|sparc64|mips64|ppc64el|mipsn32)(?!.*amd64)'"
99: "--exclude='/*universe.*(-armel-|-arm-)(?!.*amd64)'"
+ # List of extra includes, founded after tests.
100: "--include='/main(.*)manpages'"
101: "--include='/main(.*)python-(.*)doc'"
102: "--include='/main(.*)python-(.*)network'"
+ 103: "--include='/main(.*)unittest2'"
diff --git a/fluentd/label/default_output/elasticsearch.yml b/fluentd/label/default_output/elasticsearch.yml
index 8fc8958..5960c49 100644
--- a/fluentd/label/default_output/elasticsearch.yml
+++ b/fluentd/label/default_output/elasticsearch.yml
@@ -27,6 +27,14 @@
type: record_transformer
enable_ruby: true
remove_keys: '["hostname"]'
+ change_pid_field_value:
+ tag: "haproxy.**"
+ type: record_transformer
+ enable_ruby: true
+ record:
+ - name: Pid
+ value: ${fluentd:dollar}{record["pid"]}
+ remove_keys: '["pid"]'
match:
elasticsearch_output:
host: ${_param:fluentd_elasticsearch_host}
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/haproxy/proxy/listen/stacklight/prometheus_relay.yml b/haproxy/proxy/listen/stacklight/prometheus_relay.yml
new file mode 100644
index 0000000..23c9286
--- /dev/null
+++ b/haproxy/proxy/listen/stacklight/prometheus_relay.yml
@@ -0,0 +1,24 @@
+parameters:
+ _param:
+ cluster_prometheus_relay_port: 8080
+ haproxy:
+ proxy:
+ listen:
+ prometheus_relay:
+ service_name: prometheus_relay
+ binds:
+ - address: ${_param:cluster_vip_address}
+ port: ${_param:cluster_prometheus_relay_port}
+ servers:
+ - name: ${_param:cluster_node01_hostname}
+ host: ${_param:cluster_node01_address}
+ port: ${_param:prometheus_relay_bind_port}
+ params: check inter 10s fastinter 2s downinter 3s rise 3 fall 3
+ - name: ${_param:cluster_node02_hostname}
+ host: ${_param:cluster_node02_address}
+ port: ${_param:prometheus_relay_bind_port}
+ params: check inter 10s fastinter 2s downinter 3s rise 3 fall 3
+ - name: ${_param:cluster_node03_hostname}
+ host: ${_param:cluster_node03_address}
+ port: ${_param:prometheus_relay_bind_port}
+ params: check inter 10s fastinter 2s downinter 3s rise 3 fall 3
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/deploy/lab/component/kubernetes.yml b/jenkins/client/job/deploy/lab/component/kubernetes.yml
index 62526f7..8cbf766 100644
--- a/jenkins/client/job/deploy/lab/component/kubernetes.yml
+++ b/jenkins/client/job/deploy/lab/component/kubernetes.yml
@@ -25,7 +25,7 @@
stack_env: devcloud
stack_type: heat
stack_install: core,k8s,calico
- stack_test: ""
+ stack_test: "k8s"
job_timer: "H H(0-6) * * *"
- stack_name: k8s_ha_contrail
stack_env: devcloud
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/oscore/tests.yml b/jenkins/client/job/oscore/tests.yml
index 3000d71..8012d61 100644
--- a/jenkins/client/job/oscore/tests.yml
+++ b/jenkins/client/job/oscore/tests.yml
@@ -728,7 +728,7 @@
trigger:
gerrit:
project:
- "^salt-formulas/(nova|cinder|glance|keystone|horizon|neutron|designate|heat|ironic|barbican|salt|linux|reclass|galera|memcached|rabbitmq|bind|apache)$":
+ "^salt-formulas/(nova|cinder|glance|keystone|horizon|neutron|designate|heat|ironic|barbican|aodh|ceilometer|gnocchi|panko|manila|salt|linux|reclass|galera|memcached|rabbitmq|bind|apache)$":
compare_type: 'REG_EXP'
branches:
- master
diff --git a/jenkins/client/job/saas/init.yml b/jenkins/client/job/saas/init.yml
index 5ec05c1..33ebbe4 100644
--- a/jenkins/client/job/saas/init.yml
+++ b/jenkins/client/job/saas/init.yml
@@ -1,2 +1,3 @@
classes:
- system.jenkins.client.job.saas.test_saas_ui
+ - system.jenkins.client.job.saas.test_saas_core_auth
diff --git a/jenkins/client/job/saas/test_saas_core_auth.yml b/jenkins/client/job/saas/test_saas_core_auth.yml
new file mode 100644
index 0000000..1ff2339
--- /dev/null
+++ b/jenkins/client/job/saas/test_saas_core_auth.yml
@@ -0,0 +1,43 @@
+parameters:
+ jenkins:
+ client:
+ job:
+ test-saas-core-auth:
+ name: test-saas-core-auth
+ discard:
+ build:
+ keep_num: 15
+ artifact:
+ keep_num: 15
+ type: workflow-scm
+ concurrent: true
+ scm:
+ type: git
+ url: "${_param:jenkins_gerrit_url}/oss/jenkins/pipelines"
+ credentials: "gerrit"
+ script: test-saas-core-auth-pipeline.groovy
+ trigger:
+ gerrit:
+ project:
+ "saas/core/auth":
+ branches:
+ - master
+ event:
+ patchset:
+ - created:
+ excludeDrafts: false
+ excludeTrivialRebase: false
+ excludeNoCodeChange: false
+ comment:
+ - addedContains:
+ commentAddedCommentContains: '^(?s:Patch Set \d+:.*(test|recheck|reverify)\s*)$'
+ param:
+ CREDENTIALS_ID:
+ type: string
+ default: "gerrit"
+ DEFAULT_GIT_URL:
+ type: string
+ default: "${_param:jenkins_gerrit_url}/saas/core/auth"
+ DEFAULT_GIT_REF:
+ type: string
+ default: master
diff --git a/jenkins/client/job/salt-models/tests.yml b/jenkins/client/job/salt-models/tests.yml
index 8744c0c..6a80fab 100644
--- a/jenkins/client/job/salt-models/tests.yml
+++ b/jenkins/client/job/salt-models/tests.yml
@@ -98,6 +98,9 @@
credentials: "gerrit"
script: test-customers-salt-models.groovy
concurrent: false
+ trigger:
+ timer:
+ spec: "{{job_timer}}"
param:
CUSTOMERS:
type: string
@@ -270,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..2c6558e
--- /dev/null
+++ b/manila/share/init.yml
@@ -0,0 +1,10 @@
+classes:
+ - service.manila.common.cluster
+parameters:
+ manila:
+ common:
+ dhss: false
+ version: ${_param:openstack_version}
+ share:
+ enabled: true
+ version: ${_param:openstack_version}
diff --git a/openssh/server/team/members/lmercl.yml b/openssh/server/team/members/lmercl.yml
index c735ed5..04be2f5 100644
--- a/openssh/server/team/members/lmercl.yml
+++ b/openssh/server/team/members/lmercl.yml
@@ -17,4 +17,5 @@
enabled: true
public_keys:
- key: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQCy6mFrr4oNdLjT5wBZj1+KXNpdawnGGWEevDBQ2SWFjxBFujkWVLiW1kxLTpLVSnuoE5FB7doRIsT/CDe9IU5OhsJ+z6TT56R/pfVKrVnSB1rgrwqdezjgmYEM6kTWiH2GKJE0yiQEPgagK8Rz5Zl420JkhbFWnL7EGPhxNtmYMGDTZwUTzP0KYmytyeH15OqNIiBGTrp1t2bTrVB8HRnUp0uDpfoWAUnsijVGNe1j1bNKtDO0Z9LAWx3eUyxIk4cdpX/EeWJg8jNrSMxtAZZ7Hhm/WInNSNqcHcZ1rEYCAjENxo1WVOuA/aqUqc5xaAipWNon4Rk0e0IUAaFOfLvN2lIuilUZ5XKHDe7a2crkGPnotheT9FgaEHOeFtpuhSaygeZHTMR197jeocgjWIkPqHjVAGSQqQf0TAdNuN73QPTigbbfHWWc1d8KlCM5BqJUXMHPG6BasE1sI/4ykYbxN/DAEvVJ4+rdIlqSdedd73ZAseVQjDtpzD8diScGrpdOhZnTm43q89F8dIFv7tt1TjIwvfcDQNSBjyyKcYpj+NTyW2Zk7qWDVz+lzH0ToYk/rOKkGlrsRy7OwOnmyKR8IcIOL7Bowj895ThCX8tBrdLu/m55ojBOcZiCpawCm7K55ri1Ar6i8cO+bHDh11kKRa/utRRSQTpsW0sbCsamzQ== lubos@lubos-ThinkPad-X1
- user: ${linux:system:user:lmercl}
\ No newline at end of file
+ - key: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDZFmRirw1DHtY8VQDfnZDEi1tWhW4lHWaCq3T14K2HtU17ulJB4KbonMWZLiqFsX44okKM7FOiR9L5ij417CRytlzuHSJebnDj6kppE+lslvfd8TdTTVmvQ7rLj+mdvsRmNVRnou1JPlhryJFshZSsfonn6s6AlAWW4RHx9a8kWuYplObGdUQN9pXReDso9UjeOOuPVmtpfvBXgljHEa/IyAAk47CTe7vVTggauWTVIB+F3zmL2KPFEKGBvd6Ac/wOdirHgV5YgR9LT81hZ9p6TZXkfbIGOl+K6dOIgGqGykn77qloTnKUTSPMWJz11xgwE3sv314ZZ6oZvhCVCcLX lmercl@Luboss-MacBook-Pro.local
+ user: ${linux:system:user:lmercl}
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/prometheus/relay/init.yml b/prometheus/relay/init.yml
new file mode 100644
index 0000000..a240458
--- /dev/null
+++ b/prometheus/relay/init.yml
@@ -0,0 +1,3 @@
+classes:
+ - service.prometheus.relay
+ - service.prometheus.relay.cluster
diff --git a/prometheus/server/standalone.yml b/prometheus/server/standalone.yml
new file mode 100644
index 0000000..cdddb9a
--- /dev/null
+++ b/prometheus/server/standalone.yml
@@ -0,0 +1,7 @@
+classes:
+- service.prometheus.server.standalone
+parameters:
+ prometheus:
+ server:
+ version: 2.0
+
diff --git a/prometheus/server/target/federation/all_metrics.yml b/prometheus/server/target/federation/all_metrics.yml
new file mode 100644
index 0000000..f6a4ae3
--- /dev/null
+++ b/prometheus/server/target/federation/all_metrics.yml
@@ -0,0 +1,9 @@
+parameters:
+ prometheus:
+ server:
+ target:
+ static:
+ prometheus_federation:
+ params:
+ match[]:
+ - '{__name__=~".+"}'
diff --git a/prometheus/server/target/federation/init.yml b/prometheus/server/target/federation/init.yml
new file mode 100644
index 0000000..564af82
--- /dev/null
+++ b/prometheus/server/target/federation/init.yml
@@ -0,0 +1,17 @@
+parameters:
+ prometheus:
+ server:
+ target:
+ static:
+ prometheus:
+ endpoint:
+ - address: 127.0.0.1
+ port: ${prometheus:server:bind:port}
+ prometheus_federation:
+ honor_labels: true
+ metrics_path: '/federate'
+ scrape_interval: 15s
+ scrape_timeout: 15s
+ endpoint:
+ - address: ${_param:stacklight_monitor_address}
+ port: 15010
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
new file mode 100644
index 0000000..a4be9c9
--- /dev/null
+++ b/salt/control/sizes/ceph.yml
@@ -0,0 +1,23 @@
+parameters:
+ _param:
+ 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_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_ceph_rgw: default
+ salt:
+ control:
+ size:
+ ceph.mon:
+ cpu: ${_param:salt_control_size_cpu_ceph_mon}
+ ram: ${_param:salt_control_size_ram_ceph_mon}
+ disk_profile: ${_param:salt_control_size_disk_profile_ceph_mon}
+ net_profile: ${_param:salt_control_size_net_profile_ceph_mon}
+ ceph.rgw:
+ cpu: ${_param:salt_control_size_cpu_ceph_rgw}
+ ram: ${_param:salt_control_size_ram_ceph_rgw}
+ disk_profile: ${_param:salt_control_size_disk_profile_ceph_rgw}
+ net_profile: ${_param:salt_control_size_net_profile_ceph_rgw}
diff --git a/salt/control/sizes/cicd.yml b/salt/control/sizes/cicd.yml
new file mode 100644
index 0000000..a2ada77
--- /dev/null
+++ b/salt/control/sizes/cicd.yml
@@ -0,0 +1,14 @@
+parameters:
+ _param:
+ 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_cicd_control: default
+ salt:
+ control:
+ size:
+ cicd.control:
+ cpu: ${_param:salt_control_size_cpu_cicd_control}
+ ram: ${_param:salt_control_size_ram_cicd_control}
+ disk_profile: ${_param:salt_control_size_disk_profile_cicd_control}
+ net_profile: ${_param:salt_control_size_net_profile_cicd_control}
diff --git a/salt/control/sizes/opencontrail.yml b/salt/control/sizes/opencontrail.yml
new file mode 100644
index 0000000..41b858d
--- /dev/null
+++ b/salt/control/sizes/opencontrail.yml
@@ -0,0 +1,23 @@
+parameters:
+ _param:
+ 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_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_opencontrail_analytics: default
+ salt:
+ control:
+ size:
+ opencontrail.control:
+ cpu: ${_param:salt_control_size_cpu_opencontrail_control}
+ ram: ${_param:salt_control_size_ram_opencontrail_control}
+ disk_profile: ${_param:salt_control_size_disk_profile_opencontrail_control}
+ net_profile: ${_param:salt_control_size_net_profile_opencontrail_control}
+ opencontrail.analytics:
+ cpu: ${_param:salt_control_size_cpu_opencontrail_analytics}
+ ram: ${_param:salt_control_size_ram_opencontrail_analytics}
+ disk_profile: ${_param:salt_control_size_disk_profile_opencontrail_analytics}
+ net_profile: ${_param:salt_control_size_net_profile_opencontrail_analytics}
diff --git a/salt/control/sizes/openstack.yml b/salt/control/sizes/openstack.yml
new file mode 100644
index 0000000..b75161b
--- /dev/null
+++ b/salt/control/sizes/openstack.yml
@@ -0,0 +1,50 @@
+parameters:
+ _param:
+ 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_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_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_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_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_openstack_upgrade: default
+ salt:
+ control:
+ size:
+ openstack.control:
+ cpu: ${_param:salt_control_size_cpu_openstack_control}
+ ram: ${_param:salt_control_size_ram_openstack_control}
+ disk_profile: ${_param:salt_control_size_disk_profile_openstack_control}
+ net_profile: ${_param:salt_control_size_net_profile_openstack_control}
+ openstack.database:
+ cpu: ${_param:salt_control_size_cpu_openstack_database}
+ ram: ${_param:salt_control_size_ram_openstack_database}
+ disk_profile: ${_param:salt_control_size_disk_profile_openstack_database}
+ net_profile: ${_param:salt_control_size_net_profile_openstack_database}
+ openstack.message_queue:
+ cpu: ${_param:salt_control_size_cpu_openstack_message_queue}
+ ram: ${_param:salt_control_size_ram_openstack_message_queue}
+ disk_profile: ${_param:salt_control_size_disk_profile_openstack_message_queue}
+ net_profile: ${_param:salt_control_size_net_profile_openstack_message_queue}
+ openstack.proxy:
+ cpu: ${_param:salt_control_size_cpu_openstack_proxy}
+ ram: ${_param:salt_control_size_ram_openstack_proxy}
+ disk_profile: ${_param:salt_control_size_disk_profile_openstack_proxy}
+ net_profile: ${_param:salt_control_size_net_profile_openstack_proxy}
+ openstack.upgrade:
+ cpu: ${_param:salt_control_size_cpu_openstack_upgrade}
+ ram: ${_param:salt_control_size_ram_openstack_upgrade}
+ disk_profile: ${_param:salt_control_size_disk_profile_openstack_upgrade}
+ net_profile: ${_param:salt_control_size_net_profile_openstack_upgrade}
diff --git a/salt/control/sizes/stacklight.yml b/salt/control/sizes/stacklight.yml
new file mode 100644
index 0000000..5b09c14
--- /dev/null
+++ b/salt/control/sizes/stacklight.yml
@@ -0,0 +1,32 @@
+parameters:
+ _param:
+ 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:
+ stacklight.log:
+ cpu: ${_param:salt_control_size_cpu_stacklight_log}
+ ram: ${_param:salt_control_size_ram_stacklight_log}
+ disk_profile: ${_param:salt_control_size_disk_profile_stacklight_log}
+ net_profile: ${_param:salt_control_size_net_profile_stacklight_log}
+ stacklight.server:
+ 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}
+ 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
diff --git a/salt/master/formula/git/panko.yml b/salt/master/formula/git/panko.yml
new file mode 100644
index 0000000..045331b
--- /dev/null
+++ b/salt/master/formula/git/panko.yml
@@ -0,0 +1,10 @@
+parameters:
+ salt:
+ master:
+ environment:
+ dev:
+ formula:
+ panko:
+ source: git
+ address: '${_param:salt_master_environment_repository}/salt-formula-panko.git'
+ revision: ${_param:salt_master_environment_revision}
diff --git a/salt/master/formula/pkg/panko.yml b/salt/master/formula/pkg/panko.yml
new file mode 100644
index 0000000..d4d8b8f
--- /dev/null
+++ b/salt/master/formula/pkg/panko.yml
@@ -0,0 +1,9 @@
+parameters:
+ salt:
+ master:
+ environment:
+ prd:
+ formula:
+ panko:
+ source: pkg
+ name: salt-formula-panko
diff --git a/watchdog/server/init.yml b/watchdog/server/init.yml
new file mode 100644
index 0000000..28435d6
--- /dev/null
+++ b/watchdog/server/init.yml
@@ -0,0 +1,7 @@
+classes:
+- service.watchdog.server
+parameters:
+ watchdog:
+ server:
+ enabled: true
+