Merge "Add option to build opencontrail with more debug for dpdk"
diff --git a/aptly/server/mirror/ubuntu/trusty/glusterfs.yml b/aptly/server/mirror/ubuntu/trusty/glusterfs.yml
new file mode 100644
index 0000000..2d3fbaf
--- /dev/null
+++ b/aptly/server/mirror/ubuntu/trusty/glusterfs.yml
@@ -0,0 +1,17 @@
+parameters:
+ _param:
+ apt_mk_version: stable
+ aptly:
+ server:
+ mirror:
+ glusterfs_upstream_trusty:
+ source: http://ppa.launchpad.net/gluster/glusterfs-3.7/ubuntu
+ distribution: trusty
+ components: main
+ architectures: amd64
+ gpgkeys:
+ - 3FE869A9
+ publisher:
+ component: main
+ distributions:
+ - ubuntu-trusty/${_param:apt_mk_version}
\ No newline at end of file
diff --git a/aptly/server/mirror/ubuntu/trusty/mcp/openstack.yml b/aptly/server/mirror/ubuntu/trusty/mcp/openstack.yml
index b419b8b..32e3b90 100644
--- a/aptly/server/mirror/ubuntu/trusty/mcp/openstack.yml
+++ b/aptly/server/mirror/ubuntu/trusty/mcp/openstack.yml
@@ -1,16 +1,15 @@
parameters:
_param:
mcp_repo_version: 1.0
- linux_system_codename: trusty
aptly:
server:
mirror:
mirantis_openstack_trusty:
- source: http://mirror.fuel-infra.org/mcp-repos/${_param:mcp_repo_version}/${_param:linux_system_codename}
+ source: http://mirror.fuel-infra.org/mcp-repos/${_param:mcp_repo_version}/trusty
distribution: mitaka
components: main restricted
architectures: amd64
- key_url: "http://mirror.fuel-infra.org/mcp-repos/${_param:mcp_repo_version}/${_param:linux_system_codename}/archive-mcp${_param:mcp_repo_version}.key"
+ key_url: "http://mirror.fuel-infra.org/mcp-repos/${_param:mcp_repo_version}/trusty/archive-mcp${_param:mcp_repo_version}.key"
gpgkeys:
- 1FA22B08
publisher:
@@ -19,11 +18,11 @@
- ubuntu-trusty/mitaka
mirantis_openstack_hotfix_trusty:
- source: http://mirror.fuel-infra.org/mcp-repos/${_param:mcp_repo_version}/${_param:linux_system_codename}
+ source: http://mirror.fuel-infra.org/mcp-repos/${_param:mcp_repo_version}/trusty
distribution: mitaka-hotfix
components: main restricted
architectures: amd64
- key_url: "http://mirror.fuel-infra.org/mcp-repos/${_param:mcp_repo_version}/${_param:linux_system_codename}/archive-mcp${_param:mcp_repo_version}.key"
+ key_url: "http://mirror.fuel-infra.org/mcp-repos/${_param:mcp_repo_version}/trusty/archive-mcp${_param:mcp_repo_version}.key"
gpgkeys:
- 1FA22B08
publisher:
@@ -32,11 +31,11 @@
- ubuntu-trusty/mitaka-hotfix
mirantis_openstack_security_trusty:
- source: http://mirror.fuel-infra.org/mcp-repos/${_param:mcp_repo_version}/${_param:linux_system_codename}
+ source: http://mirror.fuel-infra.org/mcp-repos/${_param:mcp_repo_version}/trusty
distribution: mitaka-security
components: main restricted
architectures: amd64
- key_url: "http://mirror.fuel-infra.org/mcp-repos/${_param:mcp_repo_version}/${_param:linux_system_codename}/archive-mcp${_param:mcp_repo_version}.key"
+ key_url: "http://mirror.fuel-infra.org/mcp-repos/${_param:mcp_repo_version}/trusty/archive-mcp${_param:mcp_repo_version}.key"
gpgkeys:
- 1FA22B08
publisher:
@@ -46,11 +45,11 @@
# required for alternative horizon plugins/etc..
mirantis_openstack_updates_trusty:
- source: http://mirror.fuel-infra.org/mcp-repos/${_param:mcp_repo_version}/${_param:linux_system_codename}
+ source: http://mirror.fuel-infra.org/mcp-repos/${_param:mcp_repo_version}/trusty
distribution: mitaka-updates
components: main restricted
architectures: amd64
- key_url: "http://mirror.fuel-infra.org/mcp-repos/${_param:mcp_repo_version}/${_param:linux_system_codename}/archive-mcp${_param:mcp_repo_version}.key"
+ key_url: "http://mirror.fuel-infra.org/mcp-repos/${_param:mcp_repo_version}/trusty/archive-mcp${_param:mcp_repo_version}.key"
gpgkeys:
- 1FA22B08
publisher:
@@ -60,11 +59,11 @@
# required for salt formulas
mirantis_openstack_holdback_trusty:
- source: http://mirror.fuel-infra.org/mcp-repos/${_param:mcp_repo_version}/${_param:linux_system_codename}
+ source: http://mirror.fuel-infra.org/mcp-repos/${_param:mcp_repo_version}/trusty
distribution: mitaka-holdback
components: main restricted
architectures: amd64
- key_url: "http://mirror.fuel-infra.org/mcp-repos/${_param:mcp_repo_version}/${_param:linux_system_codename}/archive-mcp${_param:mcp_repo_version}.key"
+ key_url: "http://mirror.fuel-infra.org/mcp-repos/${_param:mcp_repo_version}/trusty/archive-mcp${_param:mcp_repo_version}.key"
gpgkeys:
- 1FA22B08
publisher:
diff --git a/aptly/server/mirror/ubuntu/xenial/glusterfs.yml b/aptly/server/mirror/ubuntu/xenial/glusterfs.yml
new file mode 100644
index 0000000..79a618a
--- /dev/null
+++ b/aptly/server/mirror/ubuntu/xenial/glusterfs.yml
@@ -0,0 +1,17 @@
+parameters:
+ _param:
+ apt_mk_version: stable
+ aptly:
+ server:
+ mirror:
+ glusterfs_upstream_xenial:
+ source: http://ppa.launchpad.net/gluster/glusterfs-3.7/ubuntu
+ distribution: xenial
+ components: main
+ architectures: amd64
+ gpgkeys:
+ - 3FE869A9
+ publisher:
+ component: main
+ distributions:
+ - ubuntu-xenial/${_param:apt_mk_version}
\ No newline at end of file
diff --git a/aptly/server/mirror/ubuntu/xenial/mcp/openstack.yml b/aptly/server/mirror/ubuntu/xenial/mcp/openstack.yml
index 0d07f5a..a23ece8 100644
--- a/aptly/server/mirror/ubuntu/xenial/mcp/openstack.yml
+++ b/aptly/server/mirror/ubuntu/xenial/mcp/openstack.yml
@@ -1,16 +1,15 @@
parameters:
_param:
mcp_repo_version: 1.0
- linux_system_codename: xenial
aptly:
server:
mirror:
mirantis_openstack_xenial:
- source: http://mirror.fuel-infra.org/mcp-repos/${_param:mcp_repo_version}/${_param:linux_system_codename}
+ source: http://mirror.fuel-infra.org/mcp-repos/${_param:mcp_repo_version}/xenial
distribution: mitaka
components: main restricted
architectures: amd64
- key_url: "http://mirror.fuel-infra.org/mcp-repos/${_param:mcp_repo_version}/${_param:linux_system_codename}/archive-mcp${_param:mcp_repo_version}.key"
+ key_url: "http://mirror.fuel-infra.org/mcp-repos/${_param:mcp_repo_version}/xenial/archive-mcp${_param:mcp_repo_version}.key"
gpgkeys:
- 1FA22B08
publisher:
@@ -19,11 +18,11 @@
- ubuntu-xenial/mitaka
mirantis_openstack_hotfix_xenial:
- source: http://mirror.fuel-infra.org/mcp-repos/${_param:mcp_repo_version}/${_param:linux_system_codename}
+ source: http://mirror.fuel-infra.org/mcp-repos/${_param:mcp_repo_version}/xenial
distribution: mitaka-hotfix
components: main restricted
architectures: amd64
- key_url: "http://mirror.fuel-infra.org/mcp-repos/${_param:mcp_repo_version}/${_param:linux_system_codename}/archive-mcp${_param:mcp_repo_version}.key"
+ key_url: "http://mirror.fuel-infra.org/mcp-repos/${_param:mcp_repo_version}/xenial/archive-mcp${_param:mcp_repo_version}.key"
gpgkeys:
- 1FA22B08
publisher:
@@ -32,11 +31,11 @@
- ubuntu-xenial/mitaka-hotfix
mirantis_openstack_security_xenial:
- source: http://mirror.fuel-infra.org/mcp-repos/${_param:mcp_repo_version}/${_param:linux_system_codename}
+ source: http://mirror.fuel-infra.org/mcp-repos/${_param:mcp_repo_version}/xenial
distribution: mitaka-security
components: main restricted
architectures: amd64
- key_url: "http://mirror.fuel-infra.org/mcp-repos/${_param:mcp_repo_version}/${_param:linux_system_codename}/archive-mcp${_param:mcp_repo_version}.key"
+ key_url: "http://mirror.fuel-infra.org/mcp-repos/${_param:mcp_repo_version}/xenial/archive-mcp${_param:mcp_repo_version}.key"
gpgkeys:
- 1FA22B08
publisher:
@@ -46,11 +45,11 @@
# required for alternative horizon plugins/etc..
mirantis_openstack_updates_xenial:
- source: http://mirror.fuel-infra.org/mcp-repos/${_param:mcp_repo_version}/${_param:linux_system_codename}
+ source: http://mirror.fuel-infra.org/mcp-repos/${_param:mcp_repo_version}/xenial
distribution: mitaka-updates
components: main restricted
architectures: amd64
- key_url: "http://mirror.fuel-infra.org/mcp-repos/${_param:mcp_repo_version}/${_param:linux_system_codename}/archive-mcp${_param:mcp_repo_version}.key"
+ key_url: "http://mirror.fuel-infra.org/mcp-repos/${_param:mcp_repo_version}/xenial/archive-mcp${_param:mcp_repo_version}.key"
gpgkeys:
- 1FA22B08
publisher:
@@ -60,11 +59,11 @@
# required for salt formulas
mirantis_openstack_holdback_xenial:
- source: http://mirror.fuel-infra.org/mcp-repos/${_param:mcp_repo_version}/${_param:linux_system_codename}
+ source: http://mirror.fuel-infra.org/mcp-repos/${_param:mcp_repo_version}/xenial
distribution: mitaka-holdback
components: main restricted
architectures: amd64
- key_url: "http://mirror.fuel-infra.org/mcp-repos/${_param:mcp_repo_version}/${_param:linux_system_codename}/archive-mcp${_param:mcp_repo_version}.key"
+ key_url: "http://mirror.fuel-infra.org/mcp-repos/${_param:mcp_repo_version}/xenial/archive-mcp${_param:mcp_repo_version}.key"
gpgkeys:
- 1FA22B08
publisher:
diff --git a/cinder/control/backend/nfs.yml b/cinder/control/backend/nfs.yml
new file mode 100644
index 0000000..1e5d5eb
--- /dev/null
+++ b/cinder/control/backend/nfs.yml
@@ -0,0 +1,15 @@
+parameters:
+ _param:
+ cinder_nfs_local_path: /var/lib/cinder/nfs
+ cinder:
+ controller:
+ default_volume_type: nfs-driver
+ backend:
+ nfs-driver:
+ engine: nfs
+ type_name: nfs-driver
+ volume_group: cinder-volume
+ path: ${_param:cinder_nfs_local_path}
+ devices:
+ - ${_param:cinder_nfs_host}:${_param:cinder_nfs_remote_path}
+ options: ${_param:cinder_nfs_mount_options}
\ No newline at end of file
diff --git a/cinder/volume/backend/nfs.yml b/cinder/volume/backend/nfs.yml
new file mode 100644
index 0000000..e78f4fb
--- /dev/null
+++ b/cinder/volume/backend/nfs.yml
@@ -0,0 +1,9 @@
+parameters:
+ cinder:
+ volume:
+ default_volume_type: nfs-driver
+ backend:
+ nfs-driver:
+ engine: nfs
+ type_name: nfs-driver
+ volume_group: cinder-volume
\ No newline at end of file
diff --git a/docker/swarm/service/gerrit.yml b/docker/swarm/service/gerrit.yml
index 1fc2aab..10e0629 100644
--- a/docker/swarm/service/gerrit.yml
+++ b/docker/swarm/service/gerrit.yml
@@ -1,6 +1,6 @@
parameters:
_param:
- docker_image_gerrit: tcpcloud/gerrit:2.12.7
+ docker_image_gerrit: tcpcloud/gerrit:2.13.6
gerrit_ldap_server: ""
gerrit_ldap_bind_user: ""
gerrit_ldap_bind_password: ""
@@ -25,11 +25,11 @@
LDAP_GROUPBASE: ${_param:gerrit_ldap_group_base}
LDAP_USERNAME: ${_param:gerrit_ldap_bind_user}
LDAP_PASSWORD: ${_param:gerrit_ldap_bind_password}
- CAPABILITY_ADMINISTRATESERVER: admin
WEBURL: ${_param:gerrit_public_host}
GERRIT_ADMIN_SSH_PUBLIC: ${_param:gerrit_admin_public_key}
GERRIT_ADMIN_PWD: ${_param:gerrit_admin_password}
GERRIT_ADMIN_EMAIL: ${_param:gerrit_admin_email}
+ CANLOADINIFRAME: "true"
restart:
condition: any
image: ${_param:docker_image_gerrit}
diff --git a/docker/swarm/service/jenkins.yml b/docker/swarm/service/jenkins.yml
index 16dee71..b2fdeb6 100644
--- a/docker/swarm/service/jenkins.yml
+++ b/docker/swarm/service/jenkins.yml
@@ -6,7 +6,7 @@
service:
jenkins:
environment:
- JAVA_OPTS: "-Djenkins.install.runSetupWizard=false -Dhudson.footerURL=https://www.mirantis.com"
+ JAVA_OPTS: "-Djenkins.install.runSetupWizard=false -Dhudson.DNSMultiCast.disabled=true -Dhudson.udp=-1 -Dhudson.footerURL=https://www.mirantis.com"
JENKINS_NUM_EXECUTORS: 4
restart:
condition: any
diff --git a/docker/swarm/service/monitoring/prometheus_alertmanager.yml b/docker/swarm/service/monitoring/prometheus_alertmanager.yml
index 74b20f5..5d5f237 100644
--- a/docker/swarm/service/monitoring/prometheus_alertmanager.yml
+++ b/docker/swarm/service/monitoring/prometheus_alertmanager.yml
@@ -6,11 +6,12 @@
service:
prometheus_alertmanager:
network: monitoring
- replica: 2
+ replicas: 2
environment:
config_dir: /opt/alertmanager/config
bind_port: ${prometheus:alertmanager:bind:port}
bind_address: ${prometheus:alertmanager:bind:address}
+ discovery_domain: 'prometheus_alertmanager'
restart:
condition: any
image: ${_param:docker_image_alertmanager}
@@ -19,5 +20,5 @@
volume:
site:
type: bind
- source: /srv/volumes/prometheus-config
+ source: /srv/volumes/prometheus
destination: /opt/alertmanager/config
diff --git a/docker/swarm/service/monitoring/prometheus_pushgateway.yml b/docker/swarm/service/monitoring/prometheus_pushgateway.yml
index 7ba37af..ad159b6 100644
--- a/docker/swarm/service/monitoring/prometheus_pushgateway.yml
+++ b/docker/swarm/service/monitoring/prometheus_pushgateway.yml
@@ -4,7 +4,7 @@
service:
prometheus_pushgateway:
network: monitoring
- replica: 2
+ replicas: 2
restart:
condition: any
image: ${_param:docker_image_pushgateway}
diff --git a/docker/swarm/service/monitoring/prometheus_server.yml b/docker/swarm/service/monitoring/prometheus_server.yml
index 24a9193..37bb6d3 100644
--- a/docker/swarm/service/monitoring/prometheus_server.yml
+++ b/docker/swarm/service/monitoring/prometheus_server.yml
@@ -6,7 +6,7 @@
service:
prometheus_server:
network: monitoring
- replica: 1
+ replicas: 1
environment:
config_dir: /opt/prometheus/config
bind_port: ${prometheus:server:bind:port}
@@ -17,6 +17,7 @@
storage_local_memory_chunks: ${prometheus:server:storage:local:memory_chunks}
storage_local_max_chunks_to_persist: ${prometheus:server:storage:local:max_chunks_to_persist}
storage_local_num_fingerprint_mutexes: ${prometheus:server:storage:local:num_fingerprint_mutexes}
+ discovery_domain: 'prometheus_alertmanager'
restart:
condition: any
image: ${_param:docker_image_prometheus}
@@ -25,5 +26,5 @@
volume:
site:
type: bind
- source: /srv/volumes/prometheus-config
+ source: /srv/volumes/prometheus
destination: /opt/prometheus/config
diff --git a/docker/swarm/service/phpldapadmin.yml b/docker/swarm/service/phpldapadmin.yml
index fadf714..25332c7 100644
--- a/docker/swarm/service/phpldapadmin.yml
+++ b/docker/swarm/service/phpldapadmin.yml
@@ -1,6 +1,6 @@
parameters:
_param:
- docker_image_phpldapadmin: osixia/phpldapadmin:0.6.12
+ docker_image_phpldapadmin: tcpcloud/phpldapadmin:0.6.12
docker:
client:
service:
@@ -17,5 +17,6 @@
PHPLDAPADMIN_HTTPS: false
PHPLDAPADMIN_TRUST_PROXY_SSL: true
PHPLDAPADMIN_SERVER_ADMIN: ${_param:admin_email}
+ PHPLDAPADMIN_THEME: mirantis
ports:
- 18089:80
diff --git a/gerrit/client/init.yml b/gerrit/client/init.yml
index 7dd6c77..25c0b94 100644
--- a/gerrit/client/init.yml
+++ b/gerrit/client/init.yml
@@ -1,9 +1,12 @@
classes:
- service.gerrit.client
parameters:
+ _param:
+ gerrit_try_login: true
gerrit:
client:
enabled: True
+ try_login: ${_param:gerrit_try_login}
source:
engine: pip
dir:
@@ -22,7 +25,6 @@
key: ${_param:gerrit_admin_private_key}
user:
admin:
- fullname: Administrator
ssh_key: ${_param:gerrit_admin_public_key}
group:
Event Streaming Users:
diff --git a/glance/control/storage/ceph.yml b/glance/control/storage/ceph.yml
index ef3c033..d48fb6d 100644
--- a/glance/control/storage/ceph.yml
+++ b/glance/control/storage/ceph.yml
@@ -2,7 +2,7 @@
glance:
server:
storage:
- engine: rbd
+ engine: rbd,http
user: ${_param:glance_storage_user}
pool: ${_param:glance_storage_pool}
chunk_size: 8
\ No newline at end of file
diff --git a/glusterfs/client/volume/prometheus.yml b/glusterfs/client/volume/prometheus.yml
index f8b2f3d..2b2b7db 100644
--- a/glusterfs/client/volume/prometheus.yml
+++ b/glusterfs/client/volume/prometheus.yml
@@ -4,7 +4,7 @@
glusterfs:
client:
volumes:
- prometheus-config:
- path: /srv/volumes/prometheus-config
+ prometheus:
+ path: /srv/volumes/prometheus
server: ${_param:prometheus_glusterfs_service_host}
opts: 'defaults'
diff --git a/glusterfs/server/volume/prometheus.yml b/glusterfs/server/volume/prometheus.yml
index 2c4ca31..144847a 100644
--- a/glusterfs/server/volume/prometheus.yml
+++ b/glusterfs/server/volume/prometheus.yml
@@ -2,13 +2,13 @@
glusterfs:
server:
volumes:
- prometheus-config:
- storage: /srv/glusterfs/prometheus-config
+ prometheus:
+ storage: /srv/glusterfs/prometheus
replica: 3
bricks:
- - ${_param:cluster_node01_address}:/srv/glusterfs/prometheus-config
- - ${_param:cluster_node02_address}:/srv/glusterfs/prometheus-config
- - ${_param:cluster_node03_address}:/srv/glusterfs/prometheus-config
+ - ${_param:cluster_node01_address}:/srv/glusterfs/prometheus
+ - ${_param:cluster_node02_address}:/srv/glusterfs/prometheus
+ - ${_param:cluster_node03_address}:/srv/glusterfs/prometheus
options:
cluster.readdir-optimize: On
nfs.disable: On
diff --git a/jenkins/client/approved_scripts.yml b/jenkins/client/approved_scripts.yml
index df35e92..bf46803 100644
--- a/jenkins/client/approved_scripts.yml
+++ b/jenkins/client/approved_scripts.yml
@@ -90,3 +90,5 @@
- method java.util.Collection stream
- staticMethod java.util.stream.Collectors joining java.lang.CharSequence
- method java.util.stream.Stream collect java.util.stream.Collector
+ - staticMethod java.util.regex.Pattern compile java.lang.String
+ - method java.util.regex.Matcher find
diff --git a/jenkins/client/job/aptly.yml b/jenkins/client/job/aptly.yml
index d5d8fcd..c6a5755 100644
--- a/jenkins/client/job/aptly.yml
+++ b/jenkins/client/job/aptly.yml
@@ -1,6 +1,16 @@
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}}
diff --git a/jenkins/client/job/debian/init.yml b/jenkins/client/job/debian/init.yml
index d0b40a0..f24cccc 100644
--- a/jenkins/client/job/debian/init.yml
+++ b/jenkins/client/job/debian/init.yml
@@ -1,2 +1,15 @@
classes:
- system.jenkins.client.job.debian.packages
+parameters:
+ jenkins:
+ client:
+ view:
+ Debian:
+ 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"
diff --git a/jenkins/client/job/debian/packages/extra.yml b/jenkins/client/job/debian/packages/extra.yml
index e51354a..15d0bc4 100644
--- a/jenkins/client/job/debian/packages/extra.yml
+++ b/jenkins/client/job/debian/packages/extra.yml
@@ -53,6 +53,8 @@
dist: xenial
- package: python-geventhttpclient
dist: xenial
+ - package: python-docker
+ dist: xenial
- package: python-consistent-hash
dist: xenial
- package: libipfix
diff --git a/jenkins/client/job/deploy/init.yml b/jenkins/client/job/deploy/init.yml
index 102fe73..f25086d 100644
--- a/jenkins/client/job/deploy/init.yml
+++ b/jenkins/client/job/deploy/init.yml
@@ -2,3 +2,20 @@
- system.jenkins.client.job.deploy.lab
- system.jenkins.client.job.deploy.update
- system.jenkins.client.job.deploy.openstack
+parameters:
+ jenkins:
+ client:
+ view:
+ Deploy:
+ enabled: true
+ type: CategorizedJobsView
+ include_regex: "deploy-.*"
+ categories:
+ - group_regex: "deploy-(heat|physical)-"
+ naming_rule: ""
+ - group_regex: "deploy-update-*"
+ naming_rule: "support"
+ - group_regex: "(mcp)[0-9]+"
+ naming_rule: ""
+ - group_regex: "(mk)[0-9]+"
+ naming_rule: ""
diff --git a/jenkins/client/job/deploy/lab/mk/init.yml b/jenkins/client/job/deploy/lab/mk/init.yml
index bf58f39..0bcfbc0 100644
--- a/jenkins/client/job/deploy/lab/mk/init.yml
+++ b/jenkins/client/job/deploy/lab/mk/init.yml
@@ -29,7 +29,7 @@
default: "{{install}}"
TEST:
type: string
- default: ""
+ default: "{{test}}"
# heat
HEAT_TEMPLATE_URL:
@@ -40,7 +40,7 @@
default: "gerrit"
HEAT_TEMPLATE_BRANCH:
type: string
- default: "composite"
+ default: "master"
HEAT_STACK_NAME:
type: string
description: Heat stack name. Will be generated if missing.
diff --git a/jenkins/client/job/deploy/lab/mk/physical.yml b/jenkins/client/job/deploy/lab/mk/physical.yml
index a66909d..0767359 100644
--- a/jenkins/client/job/deploy/lab/mk/physical.yml
+++ b/jenkins/client/job/deploy/lab/mk/physical.yml
@@ -6,12 +6,16 @@
- lab: mcp10_contrail
install: core,kvm,openstack,contrail
stack_type: physical
+ test: openstack
- lab: mcp10_opencontrail_nfv
install: core,kvm,openstack,nfv
stack_type: physical
+ test: openstack
- lab: mcp10_dvr
install: core,kvm,openstack,dvr
stack_type: physical
+ test: openstack
- lab: mcp10_non_dvr
install: core,kvm,openstack
stack_type: physical
+ test: openstack
diff --git a/jenkins/client/job/deploy/lab/mk/virtual.yml b/jenkins/client/job/deploy/lab/mk/virtual.yml
index af65a4d..a97a22a 100644
--- a/jenkins/client/job/deploy/lab/mk/virtual.yml
+++ b/jenkins/client/job/deploy/lab/mk/virtual.yml
@@ -6,27 +6,40 @@
- lab: virtual_mcp05_dvr
install: core,openstack,dvr
stack_type: heat
+ test: openstack
- lab: virtual_mcp05_ovs
install: core,openstack,ovs
stack_type: heat
+ test: openstack
- lab: virtual_mcp10_contrail
install: core,openstack,contrail
stack_type: heat
+ test: openstack
- lab: virtual_mcp10_dvr
install: core,openstack,dvr
stack_type: heat
+ test: openstack
- lab: virtual_mcp10_ovs
install: core,openstack,ovs
stack_type: heat
+ test: openstack
+ - lab: virtual_mcp10_k8s
+ install: core,k8s
+ stack_type: heat
+ test: k8s
- lab: virtual_mk20_advanced
install: core,openstack
stack_type: heat
+ test: openstack
- lab: virtual_mk20_basic
install: core,openstack
stack_type: heat
+ test: openstack
- lab: virtual_mk22_advanced
install: core,openstack
stack_type: heat
+ test: openstack
- lab: virtual_mk22_basic
install: core,openstack
stack_type: heat
+ test: openstack
diff --git a/jenkins/client/job/opencontrail/init.yml b/jenkins/client/job/opencontrail/init.yml
index 72ee4fe..b41a357 100644
--- a/jenkins/client/job/opencontrail/init.yml
+++ b/jenkins/client/job/opencontrail/init.yml
@@ -7,3 +7,21 @@
contrail_kubernetes_branches: "master,release-1.2"
contrail_dpdk_extra_branches: "mitaka,kilo,liberty-multiqueue"
contrail_ceilometer_plugin_branches: "master"
+ jenkins:
+ client:
+ view:
+ Opencontrail:
+ enabled: true
+ type: CategorizedJobsView
+ include_regex: "build-opencontrail-.*"
+ categories:
+ - group_regex: "build-opencontrail-dpdk-extra-.*"
+ naming_rule: "DPDK Extras"
+ - group_regex: "build-opencontrail-oc303-.*"
+ naming_rule: "R3.0.3.x"
+ - group_regex: "build-opencontrail-oc31-.*"
+ naming_rule: "R3.1"
+ - group_regex: "build-opencontrail-oc311-.*"
+ naming_rule: "R3.1.1.x"
+ - group_regex: "build-opencontrail-oc32-.*"
+ naming_rule: "R3.2"
diff --git a/jenkins/client/job/salt-formulas/init.yml b/jenkins/client/job/salt-formulas/init.yml
index c498032..8c8c2e2 100644
--- a/jenkins/client/job/salt-formulas/init.yml
+++ b/jenkins/client/job/salt-formulas/init.yml
@@ -2,3 +2,16 @@
- 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"
diff --git a/jenkins/client/job/salt-formulas/tests.yml b/jenkins/client/job/salt-formulas/tests.yml
index 9ac5492..0dd7102 100644
--- a/jenkins/client/job/salt-formulas/tests.yml
+++ b/jenkins/client/job/salt-formulas/tests.yml
@@ -141,3 +141,10 @@
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
diff --git a/jenkins/client/job/salt-models/generate.yml b/jenkins/client/job/salt-models/generate.yml
index 60cfb14..6f2c85c 100644
--- a/jenkins/client/job/salt-models/generate.yml
+++ b/jenkins/client/job/salt-models/generate.yml
@@ -2,11 +2,11 @@
jenkins:
client:
job_template:
- generate_reclass_clusters:
- name: generate_reclass_cluster_{{cookiecutter_template}}
+ generate-salt-model:
+ name: generate-salt-model-{{cookiecutter_template}}
param:
cookiecutter_template:
- - separated_products
+ - separated-products
template:
type: workflow-scm
concurrent: true
@@ -48,10 +48,13 @@
type: string
RECLASS_MODEL_URL:
type: string
- default: "jenkins-mk@${_param:jenkins_gerrit_url}/salt-models/training.git"
+ default: "${_param:jenkins_gerrit_url}/salt-models/training.git"
RECLASS_MODEL_CREDENTIALS:
type: string
default: gerrit
RECLASS_MODEL_BRANCH:
type: string
default: master
+ COMMIT_CHANGES:
+ type: boolean
+ default: false
diff --git a/jenkins/client/job/salt-models/tests.yml b/jenkins/client/job/salt-models/tests.yml
index e451daf..c980d1d 100644
--- a/jenkins/client/job/salt-models/tests.yml
+++ b/jenkins/client/job/salt-models/tests.yml
@@ -40,14 +40,13 @@
SALT_OPTS:
type: string
default: "--force-color"
- GIT_URL:
- type: string
- default: "${_param:jenkins_gerrit_url}/salt-models/{{name}}"
- RECLASS_SYSTEM_GIT_URL:
+ DEFAULT_GIT_URL:
type: string
description: "Run against alternate system reclass"
- RECLASS_SYSTEM_GIT_REF:
+ default: "${_param:jenkins_gerrit_url}/salt-models/{{name}}"
+ DEFAULT_GIT_REF:
type: string
+ default: master
CREDENTIALS_ID:
type: string
default: "gerrit"
@@ -83,3 +82,10 @@
TEST_MODELS:
type: string
default: "{{clusters}}"
+ DEFAULT_GIT_URL:
+ type: string
+ description: "Run against alternate system reclass"
+ default: "${_param:jenkins_gerrit_url}/salt-models/reclass-system"
+ DEFAULT_GIT_REF:
+ type: string
+ default: master
diff --git a/jenkins/client/job/test_devops_portal.yml b/jenkins/client/job/test_devops_portal.yml
new file mode 100644
index 0000000..0d9f2df
--- /dev/null
+++ b/jenkins/client/job/test_devops_portal.yml
@@ -0,0 +1,46 @@
+parameters:
+ jenkins:
+ client:
+ job:
+ test-devops-portal-unittests:
+ name: test-devops-portal-unittests
+ discard:
+ build:
+ keep_num: 10
+ artifact:
+ keep_num: 10
+ type: workflow-scm
+ concurrent: true
+ scm:
+ type: git
+ url: "${_param:jenkins_gerrit_url}/mk/mk-pipelines"
+ credentials: "gerrit"
+ script: test-nodejs-pipeline.groovy
+ trigger:
+ gerrit:
+ project:
+ "oss/devops-portal":
+ branches:
+ - master
+ event:
+ patchset:
+ - created:
+ excludeDrafts: false
+ excludeTrivialRebase: false
+ excludeNoCodeChange: false
+ comment:
+ - addedContains:
+ commentAddedCommentContains: '(recheck|reverify)'
+ param:
+ CREDENTIALS_ID:
+ type: string
+ default: "gerrit"
+ NODE_IMAGE:
+ type: string
+ default: "docker-sandbox.sandbox.mirantis.net/ikharin/ci/node-firefox:6.10"
+ COMMANDS:
+ type: text
+ default: |
+ npm run lint
+ npm run test:unit
+ npm run test:functional
diff --git a/jenkins/client/job/test_pipelines.yml b/jenkins/client/job/test_pipelines.yml
index b418626..5d58f20 100644
--- a/jenkins/client/job/test_pipelines.yml
+++ b/jenkins/client/job/test_pipelines.yml
@@ -41,3 +41,10 @@
GRADLE_CMD:
type: string
default: "check"
+ DEFAULT_GIT_URL:
+ type: string
+ description: "Run against alternate system reclass"
+ default: "${_param:jenkins_gerrit_url}/mk/mk-pipelines"
+ DEFAULT_GIT_REF:
+ type: string
+ default: master
diff --git a/jenkins/client/security/matrix.yml b/jenkins/client/security/matrix.yml
index 4c3c8a9..b08aefd 100644
--- a/jenkins/client/security/matrix.yml
+++ b/jenkins/client/security/matrix.yml
@@ -3,6 +3,7 @@
# Full admin access
jenkins_security_matrix_admins:
- ${_param:jenkins_client_user}
+ - admins
# Read only access
jenkins_security_matrix_read: []
# Read + permissions to build jobs
diff --git a/linux/system/repo/mcp/contrail.yml b/linux/system/repo/mcp/contrail.yml
index 9f65ee3..9054f18 100644
--- a/linux/system/repo/mcp/contrail.yml
+++ b/linux/system/repo/mcp/contrail.yml
@@ -9,3 +9,7 @@
source: "deb [arch=amd64] http://apt-mk.mirantis.com/${_param:linux_system_codename}/ ${_param:apt_mk_version} ${_param:openstack_version} ${_param:linux_repo_contrail_component} extra"
architectures: amd64
key_url: "http://apt-mk.mirantis.com/public.gpg"
+ pin:
+ - pin: 'release a=${_param:openstack_version}-holdback'
+ priority: 1100
+ package: '*'
\ No newline at end of file
diff --git a/linux/system/repo/mcp/extra.yml b/linux/system/repo/mcp/extra.yml
index d8977f4..49e4532 100644
--- a/linux/system/repo/mcp/extra.yml
+++ b/linux/system/repo/mcp/extra.yml
@@ -9,3 +9,7 @@
architectures: amd64
key_url: "http://apt-mk.mirantis.com/public.gpg"
clean_file: true
+ pin:
+ - pin: 'release a=${_param:openstack_version}-holdback'
+ priority: 1100
+ package: '*'
diff --git a/linux/system/repo/mcp/openstack.yml b/linux/system/repo/mcp/openstack.yml
index 67c9cad..d829c94 100644
--- a/linux/system/repo/mcp/openstack.yml
+++ b/linux/system/repo/mcp/openstack.yml
@@ -9,24 +9,47 @@
source: "deb http://mirror.fuel-infra.org/mcp-repos/${_param:mcp_repo_version}/${_param:linux_system_codename} ${_param:openstack_version} main"
architectures: amd64
key_url: "http://mirror.fuel-infra.org/mcp-repos/${_param:mcp_repo_version}/${_param:linux_system_codename}/archive-mcp${_param:mcp_repo_version}.key"
+ pin:
+ - pin: 'release a=${_param:openstack_version}'
+ priority: 1050
+ package: '*'
mirantis_openstack_hotfix:
source: "deb http://mirror.fuel-infra.org/mcp-repos/${_param:mcp_repo_version}/${_param:linux_system_codename} ${_param:openstack_version}-hotfix main"
architectures: amd64
key_url: "http://mirror.fuel-infra.org/mcp-repos/${_param:mcp_repo_version}/${_param:linux_system_codename}/archive-mcp${_param:mcp_repo_version}.key"
+ pin:
+ - pin: 'release a=${_param:openstack_version}-hotfix'
+ priority: 1050
+ package: '*'
mirantis_openstack_security:
source: "deb http://mirror.fuel-infra.org/mcp-repos/${_param:mcp_repo_version}/${_param:linux_system_codename} ${_param:openstack_version}-security main"
architectures: amd64
key_url: "http://mirror.fuel-infra.org/mcp-repos/${_param:mcp_repo_version}/${_param:linux_system_codename}/archive-mcp${_param:mcp_repo_version}.key"
+ pin:
+ - pin: 'release a=${_param:openstack_version}-security'
+ priority: 1050
+ package: '*'
mirantis_openstack_updates:
source: "deb http://mirror.fuel-infra.org/mcp-repos/${_param:mcp_repo_version}/${_param:linux_system_codename} ${_param:openstack_version}-updates main"
architectures: amd64
key_url: "http://mirror.fuel-infra.org/mcp-repos/${_param:mcp_repo_version}/${_param:linux_system_codename}/archive-mcp${_param:mcp_repo_version}.key"
+ pin:
+ - pin: 'release a=${_param:openstack_version}-uptades'
+ priority: 1050
+ package: '*'
mirantis_openstack_holdback:
source: "deb http://mirror.fuel-infra.org/mcp-repos/${_param:mcp_repo_version}/${_param:linux_system_codename} ${_param:openstack_version}-holdback main"
architectures: amd64
key_url: "http://mirror.fuel-infra.org/mcp-repos/${_param:mcp_repo_version}/${_param:linux_system_codename}/archive-mcp${_param:mcp_repo_version}.key"
+ pin:
+ - pin: 'release a=${_param:openstack_version}-holdback'
+ priority: 1050
+ package: '*'
mk_openstack:
source: "deb [arch=amd64] http://apt-mk.mirantis.com/${_param:linux_system_codename}/ ${_param:apt_mk_version} ${_param:openstack_version}"
architectures: amd64
key_url: "http://apt-mk.mirantis.com/public.gpg"
-
+ pin:
+ - pin: 'release a=${_param:apt_mk_version}'
+ priority: 1100
+ package: '*'
\ No newline at end of file
diff --git a/linux/system/repo/mcp/salt.yml b/linux/system/repo/mcp/salt.yml
index 1941fe8..209943c 100644
--- a/linux/system/repo/mcp/salt.yml
+++ b/linux/system/repo/mcp/salt.yml
@@ -9,3 +9,7 @@
architectures: amd64
key_url: "http://apt-mk.mirantis.com/public.gpg"
clean_file: true
+ pin:
+ - pin: 'release a=${_param:openstack_version}-holdback'
+ priority: 1100
+ package: '*'
\ No newline at end of file
diff --git a/linux/system/repo/ubuntu.yml b/linux/system/repo/ubuntu.yml
index b4137bd..d36bcc1 100644
--- a/linux/system/repo/ubuntu.yml
+++ b/linux/system/repo/ubuntu.yml
@@ -3,19 +3,19 @@
system:
repo:
ubuntu:
- source: "deb http://archive.ubuntu.com/ubuntu/ ${_param:linux_system_codename} main restricted universe"
+ source: "deb [arch=amd64] http://archive.ubuntu.com/ubuntu/ ${_param:linux_system_codename} main restricted universe"
architectures: amd64
default: true
key_id: 437D05B5
key_server: keyserver.ubuntu.com
ubuntu_updates:
- source: "deb http://archive.ubuntu.com/ubuntu/ ${_param:linux_system_codename}-updates main restricted universe"
+ source: "deb [arch=amd64] http://archive.ubuntu.com/ubuntu/ ${_param:linux_system_codename}-updates main restricted universe"
architectures: amd64
default: true
key_id: 437D05B5
key_server: keyserver.ubuntu.com
ubuntu_security:
- source: "deb http://archive.ubuntu.com/ubuntu/ ${_param:linux_system_codename}-security main restricted universe"
+ source: "deb [arch=amd64] http://archive.ubuntu.com/ubuntu/ ${_param:linux_system_codename}-security main restricted universe"
architectures: amd64
default: true
key_id: 437D05B5
diff --git a/linux/system/repo_local/glusterfs.yml b/linux/system/repo_local/glusterfs.yml
new file mode 100644
index 0000000..c34a6f2
--- /dev/null
+++ b/linux/system/repo_local/glusterfs.yml
@@ -0,0 +1,11 @@
+parameters:
+ _param:
+ apt_mk_version: stable
+ linux:
+ system:
+ repo:
+ glusterfs:
+ refresh_db: ${_param:linux_repo_refresh_db}
+ source: "deb [arch=amd64] http://${_param:local_repo_url}/ubuntu-${_param:linux_system_codename}/ ${_param:apt_mk_version} main"
+ architectures: amd64
+ key_url: "http://${_param:local_repo_url}/public.gpg"
\ No newline at end of file
diff --git a/linux/system/repo_local/maas.yml b/linux/system/repo_local/maas.yml
new file mode 100644
index 0000000..ca65a79
--- /dev/null
+++ b/linux/system/repo_local/maas.yml
@@ -0,0 +1,11 @@
+parameters:
+ _param:
+ apt_mk_version: stable
+ linux:
+ system:
+ repo:
+ maas:
+ refresh_db: ${_param:linux_repo_refresh_db}
+ source: "deb [arch=amd64] http://${_param:local_repo_url}/${_param:linux_system_codename}/ ${_param:apt_mk_version} maas"
+ architectures: amd64
+ key_url: "http://${_param:local_repo_url}/public.gpg"
\ No newline at end of file
diff --git a/neutron/control/openvswitch/cluster.yml b/neutron/control/openvswitch/cluster.yml
index dfc3c82..dc8e0c5 100644
--- a/neutron/control/openvswitch/cluster.yml
+++ b/neutron/control/openvswitch/cluster.yml
@@ -22,8 +22,12 @@
mechanism:
ovs:
driver: openvswitch
+ compute:
+ region: ${_param:openstack_region}
database:
host: ${_param:openstack_database_address}
+ identity:
+ region: ${_param:openstack_region}
message_queue:
members:
- host: ${_param:openstack_message_queue_node01_address}
@@ -64,4 +68,4 @@
- name: ctl03
host: ${_param:cluster_node03_address}
port: 9696
- params: check inter 10s fastinter 2s downinter 3s rise 3 fall 3
\ No newline at end of file
+ params: check inter 10s fastinter 2s downinter 3s rise 3 fall 3
diff --git a/openssh/server/team/members/zahedkhurasani.yml b/openssh/server/team/members/zahedkhurasani.yml
index f1a36a2..8504005 100644
--- a/openssh/server/team/members/zahedkhurasani.yml
+++ b/openssh/server/team/members/zahedkhurasani.yml
@@ -21,5 +21,5 @@
user: ${linux:system:user:zkhurasani}
public_keys:
zkhurasani:
- - key: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDIFv/QaKxzK3Y5fRWrq8rgiFIlL1nDnwClyhaxUE08lZ3yxOdMuwyR2+ODcm1+ZX8L3YnXGxVA0avDxAZTbGr/Bo8F0QTTtkv827d/7qrtWwnH0egPqIegWAwvh1nDiSaPJNoq6HbvLVjhIwRO9J+qgFrIfu5Ul8FmvaV9wRmuyI44TbtgmHVcLdVGZEJzFCKZvR8nOPXmWJtVuHzUpgGnMgwx06sPBYBuMkamOdsCWZpV6hXFA9Htk6Yws549LJ3fuHk3lv9prYfJz99m6dhqW+P6sx9YOrZCZT6d03aWZ6KOj43MDQMltPmrCKg1HoeQ8emP6Nere2bLbMg2xY5d
+ - key: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCdj43vCWri1SfE0/z24blmTG229kdbwmkK4R5ZzGx63r9Elj1NeOj7Bu7o3QwdtusAEq24dnIs3bSJEgMm+vsYyKcHMoPzrEeD4b42SEZnINBvUTaYHKjZKw9JvaNL8ZibfubiMeDVsefHX0/swAGPosCVNDiTYlIWUT2gKoFcHH8vyRzCC+KOxXvkWQtmJHML5lVHkTVhpgQln8G7aAmyvLMNFzDkOASkMU29uAA/9fWLqtc4T3fA3AUVEcClVI8fFYcDZDP6Y7HZP+hDZYe8vFxHEEpOM7CCq38M22p6nf00ITia60QyYGjpm2cgJPv1DmPZ4cwrbSCpMcvFu7kt
diff --git a/prometheus/server/target/dns.yml b/prometheus/server/target/dns.yml
new file mode 100644
index 0000000..b51f732
--- /dev/null
+++ b/prometheus/server/target/dns.yml
@@ -0,0 +1,15 @@
+parameters:
+ prometheus:
+ server:
+ target:
+ dns:
+ - name: 'pushgateway'
+ domain:
+ - 'tasks.prometheus_pushgateway'
+ type: A
+ port: 9091
+ - name: 'prometheus'
+ domain:
+ - 'tasks.prometheus_server'
+ type: A
+ port: 9090
diff --git a/prometheus/server/target/etcd.yml b/prometheus/server/target/etcd.yml
index e343bda..ae75c64 100644
--- a/prometheus/server/target/etcd.yml
+++ b/prometheus/server/target/etcd.yml
@@ -1,6 +1,16 @@
-classes:
-- service.etcd.server.cluster
parameters:
- server:
- target:
- etcd: ${etcd:server:members}
+ prometheus:
+ server:
+ target:
+ etcd:
+ scheme: https
+ ssl_dir: /opt/prometheus/config
+ cert_name: prometheus-server.crt
+ key_name: prometheus-server.key
+ member:
+ - host: ${_param:cluster_node01_address}
+ port: ${_param:cluster_node01_port}
+ - host: ${_param:cluster_node02_address}
+ port: ${_param:cluster_node02_port}
+ - host: ${_param:cluster_node03_address}
+ port: ${_param:cluster_node03_port}
diff --git a/prometheus/server/target/kubernetes.yml b/prometheus/server/target/kubernetes.yml
index 293895b..8abed5d 100644
--- a/prometheus/server/target/kubernetes.yml
+++ b/prometheus/server/target/kubernetes.yml
@@ -1,10 +1,9 @@
-classes:
-- service.kubernetes.master.cluster
parameters:
- server:
- target:
- kubernetes:
- api_ip: ${kubernetes:master:apiserver:address}
- ssl_dir: /opt/prometheus/config
- cert_name: kubelet-client.crt
- key_name: kubelet-client.key
+ prometheus:
+ server:
+ target:
+ kubernetes:
+ api_ip: ${_param:kubernetes_control_address}
+ ssl_dir: /opt/prometheus/config
+ cert_name: prometheus-server.crt
+ key_name: prometheus-server.key
diff --git a/salt/master/formula/pkg/foundation.yml b/salt/master/formula/pkg/foundation.yml
index 3611321..ebb2b00 100644
--- a/salt/master/formula/pkg/foundation.yml
+++ b/salt/master/formula/pkg/foundation.yml
@@ -4,6 +4,9 @@
environment:
prd:
formula:
+ aptcacher:
+ source: pkg
+ name: salt-formula-aptcacher
aptly:
source: pkg
name: salt-formula-aptly
@@ -19,7 +22,9 @@
freeipa:
source: pkg
name: salt-formula-freeipa
+ maas:
+ source: pkg
+ name: salt-formula-maas
openldap:
source: pkg
name: salt-formula-openldap
-
diff --git a/salt/master/git.yml b/salt/master/git.yml
index 02d0b67..267bdb1 100644
--- a/salt/master/git.yml
+++ b/salt/master/git.yml
@@ -4,6 +4,7 @@
- system.salt.master.formula.git.foundation
- system.salt.master.formula.git.kubernetes
- system.salt.master.formula.git.openstack
+- system.salt.master.formula.git.oss
- system.salt.master.formula.git.saltstack
- system.salt.master.formula.git.stacklight
- system.salt.master.formula.git.monitoring
diff --git a/salt/master/pkg.yml b/salt/master/pkg.yml
index b075138..1001d49 100644
--- a/salt/master/pkg.yml
+++ b/salt/master/pkg.yml
@@ -4,6 +4,7 @@
- system.salt.master.formula.pkg.foundation
- system.salt.master.formula.pkg.kubernetes
- system.salt.master.formula.pkg.openstack
+- system.salt.master.formula.pkg.oss
- system.salt.master.formula.pkg.saltstack
- system.salt.master.formula.pkg.stacklight
- system.salt.master.formula.pkg.monitoring
diff --git a/salt/minion/cert/k8s_client_prometheus.yml b/salt/minion/cert/prometheus_server.yml
similarity index 63%
rename from salt/minion/cert/k8s_client_prometheus.yml
rename to salt/minion/cert/prometheus_server.yml
index 04cd374..23c4abf 100644
--- a/salt/minion/cert/k8s_client_prometheus.yml
+++ b/salt/minion/cert/prometheus_server.yml
@@ -2,11 +2,12 @@
salt:
minion:
cert:
- k8s_client_prometheus:
+ prometheus_server:
host: ${_param:salt_minion_ca_host}
authority: ${_param:salt_minion_ca_authority}
- key_file: /srv/volumes/prometheus-config/kubelet-client.key
- cert_file: /srv/volumes/prometheus-config/kubelet-client.crt
- common_name: kubelet-client
+ key_file: /srv/volumes/prometheus/prometheus-server.key
+ cert_file: /srv/volumes/prometheus/prometheus-server.crt
+ common_name: prometheus-server
signing_policy: cert_client
alternative_names: IP:${_param:cluster_vip_address},IP:${_param:cluster_node01_address},IP:${_param:cluster_node02_address},IP:${_param:cluster_node03_address},IP:${_param:kubernetes_internal_api_address}
+ mode: '0444'