Merge "Add default fqdn and web port"
diff --git a/aptly/server/repo/ubuntu/trusty/extra.yml b/aptly/server/repo/ubuntu/trusty/extra.yml
new file mode 100644
index 0000000..9a799b3
--- /dev/null
+++ b/aptly/server/repo/ubuntu/trusty/extra.yml
@@ -0,0 +1,15 @@
+parameters:
+ aptly:
+ server:
+ repo:
+ ubuntu-trusty-extra:
+ distribution: trusty
+ component: main
+ architectures: amd64
+ comment: "Extra packages for Ubuntu Trusty"
+ publisher:
+ component: extra
+ distributions:
+ - trusty/nightly
+ architectures:
+ - amd64
diff --git a/aptly/server/repo/ubuntu/trusty/opencontrail.yml b/aptly/server/repo/ubuntu/trusty/opencontrail.yml
new file mode 100644
index 0000000..5d98c42
--- /dev/null
+++ b/aptly/server/repo/ubuntu/trusty/opencontrail.yml
@@ -0,0 +1,136 @@
+parameters:
+ aptly:
+ server:
+ repo:
+ ubuntu-trusty-oc302:
+ distribution: trusty
+ component: main
+ architectures: amd64
+ comment: "Opencontrail 3.0.2.x"
+ publisher:
+ component: oc302
+ distributions:
+ - trusty/nightly
+ architectures:
+ - amd64
+ ubuntu-trusty-oc303:
+ distribution: trusty
+ component: main
+ architectures: amd64
+ comment: "Opencontrail 3.0.3.x"
+ publisher:
+ component: oc303
+ distributions:
+ - trusty/nightly
+ architectures:
+ - amd64
+ ubuntu-trusty-oc31:
+ distribution: trusty
+ component: main
+ architectures: amd64
+ comment: "Opencontrail 3.1"
+ publisher:
+ component: oc31
+ distributions:
+ - trusty/nightly
+ architectures:
+ - amd64
+ ubuntu-trusty-oc31-exp:
+ distribution: trusty
+ component: main
+ architectures: amd64
+ comment: "Opencontrail 3.1 experimental"
+ publisher:
+ component: oc31
+ distributions:
+ - trusty-dev/nightly
+ architectures:
+ - amd64
+ ubuntu-trusty-oc311:
+ distribution: trusty
+ component: main
+ architectures: amd64
+ comment: "Opencontrail 3.1.1.x"
+ publisher:
+ component: oc311
+ distributions:
+ - trusty/nightly
+ architectures:
+ - amd64
+ ubuntu-trusty-oc311-exp:
+ distribution: trusty
+ component: main
+ architectures: amd64
+ comment: "Opencontrail 3.1.1.x experimental"
+ publisher:
+ component: oc311
+ distributions:
+ - trusty-dev/nightly
+ architectures:
+ - amd64
+ ubuntu-trusty-oc32:
+ distribution: trusty
+ component: main
+ architectures: amd64
+ comment: "Opencontrail 3.2"
+ publisher:
+ component: oc32
+ distributions:
+ - trusty/nightly
+ architectures:
+ - amd64
+ ubuntu-trusty-oc323:
+ distribution: trusty
+ component: main
+ architectures: amd64
+ comment: "Opencontrail 3.2.3.x"
+ publisher:
+ component: oc323
+ distributions:
+ - trusty/nightly
+ architectures:
+ - amd64
+ ubuntu-trusty-oc32-exp:
+ distribution: trusty
+ component: main
+ architectures: amd64
+ comment: "Opencontrail 3.2 experimental"
+ publisher:
+ component: oc32
+ distributions:
+ - trusty-dev/nightly
+ architectures:
+ - amd64
+ ubuntu-trusty-oc40:
+ distribution: trusty
+ component: main
+ architectures: amd64
+ comment: "Opencontrail 4.0"
+ publisher:
+ component: oc40
+ distributions:
+ - trusty/nightly
+ architectures:
+ - amd64
+ ubuntu-trusty-oc40-exp:
+ distribution: trusty
+ component: main
+ architectures: amd64
+ comment: "Opencontrail 4.0 experimental"
+ publisher:
+ component: oc40
+ distributions:
+ - trusty-dev/nightly
+ architectures:
+ - amd64
+ ubuntu-trusty-oc666:
+ distribution: trusty
+ component: main
+ architectures: amd64
+ comment: "Opencontrail master"
+ publisher:
+ component: oc666
+ distributions:
+ - trusty/nightly
+ architectures:
+ - amd64
diff --git a/aptly/server/repo/ubuntu/trusty/openstack.yml b/aptly/server/repo/ubuntu/trusty/openstack.yml
new file mode 100644
index 0000000..09ace8f
--- /dev/null
+++ b/aptly/server/repo/ubuntu/trusty/openstack.yml
@@ -0,0 +1,37 @@
+parameters:
+ aptly:
+ server:
+ repo:
+ ubuntu-trusty-kilo:
+ distribution: trusty
+ component: main
+ architectures: amd64
+ comment: "Extra packages for Openstack Kilo"
+ publisher:
+ component: kilo
+ distributions:
+ - trusty/nightly
+ architectures:
+ - amd64
+ ubuntu-trusty-liberty:
+ distribution: trusty
+ component: main
+ architectures: amd64
+ comment: "Extra packages for Openstack Liberty"
+ publisher:
+ component: liberty
+ distributions:
+ - trusty/nightly
+ architectures:
+ - amd64
+ ubuntu-trusty-mitaka:
+ distribution: trusty
+ component: main
+ architectures: amd64
+ comment: "Extra packages for Openstack Mitaka"
+ publisher:
+ component: mitaka
+ distributions:
+ - trusty/nightly
+ architectures:
+ - amd64
diff --git a/aptly/server/repo/ubuntu/trusty/salt.yml b/aptly/server/repo/ubuntu/trusty/salt.yml
new file mode 100644
index 0000000..473c968
--- /dev/null
+++ b/aptly/server/repo/ubuntu/trusty/salt.yml
@@ -0,0 +1,15 @@
+parameters:
+ aptly:
+ server:
+ repo:
+ ubuntu-trusty-salt:
+ distribution: trusty
+ component: main
+ architectures: amd64
+ comment: "Salt formulas for Ubuntu Trusty"
+ publisher:
+ component: salt
+ distributions:
+ - trusty/nightly
+ architectures:
+ - amd64
diff --git a/aptly/server/repo/ubuntu/xenial/extra.yml b/aptly/server/repo/ubuntu/xenial/extra.yml
new file mode 100644
index 0000000..2af633f
--- /dev/null
+++ b/aptly/server/repo/ubuntu/xenial/extra.yml
@@ -0,0 +1,15 @@
+parameters:
+ aptly:
+ server:
+ repo:
+ ubuntu-xenial-extra:
+ distribution: xenial
+ component: main
+ architectures: amd64
+ comment: "Extra packages for Ubuntu Xenial"
+ publisher:
+ component: extra
+ distributions:
+ - xenial/nightly
+ architectures:
+ - amd64
diff --git a/aptly/server/repo/ubuntu/xenial/opencontrail.yml b/aptly/server/repo/ubuntu/xenial/opencontrail.yml
new file mode 100644
index 0000000..7f47577
--- /dev/null
+++ b/aptly/server/repo/ubuntu/xenial/opencontrail.yml
@@ -0,0 +1,136 @@
+parameters:
+ aptly:
+ server:
+ repo:
+ ubuntu-xenial-oc302:
+ distribution: xenial
+ component: main
+ architectures: amd64
+ comment: "Opencontrail 3.0.2.x"
+ publisher:
+ component: oc302
+ distributions:
+ - xenial/nightly
+ architectures:
+ - amd64
+ ubuntu-xenial-oc303:
+ distribution: xenial
+ component: main
+ architectures: amd64
+ comment: "Opencontrail 3.0.3.x"
+ publisher:
+ component: oc303
+ distributions:
+ - xenial/nightly
+ architectures:
+ - amd64
+ ubuntu-xenial-oc31:
+ distribution: xenial
+ component: main
+ architectures: amd64
+ comment: "Opencontrail 3.1"
+ publisher:
+ component: oc31
+ distributions:
+ - xenial/nightly
+ architectures:
+ - amd64
+ ubuntu-xenial-oc31-exp:
+ distribution: xenial
+ component: main
+ architectures: amd64
+ comment: "Opencontrail 3.1 experimental"
+ publisher:
+ component: oc31
+ distributions:
+ - xenial-dev/nightly
+ architectures:
+ - amd64
+ ubuntu-xenial-oc311:
+ distribution: xenial
+ component: main
+ architectures: amd64
+ comment: "Opencontrail 3.1.1.x"
+ publisher:
+ component: oc311
+ distributions:
+ - xenial/nightly
+ architectures:
+ - amd64
+ ubuntu-xenial-oc311-exp:
+ distribution: xenial
+ component: main
+ architectures: amd64
+ comment: "Opencontrail 3.1.1.x experimental"
+ publisher:
+ component: oc311
+ distributions:
+ - xenial-dev/nightly
+ architectures:
+ - amd64
+ ubuntu-xenial-oc32:
+ distribution: xenial
+ component: main
+ architectures: amd64
+ comment: "Opencontrail 3.2"
+ publisher:
+ component: oc32
+ distributions:
+ - xenial/nightly
+ architectures:
+ - amd64
+ ubuntu-xenial-oc323:
+ distribution: xenial
+ component: main
+ architectures: amd64
+ comment: "Opencontrail 3.2.3.x"
+ publisher:
+ component: oc323
+ distributions:
+ - xenial/nightly
+ architectures:
+ - amd64
+ ubuntu-xenial-oc32-exp:
+ distribution: xenial
+ component: main
+ architectures: amd64
+ comment: "Opencontrail 3.2 experimental"
+ publisher:
+ component: oc32
+ distributions:
+ - xenial-dev/nightly
+ architectures:
+ - amd64
+ ubuntu-xenial-oc40:
+ distribution: xenial
+ component: main
+ architectures: amd64
+ comment: "Opencontrail 4.0"
+ publisher:
+ component: oc40
+ distributions:
+ - xenial/nightly
+ architectures:
+ - amd64
+ ubuntu-xenial-oc40-exp:
+ distribution: xenial
+ component: main
+ architectures: amd64
+ comment: "Opencontrail 4.0 experimental"
+ publisher:
+ component: oc40
+ distributions:
+ - xenial-dev/nightly
+ architectures:
+ - amd64
+ ubuntu-xenial-oc666:
+ distribution: xenial
+ component: main
+ architectures: amd64
+ comment: "Opencontrail master"
+ publisher:
+ component: oc666
+ distributions:
+ - xenial/nightly
+ architectures:
+ - amd64
diff --git a/aptly/server/repo/ubuntu/xenial/openstack.yml b/aptly/server/repo/ubuntu/xenial/openstack.yml
new file mode 100644
index 0000000..8639807
--- /dev/null
+++ b/aptly/server/repo/ubuntu/xenial/openstack.yml
@@ -0,0 +1,59 @@
+parameters:
+ aptly:
+ server:
+ repo:
+ ubuntu-xenial-kilo:
+ distribution: xenial
+ component: main
+ architectures: amd64
+ comment: "Extra packages for Openstack Kilo"
+ publisher:
+ component: kilo
+ distributions:
+ - xenial/nightly
+ architectures:
+ - amd64
+ ubuntu-xenial-liberty:
+ distribution: xenial
+ component: main
+ architectures: amd64
+ comment: "Extra packages for Openstack Liberty"
+ publisher:
+ component: liberty
+ distributions:
+ - xenial/nightly
+ architectures:
+ - amd64
+ ubuntu-xenial-mitaka:
+ distribution: xenial
+ component: main
+ architectures: amd64
+ comment: "Extra packages for Openstack Mitaka"
+ publisher:
+ component: mitaka
+ distributions:
+ - xenial/nightly
+ architectures:
+ - amd64
+ ubuntu-xenial-newton:
+ distribution: xenial
+ component: main
+ architectures: amd64
+ comment: "Extra packages for Openstack Newton"
+ publisher:
+ component: newton
+ distributions:
+ - xenial/nightly
+ architectures:
+ - amd64
+ ubuntu-xenial-ocata:
+ distribution: xenial
+ component: main
+ architectures: amd64
+ comment: "Extra packages for Openstack Ocata"
+ publisher:
+ component: ocata
+ distributions:
+ - xenial/nightly
+ architectures:
+ - amd64
diff --git a/aptly/server/repo/ubuntu/xenial/salt.yml b/aptly/server/repo/ubuntu/xenial/salt.yml
new file mode 100644
index 0000000..df74fc2
--- /dev/null
+++ b/aptly/server/repo/ubuntu/xenial/salt.yml
@@ -0,0 +1,15 @@
+parameters:
+ aptly:
+ server:
+ repo:
+ ubuntu-xenial-salt:
+ distribution: xenial
+ component: main
+ architectures: amd64
+ comment: "Salt formulas for Ubuntu Xenial"
+ publisher:
+ component: salt
+ distributions:
+ - xenial/nightly
+ architectures:
+ - amd64
diff --git a/artifactory/client/init.yml b/artifactory/client/init.yml
new file mode 100644
index 0000000..9aea48b
--- /dev/null
+++ b/artifactory/client/init.yml
@@ -0,0 +1,22 @@
+parameters:
+ artifactory:
+ client:
+ enabled: True
+ source:
+ engine: pip
+ server:
+ host: ${_param:artifactory_server_host}
+ port: ${_param:artifactory_server_port}
+ user: ${_param:artifactory_client_user}
+ password: ${_param:artifactory_client_password}
+ ssl_verify: False
+ repo:
+ local_artifactory_repo:
+ name: local_artifactory_repo
+ package_type: generic
+ repo_type: local
+ remote_artifactory_repo:
+ name: remote_artifactory_repo
+ package_type: generic
+ repo_type: remote
+ url: "http://artifactory.mcp.mirantis.net/"
diff --git a/cassandra/backup/client/single.yml b/cassandra/backup/client/single.yml
new file mode 100644
index 0000000..6c91a90
--- /dev/null
+++ b/cassandra/backup/client/single.yml
@@ -0,0 +1,13 @@
+classes:
+- system.openssh.client.root
+parameters:
+ cassandra:
+ backup:
+ client:
+ enabled: true
+ full_backups_to_keep: 3
+ hours_before_full: 24
+ target:
+ host: cfg01
+ restore_latest: 1
+ restore_from: local
diff --git a/cassandra/backup/server/single.yml b/cassandra/backup/server/single.yml
new file mode 100644
index 0000000..1762504
--- /dev/null
+++ b/cassandra/backup/server/single.yml
@@ -0,0 +1,13 @@
+parameters:
+ _param:
+ cassandra_backup_public_key: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCzLUiHKAjfFXiZ3fsgx35uXF6VivfC5WFafu4QMalxmj6W+s277oCfdWA8Du5f1wtQXM73VQ5nHkXhM2UIfUMarsyhXK+BxKVrcgEBNHdKlDytaecUPyuOxTDdGWhN/DPv5/vL8NYWweEYBbNbLgU0Td7Rvm52TUXKThIDjeF7XDxX4ShXWipBSwU4boOUBtR8KWfga8fsqeBN+eacuAQFR3MrrOfVvAuWW6Bsf047cmd+V6Qv0raoW73Nu4M/ZAdTsaR5k62a0cHsSRoi3hCmNRqw+CZaQi8prQU6t26eWPEtznjp5EkPF+LLh8LxUoCfWqWT+Lxe8QQwT1nx/LCN
+ cassandra:
+ backup:
+ server:
+ enabled: true
+ hours_before_full: 24
+ full_backups_to_keep: 5
+ key:
+ cassandra_pub_key:
+ enabled: true
+ key: ${_param:cassandra_backup_public_key}
diff --git a/docker/swarm/service/jenkins.yml b/docker/swarm/service/jenkins.yml
index b2fdeb6..a39b7a4 100644
--- a/docker/swarm/service/jenkins.yml
+++ b/docker/swarm/service/jenkins.yml
@@ -1,6 +1,6 @@
parameters:
_param:
- docker_image_jenkins: tcpcloud/jenkins:2.52
+ docker_image_jenkins: tcpcloud/jenkins:2.63
docker:
client:
service:
diff --git a/docker/swarm/stack/artifactory.yml b/docker/swarm/stack/artifactory.yml
index cda48fe..411b22e 100644
--- a/docker/swarm/stack/artifactory.yml
+++ b/docker/swarm/stack/artifactory.yml
@@ -13,7 +13,7 @@
deploy:
restart_policy:
condition: any
- image: ${_param:docker_image_repository:cicd}/artifactory
+ image: ${_param:docker_image_repository:cicd}
ports:
- 18082:8081
volumes:
diff --git a/docker/swarm/stack/devops_portal.yml b/docker/swarm/stack/devops_portal.yml
index 430c329..f553114 100644
--- a/docker/swarm/stack/devops_portal.yml
+++ b/docker/swarm/stack/devops_portal.yml
@@ -1,7 +1,7 @@
parameters:
_param:
docker_devops_portal_replicas: 1
- docker_image_devops_portal: docker-prod-virtual.docker.mirantis.net/mirantis/oss/devops-portal:latest
+ docker_image_devops_portal: docker-prod-local.artifactory.mirantis.com/mirantis/oss/devops-portal:latest
docker:
client:
stack:
diff --git a/docker/swarm/stack/docker.yml b/docker/swarm/stack/docker.yml
index a680d4c..7f8c153 100644
--- a/docker/swarm/stack/docker.yml
+++ b/docker/swarm/stack/docker.yml
@@ -1,7 +1,7 @@
parameters:
_param:
docker_image_registry: registry:2
- docker_image_visualizer: manomarks/visualizer
+ docker_image_visualizer: dockersamples/visualizer
docker:
client:
stack:
diff --git a/docker/swarm/stack/jenkins/master.yml b/docker/swarm/stack/jenkins/master.yml
index 8b66187..54b0093 100644
--- a/docker/swarm/stack/jenkins/master.yml
+++ b/docker/swarm/stack/jenkins/master.yml
@@ -1,6 +1,6 @@
parameters:
_param:
- docker_image_jenkins: tcpcloud/jenkins:2.52
+ docker_image_jenkins: tcpcloud/jenkins:2.63
docker:
client:
stack:
diff --git a/docker/swarm/stack/jenkins/slave.yml b/docker/swarm/stack/jenkins/slave.yml
index 52015ec..fc281b7 100644
--- a/docker/swarm/stack/jenkins/slave.yml
+++ b/docker/swarm/stack/jenkins/slave.yml
@@ -31,6 +31,7 @@
- /etc/aptly-publisher.yaml:/etc/aptly-publisher.yaml:ro
- /var/run/docker.sock:/var/run/docker.sock
- /usr/bin/docker:/usr/bin/docker:ro
+ - /var/lib/jenkins:/var/lib/jenkins
slave02:
environment:
JENKINS_URL: ${_param:jenkins_master_url}
@@ -50,6 +51,7 @@
- /etc/aptly-publisher.yaml:/etc/aptly-publisher.yaml:ro
- /var/run/docker.sock:/var/run/docker.sock
- /usr/bin/docker:/usr/bin/docker:ro
+ - /var/lib/jenkins:/var/lib/jenkins
slave03:
environment:
JENKINS_URL: ${_param:jenkins_master_url}
@@ -69,3 +71,4 @@
- /etc/aptly-publisher.yaml:/etc/aptly-publisher.yaml:ro
- /var/run/docker.sock:/var/run/docker.sock
- /usr/bin/docker:/usr/bin/docker:ro
+ - /var/lib/jenkins:/var/lib/jenkins
diff --git a/docker/swarm/stack/postgresql.yml b/docker/swarm/stack/postgresql.yml
index 7ae4052..73435fb 100644
--- a/docker/swarm/stack/postgresql.yml
+++ b/docker/swarm/stack/postgresql.yml
@@ -11,6 +11,7 @@
environment:
POSTGRES_USER: ${_param:postgresql_admin_user}
POSTGRES_PASSWORD: ${_param:postgresql_admin_user_password}
+ SQLALCHEMY_POOL_RECYCLE: 14400
service:
db:
image: ${_param:docker_image_postgresql}
diff --git a/docker/swarm/stack/rundeck.yml b/docker/swarm/stack/rundeck.yml
index 322a285..216415c 100644
--- a/docker/swarm/stack/rundeck.yml
+++ b/docker/swarm/stack/rundeck.yml
@@ -1,7 +1,7 @@
parameters:
_param:
docker_rundeck_replicas: 1
- docker_image_rundeck: docker-prod-virtual.docker.mirantis.net/mirantis/oss/rundeck:latest
+ docker_image_rundeck: docker-prod-local.artifactory.mirantis.com/mirantis/oss/rundeck:latest
docker:
client:
stack:
diff --git a/gerrit/client/project/docker_images.yml b/gerrit/client/project/docker_images.yml
new file mode 100644
index 0000000..cc35eb3
--- /dev/null
+++ b/gerrit/client/project/docker_images.yml
@@ -0,0 +1,20 @@
+parameters:
+ gerrit:
+ client:
+ project:
+ mk/docker-aptly:
+ enabled: true
+ description: Aptly docker images
+ upstream: https://github.com/tcpcloud/docker-aptly
+ access: ${gerrit:client:default_access}
+ require_change_id: true
+ require_agreement: false
+ merge_content: true
+ mk/python-flask-hello:
+ enabled: true
+ description: Flask hello demo application
+ upstream: https://github.com/tcpcloud/python-flask-hello
+ access: ${gerrit:client:default_access}
+ require_change_id: true
+ require_agreement: false
+ merge_content: true
diff --git a/glusterfs/client/volume/elasticsearch.yml b/glusterfs/client/volume/elasticsearch.yml
index 0248093..2ebfcfc 100644
--- a/glusterfs/client/volume/elasticsearch.yml
+++ b/glusterfs/client/volume/elasticsearch.yml
@@ -11,3 +11,5 @@
path: /srv/volumes/elasticsearch
server: ${_param:elasticsearch_glusterfs_service_host}
opts: "defaults,backup-volfile-servers=${_param:glusterfs_node01_address}:${_param:glusterfs_node02_address}:${_param:glusterfs_node03_address}"
+ user: 1000
+ group: 1000
diff --git a/haproxy/proxy/listen/cicd/artifactory.yml b/haproxy/proxy/listen/cicd/artifactory.yml
new file mode 100644
index 0000000..5bf9bda
--- /dev/null
+++ b/haproxy/proxy/listen/cicd/artifactory.yml
@@ -0,0 +1,38 @@
+parameters:
+ _param:
+ haproxy_artifactory_bind_host: ${_param:haproxy_bind_address}
+ haproxy_artifactory_bind_port: 8081
+ haproxy_artifactory_ssh_bind_host: ${_param:haproxy_artifactory_bind_host}
+ haproxy_artifactory_ssl:
+ enabled: false
+ haproxy:
+ proxy:
+ listen:
+ artifactory:
+ mode: http
+ options:
+ - forwardfor
+ - httpchk
+ - httpclose
+ - httplog
+ balance: source
+ http_request:
+ - action: "add-header X-Forwarded-Proto https"
+ condition: "if { ssl_fc }"
+ binds:
+ - address: ${_param:haproxy_artifactory_bind_host}
+ port: ${_param:haproxy_artifactory_bind_port}
+ ssl: ${_param:haproxy_artifactory_ssl}
+ servers:
+ - name: ${_param:cluster_node01_name}
+ host: ${_param:cluster_node01_address}
+ port: 18082
+ params: check
+ - name: ${_param:cluster_node02_name}
+ host: ${_param:cluster_node02_address}
+ port: 18082
+ params: backup check
+ - name: ${_param:cluster_node03_name}
+ host: ${_param:cluster_node03_address}
+ port: 18082
+ params: backup check
diff --git a/haproxy/proxy/listen/openstack/heat.yml b/haproxy/proxy/listen/openstack/heat.yml
index 440a018..2e6b918 100644
--- a/haproxy/proxy/listen/openstack/heat.yml
+++ b/haproxy/proxy/listen/openstack/heat.yml
@@ -7,19 +7,19 @@
service_name: heat
binds:
- address: ${_param:cluster_vip_address}
- port: 8000
+ port: 8003
servers:
- name: ctl01
host: ${_param:cluster_node01_address}
- port: 8000
+ port: 8003
params: check inter 10s fastinter 2s downinter 3s rise 3 fall 3
- name: ctl02
host: ${_param:cluster_node02_address}
- port: 8000
+ port: 8003
params: check inter 10s fastinter 2s downinter 3s rise 3 fall 3
- name: ctl03
host: ${_param:cluster_node03_address}
- port: 8000
+ port: 8003
params: check inter 10s fastinter 2s downinter 3s rise 3 fall 3
heat_api:
type: openstack-service
@@ -45,17 +45,17 @@
service_name: heat
binds:
- address: ${_param:cluster_vip_address}
- port: 8003
+ port: 8000
servers:
- name: ctl01
host: ${_param:cluster_node01_address}
- port: 8003
+ port: 8000
params: check inter 10s fastinter 2s downinter 3s rise 3 fall 3
- name: ctl02
host: ${_param:cluster_node02_address}
- port: 8003
+ port: 8000
params: check inter 10s fastinter 2s downinter 3s rise 3 fall 3
- name: ctl03
host: ${_param:cluster_node03_address}
- port: 8003
- params: check inter 10s fastinter 2s downinter 3s rise 3 fall 3
\ No newline at end of file
+ port: 8000
+ params: check inter 10s fastinter 2s downinter 3s rise 3 fall 3
diff --git a/haproxy/proxy/listen/oss/postgresql.yml b/haproxy/proxy/listen/oss/postgresql.yml
index 1bc1f44..a356a48 100644
--- a/haproxy/proxy/listen/oss/postgresql.yml
+++ b/haproxy/proxy/listen/oss/postgresql.yml
@@ -7,6 +7,11 @@
enabled: false
haproxy:
proxy:
+ timeout:
+ queue: '8h'
+ client: '8h'
+ server: '8h'
+ check: '10s'
listen:
postgresql:
mode: tcp
diff --git a/jenkins/client/job/debian/packages/salt.yml b/jenkins/client/job/debian/packages/salt.yml
index c5a6709..6ccb432 100644
--- a/jenkins/client/job/debian/packages/salt.yml
+++ b/jenkins/client/job/debian/packages/salt.yml
@@ -19,6 +19,8 @@
dist: trusty
- name: backupninja
dist: trusty
+ - name: baremetal-simulator
+ dist: trusty
- name: billometer
dist: trusty
- name: bind
@@ -211,6 +213,8 @@
dist: xenial
- name: avinetworks
dist: xenial
+ - name: baremetal-simulator
+ dist: xenial
- name: backupninja
dist: xenial
- name: billometer
@@ -271,6 +275,8 @@
dist: xenial
- name: heka
dist: xenial
+ - name: helm
+ dist: xenial
- name: influxdb
dist: xenial
- name: iptables
diff --git a/jenkins/client/job/debian/packages/testing.yml b/jenkins/client/job/debian/packages/testing.yml
index 4a17efc..c7ecf98 100644
--- a/jenkins/client/job/debian/packages/testing.yml
+++ b/jenkins/client/job/debian/packages/testing.yml
@@ -20,12 +20,22 @@
credentials: "gerrit"
script: build-debian-packages-{{build}}.groovy
trigger:
- pollscm:
- spec: ${_param:jenkins_pollscm_spec}
+ gerrit:
+ project:
+ mk/{{package}}:
+ branches:
+ - "{{branch}}"
+ message:
+ build_successful: "Build successful"
+ build_unstable: "Build unstable"
+ build_failure: "Build failed"
+ event:
+ ref:
+ - updated
param:
SOURCE_URL:
type: string
- default: "https://github.com/tcpcloud/python-flask-hello.git"
+ default: "${_param:jenkins_gerrit_url}/mk/python-flask-hello"
SOURCE_BRANCH:
type: string
default: "{{branch}}"
@@ -34,7 +44,7 @@
default: "gerrit"
EXTRA_REPO_URL:
type: string
- default: "deb ${_param:jenkins_aptly_url}/{{dist}}/ testing extra"
+ default: ""
EXTRA_REPO_KEY_URL:
type: string
default: "${_param:jenkins_aptly_url}/public.gpg"
diff --git a/jenkins/client/job/deploy/k8s_control.yml b/jenkins/client/job/deploy/k8s_control.yml
new file mode 100644
index 0000000..7e915c2
--- /dev/null
+++ b/jenkins/client/job/deploy/k8s_control.yml
@@ -0,0 +1,34 @@
+parameters:
+ jenkins:
+ client:
+ job:
+ deploy_k8s_control:
+ type: workflow-scm
+ name: deploy-k8s-control
+ display_name: "Deploy - k8s control"
+ discard:
+ build:
+ keep_num: 20
+ concurrent: false
+ scm:
+ type: git
+ url: "${_param:jenkins_gerrit_url}/mk/mk-pipelines"
+ credentials: "gerrit"
+ script: deploy-k8s-deployments.groovy
+ param:
+ # deployments and test settings
+ TARGET_MINIONS:
+ type: string
+ default: "E@k8s-ctl01.*"
+ description: "Salt compound target to match nodes to be updated [*, G@osfamily:debian]."
+ EXTRA_COMMAND:
+ type: string
+ default: ""
+ description: "Extra command to run before update"
+ # salt master
+ SALT_MASTER_CREDENTIALS:
+ type: string
+ default: "salt"
+ SALT_MASTER_URL:
+ type: string
+ default: "${_param:jenkins_salt_api_url}"
diff --git a/jenkins/client/job/deploy/update/init.yml b/jenkins/client/job/deploy/update/init.yml
index ba3383a..4eadda5 100644
--- a/jenkins/client/job/deploy/update/init.yml
+++ b/jenkins/client/job/deploy/update/init.yml
@@ -4,4 +4,6 @@
- system.jenkins.client.job.deploy.update.saltenv
- system.jenkins.client.job.deploy.update.upgrade
- system.jenkins.client.job.deploy.update.upgrade_compute
- - system.jenkins.client.job.deploy.update.restore_mysql
\ No newline at end of file
+ - system.jenkins.client.job.deploy.update.restore_mysql
+ - system.jenkins.client.job.deploy.update.restore_cassandra
+ - system.jenkins.client.job.deploy.update.restore_zookeeper
\ No newline at end of file
diff --git a/jenkins/client/job/deploy/update/restore_cassandra.yml b/jenkins/client/job/deploy/update/restore_cassandra.yml
new file mode 100644
index 0000000..7f53f80
--- /dev/null
+++ b/jenkins/client/job/deploy/update/restore_cassandra.yml
@@ -0,0 +1,25 @@
+#
+# Jobs to update packages on given Salt master environment
+#
+parameters:
+ _param:
+ jenkins_salt_api_url: "http://${_param:salt_master_host}:6969"
+ jenkins:
+ client:
+ job:
+ deploy-cassandra-db-restore:
+ type: workflow-scm
+ concurrent: true
+ display_name: "Cassandra - restore db"
+ scm:
+ type: git
+ url: "${_param:jenkins_gerrit_url}/mk/mk-pipelines"
+ credentials: "gerrit"
+ script: restore-cassandra.groovy
+ param:
+ SALT_MASTER_URL:
+ type: string
+ default: "${_param:jenkins_salt_api_url}"
+ SALT_MASTER_CREDENTIALS:
+ type: string
+ default: "salt"
diff --git a/jenkins/client/job/deploy/update/restore_zookeeper.yml b/jenkins/client/job/deploy/update/restore_zookeeper.yml
new file mode 100644
index 0000000..f33607a
--- /dev/null
+++ b/jenkins/client/job/deploy/update/restore_zookeeper.yml
@@ -0,0 +1,25 @@
+#
+# Jobs to update packages on given Salt master environment
+#
+parameters:
+ _param:
+ jenkins_salt_api_url: "http://${_param:salt_master_host}:6969"
+ jenkins:
+ client:
+ job:
+ deploy-zookeeper-restore:
+ type: workflow-scm
+ concurrent: true
+ display_name: "Zookeeper - restore"
+ scm:
+ type: git
+ url: "${_param:jenkins_gerrit_url}/mk/mk-pipelines"
+ credentials: "gerrit"
+ script: restore-zookeeper.groovy
+ param:
+ SALT_MASTER_URL:
+ type: string
+ default: "${_param:jenkins_salt_api_url}"
+ SALT_MASTER_CREDENTIALS:
+ type: string
+ default: "salt"
diff --git a/jenkins/client/job/docker/testing.yml b/jenkins/client/job/docker/testing.yml
index 2f9177d..bf65dbc 100644
--- a/jenkins/client/job/docker/testing.yml
+++ b/jenkins/client/job/docker/testing.yml
@@ -1,4 +1,7 @@
parameters:
+ _param:
+ jenkins_docker_registry_url: ""
+ jenkins_docker_registry_credentials: "dockerhub"
jenkins:
client:
job_template:
@@ -26,13 +29,17 @@
reverse:
projects:
- build-debian-python-flask-hello-ubuntu-trusty
+ state: UNSTABLE
param:
IMAGE_NAME:
type: string
default: "tcpcloud/{{name}}"
IMAGE_GIT_URL:
type: string
- default: "https://github.com/tcpcloud/python-flask-hello.git"
+ default: "${_param:jenkins_gerrit_url}/mk/python-flask-hello"
+ IMAGE_BUILD_PARAMS:
+ type: string
+ default: "--build-arg apt_repository='deb [arch=amd64] ${_param:jenkins_aptly_url}/trusty/ nightly extra' --build-arg apt_key_url=${_param:jenkins_aptly_url}/public.gpg --no-cache"
IMAGE_BRANCH:
type: string
default: "{{branch}}"
@@ -47,10 +54,10 @@
default: "{{dockerfile}}"
REGISTRY_URL:
type: string
- default: ""
+ default: "${_param:jenkins_docker_registry_url}"
REGISTRY_CREDENTIALS_ID:
type: string
- default: "dockerhub"
+ default: "${_param:jenkins_docker_registry_credentials}"
DOCKER_GIT_TAG:
type: boolean
default: "true"
diff --git a/jenkins/client/job/git-mirrors/downstream/docker_images.yml b/jenkins/client/job/git-mirrors/downstream/docker_images.yml
index 2471280..ff1c649 100644
--- a/jenkins/client/job/git-mirrors/downstream/docker_images.yml
+++ b/jenkins/client/job/git-mirrors/downstream/docker_images.yml
@@ -6,4 +6,8 @@
- name: docker-aptly
downstream: mk/docker-aptly
upstream: "https://github.com/tcpcloud/docker-aptly"
- branches: master
\ No newline at end of file
+ branches: master
+ - name: python-flask-hello
+ downstream: mk/python-flask-hello
+ upstream: "https://github.com/tcpcloud/python-flask-hello"
+ branches: master
diff --git a/jenkins/client/job/git-mirrors/upstream/oss.yml b/jenkins/client/job/git-mirrors/upstream/oss.yml
new file mode 100644
index 0000000..af3f816
--- /dev/null
+++ b/jenkins/client/job/git-mirrors/upstream/oss.yml
@@ -0,0 +1,9 @@
+classes:
+ - system.jenkins.client.job.git-mirrors.upstream
+parameters:
+ _param:
+ jenkins_git_mirror_upstream_jobs:
+ - name: rundeck-cis-jobs
+ downstream: oss/rundeck-cis-jobs
+ upstream: "git@github.com:Mirantis/rundeck-cis-jobs"
+ branches: master
diff --git a/jenkins/client/job/opencontrail/init.yml b/jenkins/client/job/opencontrail/init.yml
index 85ca57b..dad3c3a 100644
--- a/jenkins/client/job/opencontrail/init.yml
+++ b/jenkins/client/job/opencontrail/init.yml
@@ -8,7 +8,7 @@
contrail_dpdk_extra_branches: "mitaka,kilo,liberty-multiqueue,newton"
contrail_ceilometer_plugin_branches: "master,R4.0"
contrail_kubernetes_branches: "master,origin-1.1,origin-1.1.3,release-1.1,release-1.2"
- contrail_dpdk_branches: "master,R3.0.2.x,R3.0.3.x,R3.1,R3.1.1.x,R3.2,R3.2.3.x,R4.0,contrail_dpdk_17_02,contrail_dpdk_1_7,contrail_dpdk_2_0,contrail_dpdk_2_1"
+ contrail_dpdk_branches: "master,R3.0.2.x,R3.0.3.x,R3.1,R3.1.1.x,R3.2,R3.2.3.x,R4.0,contrail_dpdk_17_02,contrail_dpdk_17_05,contrail_dpdk_1_7,contrail_dpdk_2_0,contrail_dpdk_2_1"
jenkins:
client:
view:
diff --git a/jenkins/client/job/oss/test_security_monkey_openstack.yml b/jenkins/client/job/oss/test_security_monkey_openstack.yml
new file mode 100644
index 0000000..7e9343f
--- /dev/null
+++ b/jenkins/client/job/oss/test_security_monkey_openstack.yml
@@ -0,0 +1,43 @@
+parameters:
+ jenkins:
+ client:
+ job:
+ test-oss-security-monkey-openstack:
+ name: test-oss-security-monkey-openstack
+ 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-security-monkey-openstack-pipeline.groovy
+ trigger:
+ gerrit:
+ project:
+ "oss/security-monkey-openstack":
+ branches:
+ - master
+ event:
+ patchset:
+ - created:
+ excludeDrafts: false
+ excludeTrivialRebase: false
+ excludeNoCodeChange: false
+ comment:
+ - addedContains:
+ commentAddedCommentContains: '(recheck|reverify)'
+ param:
+ CREDENTIALS_ID:
+ type: string
+ default: "gerrit"
+ DEFAULT_GIT_URL:
+ type: string
+ default: "${_param:jenkins_gerrit_url}/oss/security-monkey-openstack"
+ DEFAULT_GIT_REF:
+ type: string
+ default: master
diff --git a/jenkins/client/job/salt-formulas/tests.yml b/jenkins/client/job/salt-formulas/tests.yml
index eed632e..15eff13 100644
--- a/jenkins/client/job/salt-formulas/tests.yml
+++ b/jenkins/client/job/salt-formulas/tests.yml
@@ -45,6 +45,7 @@
- name: haproxy
- name: heat
- name: heka
+ - name: helm
- name: horizon
- name: influxdb
- name: iptables
diff --git a/keystone/client/service/keystone3.yml b/keystone/client/service/keystone3.yml
index cc385f2..bd0c63b 100644
--- a/keystone/client/service/keystone3.yml
+++ b/keystone/client/service/keystone3.yml
@@ -20,4 +20,4 @@
internal_path: '/v3'
admin_address: ${_param:keystone_service_host}
admin_port: 35357
- admin_path: '/v3'
+ admin_path: '/v2.0'
diff --git a/keystone/client/service/octavia.yml b/keystone/client/service/octavia.yml
index 819cd79..4e14217 100644
--- a/keystone/client/service/octavia.yml
+++ b/keystone/client/service/octavia.yml
@@ -28,3 +28,11 @@
admin_address: ${_param:octavia_service_host}
admin_port: 9876
admin_path: '/'
+ octavia_identity:
+ admin:
+ user: octavia
+ password: ${_param:keystone_octavia_password}
+ project: service
+ host: ${_param:keystone_service_host}
+ port: 5000
+ region_name: ${_param:openstack_region}
diff --git a/kubernetes/control/flask_hello.yml b/kubernetes/control/flask_hello.yml
new file mode 100644
index 0000000..f7b41e5
--- /dev/null
+++ b/kubernetes/control/flask_hello.yml
@@ -0,0 +1,26 @@
+classes:
+ - system.kubernetes.control
+parameters:
+ kubernetes:
+ control:
+ service:
+ flask-hello:
+ enabled: true
+ service: flask-hello
+ namespace: default
+ cluster: flask-hello
+ role: server
+ type: LoadBalancer
+ replicas: 1
+ kind: Deployment
+ apiVersion: extensions/v1beta1
+ ports:
+ - port: 5000
+ name: flask-hello
+ container:
+ flask-hello:
+ image: ${_param:cicd_control_address}:5000/tcpcloud/python-flask-hello
+ image_pull_policy: Always
+ ports:
+ - port: 5000
+ name: flask-hello
diff --git a/kubernetes/control/init.yml b/kubernetes/control/init.yml
new file mode 100644
index 0000000..6e5fb40
--- /dev/null
+++ b/kubernetes/control/init.yml
@@ -0,0 +1,2 @@
+classes:
+ - service.kubernetes.control.cluster
diff --git a/kubernetes/pool/cluster.yml b/kubernetes/pool/cluster.yml
index 7adb119..05aa1bc 100644
--- a/kubernetes/pool/cluster.yml
+++ b/kubernetes/pool/cluster.yml
@@ -8,6 +8,8 @@
kubernetes_calico_image: docker-prod-virtual.docker.mirantis.net/mirantis/projectcalico/calico/node:latest
kubernetes_calico_cni_image: docker-prod-virtual.docker.mirantis.net/mirantis/projectcalico/calico/cni:latest
kubernetes_hyperkube_image: docker-prod-virtual.docker.mirantis.net/mirantis/kubernetes/hyperkube-amd64:v1.6.2-2
+ kubernetes_contrail_cni_image: docker-prod-virtual.docker.mirantis.net/mirantis/kubernetes/contrail-integration/contrail-cni:v1.0.0
+ kubernetes_contrail_network_controller_image: docker-prod-virtual.docker.mirantis.net/mirantis/kubernetes/contrail-integration/contrail-network-controller:v1.0.0
kubernetes:
pool:
diff --git a/kubernetes/pool/single.yml b/kubernetes/pool/single.yml
index 4caaa50..9be2164 100644
--- a/kubernetes/pool/single.yml
+++ b/kubernetes/pool/single.yml
@@ -8,6 +8,8 @@
kubernetes_calico_image: docker-prod-virtual.docker.mirantis.net/mirantis/projectcalico/calico/node:latest
kubernetes_calico_cni_image: docker-prod-virtual.docker.mirantis.net/mirantis/projectcalico/calico/cni:latest
kubernetes_hyperkube_image: docker-prod-virtual.docker.mirantis.net/mirantis/kubernetes/hyperkube-amd64:v1.6.2-2
+ kubernetes_contrail_cni_image: docker-prod-virtual.docker.mirantis.net/mirantis/kubernetes/contrail-integration/contrail-cni:v1.0.0
+ kubernetes_contrail_network_controller_image: docker-prod-virtual.docker.mirantis.net/mirantis/kubernetes/contrail-integration/contrail-network-controller:v1.0.0
kubernetes:
pool:
diff --git a/nginx/server/proxy/openstack_api.yml b/nginx/server/proxy/openstack_api.yml
index fc4f54c..2b84993 100644
--- a/nginx/server/proxy/openstack_api.yml
+++ b/nginx/server/proxy/openstack_api.yml
@@ -91,11 +91,11 @@
name: openstack_api_heat_cfn
proxy:
host: ${_param:heat_service_host}
- port: 8000
+ port: 8003
protocol: http
host:
name: ${_param:nginx_proxy_openstack_api_host}
- port: 8000
+ port: 8003
ssl: ${_param:nginx_proxy_ssl}
nginx_proxy_openstack_api_heat_cfn:
enabled: true
@@ -103,11 +103,11 @@
name: openstack_api_heat_cloudwatch
proxy:
host: ${_param:heat_service_host}
- port: 8003
+ port: 8000
protocol: http
host:
name: ${_param:nginx_proxy_openstack_api_host}
- port: 8003
+ port: 8000
ssl: ${_param:nginx_proxy_ssl}
nginx_proxy_openstack_api_heat:
enabled: true
diff --git a/nova/client/service/octavia.yml b/nova/client/service/octavia.yml
new file mode 100644
index 0000000..817297f
--- /dev/null
+++ b/nova/client/service/octavia.yml
@@ -0,0 +1,13 @@
+parameters:
+ nova:
+ client:
+ enabled: true
+ server:
+ octavia_identity:
+ endpoint_type: internalURL
+ flavor:
+ m1.amphora:
+ flavor_id: ${_param:amp_flavor_id}
+ ram: 1024
+ disk: 2
+ vcpus: 1
diff --git a/opencontrail/client/resource/k8s_api.yml b/opencontrail/client/resource/k8s_api.yml
new file mode 100644
index 0000000..79d6f0d
--- /dev/null
+++ b/opencontrail/client/resource/k8s_api.yml
@@ -0,0 +1,9 @@
+parameters:
+ opencontrail:
+ client:
+ linklocal_service:
+ k8s_api:
+ lls_ip: ${_param:kubernetes_internal_api_address}
+ lls_port: 443
+ ipf_addresses: ${_param:kubernetes_control_address}
+ ipf_port: 443
diff --git a/openssh/server/team/l1_support.yml b/openssh/server/team/l1_support.yml
index 266bd15..aab98c7 100644
--- a/openssh/server/team/l1_support.yml
+++ b/openssh/server/team/l1_support.yml
@@ -19,6 +19,7 @@
- system.openssh.server.team.members.mikhailkraynov
- system.openssh.server.team.members.nadezhdakabanova
- system.openssh.server.team.members.renesoto
+- system.openssh.server.team.members.rsafonov
- system.openssh.server.team.members.scottmachtmes
- system.openssh.server.team.members.zahedkhurasani
parameters:
diff --git a/openssh/server/team/members/rsafonov.yml b/openssh/server/team/members/rsafonov.yml
new file mode 100644
index 0000000..7e6f206
--- /dev/null
+++ b/openssh/server/team/members/rsafonov.yml
@@ -0,0 +1,25 @@
+parameters:
+ linux:
+ system:
+ user:
+ rsafonov:
+ enabled: true
+ name: rsafonov
+ sudo: false
+ full_name: Roman Safonov
+ home: /home/rsafonov
+ email: rsafonov@mirantis.com
+ groups:
+ - support
+ openssh:
+ server:
+ enabled: true
+ user:
+ rsafonov:
+ enabled: true
+ public_keys: ${public_keys:rsafonov}
+ user: ${linux:system:user:rsafonov}
+ public_keys:
+ rsafonov:
+ - key: ssh-rsa ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCaVDVMjNUXR+SP4xjH4vX9zfqzYHosQRO4MlVxE8uJPIIQdF1+iPWtggLrsRDZTSQ0JNzCYGXPv8fK6iKBQ/cX5KgMnVPQmFn4Q+Ip/oWotkbVZtR1F0ZVw01KNBYE0LMXrV9dxhX6qUFCO0IV9inbOZ+6zhYOLPddG2WVc8htz8XH7xdWqGbU1GBwyEoRFjITZ9GAYMRNrSjlzPsoBVkQwGKNtvh8uCFZasfAMr2mV1XVFcJlK52T6bNqIXOYPmRc9mSoQoD0UHRRYwlWAZHzW+2e8SABT+NRT1Cc/BoioRC2SBKj9tsZgy9nhq5O0EfuvWVL3ZCM6+RviNxkEL7Z
+
diff --git a/openssh/server/team/oss_team.yml b/openssh/server/team/oss_team.yml
index 9d6dce9..db4dbbd 100644
--- a/openssh/server/team/oss_team.yml
+++ b/openssh/server/team/oss_team.yml
@@ -23,6 +23,27 @@
full_name: Michael Ivanov
home: /home/mivanov
email: mivanov@mirantis.com
+ vkramskikh:
+ enabled: true
+ name: vkramskikh
+ sudo: true
+ full_name: Vitaly Kramskikh
+ home: /home/vkramskikh
+ email: vkramskikh@mirantis.com
+ jkirnosova:
+ enabled: true
+ name: jkirnosova
+ sudo: true
+ full_name: Iuliia Aranovich
+ home: /home/jkirnosova
+ email: jkirnosova@mirantis.com
+ sskripnick:
+ enabled: true
+ name: sskripnick
+ sudo: true
+ full_name: Serhii Skrypnik
+ home: /home/sskripnick
+ email: sskripnick@mirantis.com
openssh:
server:
enabled: true
@@ -42,6 +63,21 @@
public_keys:
- ${public_keys:mivanov}
user: ${linux:system:user:mivanov}
+ vkramskikh:
+ enabled: true
+ public_keys:
+ - ${public_keys:vkramskikh}
+ user: ${linux:system:user:vkramskikh}
+ jkirnosova:
+ enabled: true
+ public_keys:
+ - ${public_keys:jkirnosova}
+ user: ${linux:system:user:jkirnosova}
+ sskripnick:
+ enabled: true
+ public_keys:
+ - ${public_keys:sskripnick}
+ user: ${linux:system:user:sskripnick}
public_keys:
ikharin:
key: ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAQEA0NNCF9Orei3Ls5wa7xNH/2nl4eAUYY/vuAers7as8lQXjUXkurLQUG1YTQhuRiqyLrqLZjokq87l3LcpXsiBaqNybwlg4OAcf7p59FwDwdpCcAfoHeP03vt/FOYgozeExIRxVNHMdZjQJ4o5j75vnwTfGIubSF1eUOwtRVeezAREK1OPA2TRvlSOXCsAinNSZHBFTlYVYIXQEk/zuH7PdwlU2rkN69mNivh1tAUDlhrwZHrR9rcudafp5s3C5MKFtI3W4MhYIqv9ZViEhLwfEhNb0WXiUv+sdGTf8jTcXaYOlw6z9A76Ab/9bfPyOTmI7tli8Pz15+YPj1ymdlIZlQ==
@@ -49,3 +85,9 @@
key: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQDF13qwUbb+lva8KCNE6IppajmGfF3MJIFhIPD7HYwzeIyI3INlc6nMMOk+r4a6IO3okVxgqRi27boebvUpazw0Jw4T4e1oLQpWCxvhTZkukFsrd9DJiCj07VXluua2ofaCRLCSHVLdjAH4WocmZeCXpZF1ldDeNBeuX0iYJiFBslrG/pmOuCm3IEL7GmoIJjF0Idtwo3tkWcvCUXKvBaVqCHS34Q/KJLAvZc95MLESs/kdnhfxhxbpWrRRFcZn/zIxuuptuTBzWOPd7CnsOLo5PCnuxIfDznDYYzQUJq6OmwMZipepTtymXUvFQiqq7xc/HmNR51vowqwoftgHNxYvoaQgXkneWFnq4Cl9WZaLVs90wNgQewPaKmhL8ia1S2C3Cub0ILsbU/091L7adBeZI87pkfx72HhFQRUOcVprgPAEKKTbEvUQKAQ4rZ6GOIU5Tz/fKf1sXLhiTEAgpGpaTyyTP04vpgP5iY4kcXQHpRsPxg1BQ+93S3KqF2XAdXvrA4eZfAHmGhsAOePdnJQZVf8c4exsgkIGEyM9Wgi2ZWlq7oY0tFJLf+Kq7y23QuC6isIqBBIDN/TtmHRpiWNY4zwmGhzSxBdA6zMVy9PblrU71w1xVBS4KKwUqbWbP06pA7V04sp8kGKz5OmN9Z+rdTQJ2v41SSU71kT6XSFFOQ==
mivanov:
key: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDLY+5Yc3MMOmxVGrBmvfMX9bwK98RdgW+9E/rj56rh1w5cuIy5qN0xsuU4634EcSLRUjGXBcutDXPEXV1s7BZfeZjXJri37RICLsKfvPZcyiEqtwTbGYkcDDOHH0nmZdfngi0r/qAc5o5k3KA7Eh4CJW+GgqPoShngCKo9YKqbWFUkrGpX7wIUMlqwyuVKsybxD6EU+CB3RAeASG4E0rRq7VYQaTj/+PQq8VrWGUs9QHW8wX+OakDDCI7Or4Ll5q/uPCopaU9r7yz+uEYA1L8P2wEJ4XG9V6dxUMvzrFLBE+wDrHHXcEZMWGbmrPHUy5Yt8UCFPgtYfOl2BvHHHUSp
+ vkramskikh:
+ key: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQC9eVOmPT/jCS/q/+T5EmKIBol3wovE+qTb4SQI4y9ZUIT+tMGult1dheqXVKIMYdTe/cccPTf5A+b6QpkPEjzQQljn0qmyHM75ya+Gjd3uTWx+1VXSFL42p0+404oVkB+eOtax+Bf8CU14P6sJn+3ypO63VVCJz6V2cgkr14tqkMZb+4OBPJB6zrNAfXhNJlJ8fLV4d5c4guin74hoaor5VIER3hwMPIe0CtudzdjcdDDvVNqXYfoknwMTNR52h1Zfwvomsy5pdFcI5sQKaOxSqWyi3C22yu/ZK0Diq82INskZ1vjHiJHw8QguXLzevCK4BECnjDFr6Hu4J6eRK3YJ
+ jkirnosova:
+ key: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDuW6hvLo7eRwm6WcjJEDW7TsLG2rZrtmffHQ58c4AzlLAxV0tkvvfQRS4f5Pb+Wj1flxt+RW2rq4dSkQCpwNnYdTHHRnQJFJQEAouqNF7cTVrprioXNeoBe8DGVHiUUI8IpeN8hJYQw17NB6hf8oZulZqdZZ9DA7uwnC0HFfQ1E4MuFnfhB0/XyzJMsxrxHyjte+cOdgE9F43ccHInBGowrzOJP8AUdWdC0I2WU0sjvQrGcvlHr7/EqPP1Zh7PblwESyf3muas7iFTCKtCbXM+pT3e687++ueCqrAftVZGCPpXe23U3sSGdiIti0L6CYxBI02VKlsQgfSqWd8z+W1T
+ sskripnick:
+ key: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDbDedH7Aw1g2LDHrCLpxfq5GsdTpqRglDXy9dDSEr08tVVl7gSzPJ5oMlIr9VsNVHsR9vf/THhxghFrV1rQZDny8c6yLqus3Upc7pJfOUztWD4+E29H7qJOafrnuNRHGFaEiaG6aZm3WyyvAdlR1lh/i5zQtdrPBmjYkq5LMJvNQBpj4XqmHYp7gLRNDI30Ne49xxAIGC1Qbx0Xvhmq9/h4gZhI5mB/QeOj4tPcd7g+kSTdc5/fXbBLeQDBZt/HlDr7/LFjYZ4OBumVDOTfClFO5UoIAvHyfysaiWI/qZ7UZI7uU4yAPeI8/s/INOQOIoiqaHyiVnL5BvFklHldMot
diff --git a/reclass/storage/system/openstack_gateway_cluster_octavia.yml b/reclass/storage/system/openstack_gateway_cluster_octavia.yml
deleted file mode 100644
index 8126ed1..0000000
--- a/reclass/storage/system/openstack_gateway_cluster_octavia.yml
+++ /dev/null
@@ -1,9 +0,0 @@
-classes:
-- system.reclass.storage.system.openstack_gateway_cluster
-parameters:
- reclass:
- storage:
- node:
- openstack_gateway_node01:
- classes:
- - system.octavia.manager.single
diff --git a/reclass/storage/system/openstack_gateway_single_octavia.yml b/reclass/storage/system/openstack_gateway_single_octavia.yml
index f43e6a1..264b3f1 100644
--- a/reclass/storage/system/openstack_gateway_single_octavia.yml
+++ b/reclass/storage/system/openstack_gateway_single_octavia.yml
@@ -1,5 +1,3 @@
-classes:
-- system.reclass.storage.system.openstack_gateway_single
parameters:
reclass:
storage:
diff --git a/rundeck/client/project/cicd.yml b/rundeck/client/project/cicd.yml
index 1a4b228..cb427d8 100644
--- a/rundeck/client/project/cicd.yml
+++ b/rundeck/client/project/cicd.yml
@@ -8,6 +8,7 @@
rundeck_cis_jobs_repository: https://gerrit.mcp.mirantis.net/oss/rundeck-cis-jobs
rundeck_cis_jobs_revision: master
rundeck_cis_elasticsearch_url: none
+ rundeck_cis_os_docker_image: docker-prod-local.artifactory.mirantis.com/mirantis/oss/cis-openstack:latest
rundeck:
client:
project:
@@ -52,3 +53,6 @@
cis/openstack/domain_id:
type: password
content: ${_param:rundeck_cis_os_domain_id}
+ cis/openstack/image:
+ type: password
+ content: ${_param:rundeck_cis_os_docker_image}
diff --git a/salt/master/formula/git/baremetal.yml b/salt/master/formula/git/baremetal.yml
new file mode 100644
index 0000000..80909e4
--- /dev/null
+++ b/salt/master/formula/git/baremetal.yml
@@ -0,0 +1,14 @@
+parameters:
+ salt:
+ master:
+ environment:
+ dev:
+ formula:
+ ironic:
+ source: git
+ address: '${_param:salt_master_environment_repository}/salt-formula-ironic.git'
+ revision: ${_param:salt_master_environment_revision}
+ tftpd_hpa:
+ source: git
+ address: '${_param:salt_master_environment_repository}/salt-formula-tftpd-hpa.git'
+ revision: ${_param:salt_master_environment_revision}
diff --git a/salt/master/formula/git/oss.yml b/salt/master/formula/git/oss.yml
index e927387..64f3e54 100644
--- a/salt/master/formula/git/oss.yml
+++ b/salt/master/formula/git/oss.yml
@@ -1,7 +1,4 @@
parameters:
- _param:
- salt_master_oss_repository: https://gerrit.mcp.mirantis.net/salt-formulas
- salt_master_oss_revision: master
salt:
master:
environment:
@@ -12,8 +9,8 @@
devops_utils.py:
enabled: true
source: git
- address: '${_param:salt_master_oss_repository}/devops-portal.git'
- revision: ${_param:salt_master_oss_revision}
+ address: '${_param:salt_master_environment_repository}/salt-formula-devops-portal.git'
+ revision: ${_param:salt_master_environment_revision}
rundeck:
module:
rundeck.py:
@@ -21,6 +18,12 @@
state:
rundeck_project.py:
enabled: true
+ state:
+ rundeck_scm.py:
+ enabled: true
+ state:
+ rundeck_secret.py:
+ enabled: true
source: git
- address: '${_param:salt_master_oss_repository}/rundeck.git'
- revision: ${_param:salt_master_oss_revision}
+ address: '${_param:salt_master_environment_repository}/salt-formula-rundeck.git'
+ revision: ${_param:salt_master_environment_revision}
diff --git a/salt/master/formula/pkg/baremetal.yml b/salt/master/formula/pkg/baremetal.yml
new file mode 100644
index 0000000..3899fe7
--- /dev/null
+++ b/salt/master/formula/pkg/baremetal.yml
@@ -0,0 +1,12 @@
+parameters:
+ salt:
+ master:
+ environment:
+ prd:
+ formula:
+ ironic:
+ source: pkg
+ name: salt-formula-ironic
+ tftpd_hpa:
+ source: pkg
+ name: salt-formula-tftpd-hpa
diff --git a/telegraf/agent/init.yml b/telegraf/agent/init.yml
index 0e836e8..3f6133d 100644
--- a/telegraf/agent/init.yml
+++ b/telegraf/agent/init.yml
@@ -1,5 +1,6 @@
classes:
- service.telegraf.agent
+- system.telegraf.sudo
parameters:
telegraf:
agent:
diff --git a/telegraf/sudo.yml b/telegraf/sudo.yml
new file mode 100644
index 0000000..3fc76e1
--- /dev/null
+++ b/telegraf/sudo.yml
@@ -0,0 +1,11 @@
+parameters:
+ linux:
+ system:
+ sudo:
+ enabled: true
+ users:
+ telegraf:
+ hosts:
+ - ALL
+ commands:
+ - /usr/sbin/gluster
diff --git a/zookeeper/backup/client/single.yml b/zookeeper/backup/client/single.yml
new file mode 100644
index 0000000..3b0d04b
--- /dev/null
+++ b/zookeeper/backup/client/single.yml
@@ -0,0 +1,13 @@
+classes:
+- system.openssh.client.root
+parameters:
+ zookeeper:
+ backup:
+ client:
+ enabled: true
+ full_backups_to_keep: 3
+ hours_before_full: 24
+ target:
+ host: cfg01
+ restore_latest: 1
+ restore_from: local
diff --git a/zookeeper/backup/server/single.yml b/zookeeper/backup/server/single.yml
new file mode 100644
index 0000000..aaa877b
--- /dev/null
+++ b/zookeeper/backup/server/single.yml
@@ -0,0 +1,13 @@
+parameters:
+ _param:
+ zookeeper_backup_public_key: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCzLUiHKAjfFXiZ3fsgx35uXF6VivfC5WFafu4QMalxmj6W+s277oCfdWA8Du5f1wtQXM73VQ5nHkXhM2UIfUMarsyhXK+BxKVrcgEBNHdKlDytaecUPyuOxTDdGWhN/DPv5/vL8NYWweEYBbNbLgU0Td7Rvm52TUXKThIDjeF7XDxX4ShXWipBSwU4boOUBtR8KWfga8fsqeBN+eacuAQFR3MrrOfVvAuWW6Bsf047cmd+V6Qv0raoW73Nu4M/ZAdTsaR5k62a0cHsSRoi3hCmNRqw+CZaQi8prQU6t26eWPEtznjp5EkPF+LLh8LxUoCfWqWT+Lxe8QQwT1nx/LCN
+ zookeeper:
+ backup:
+ server:
+ enabled: true
+ hours_before_full: 24
+ full_backups_to_keep: 5
+ key:
+ zookeeper_pub_key:
+ enabled: true
+ key: ${_param:zookeeper_backup_public_key}