Merge pull request #206 from atengler/jobs/build-contrail-panels
Add horizon-contrail-panels package build
diff --git a/.gitreview b/.gitreview
new file mode 100644
index 0000000..1b8353e
--- /dev/null
+++ b/.gitreview
@@ -0,0 +1,4 @@
+[gerrit]
+host=gerrit.mcp.mirantis.net
+port=29418
+project=salt-models/reclass-system.git
diff --git a/aptly/server/mirror/ubuntu/trusty/mos8.yml b/aptly/server/mirror/ubuntu/trusty/mos8.yml
index e6e6707..c85363f 100644
--- a/aptly/server/mirror/ubuntu/trusty/mos8.yml
+++ b/aptly/server/mirror/ubuntu/trusty/mos8.yml
@@ -13,6 +13,7 @@
component: main
distributions:
- mos8/mos8.0
+ # FIXME, enable hotfix once contain packages, otherwise broke aptly publish
#mirantis-openstack-8.0-hotfix-trusty:
# source: http://mirror.fuel-infra.org/mos-repos/ubuntu/8.0-mu-3/
# distribution: mos8.0-hotfix
@@ -37,6 +38,7 @@
component: main
distributions:
- mos8/mos8.0-proposed
+ # FIXME, enable security once contain packages, otherwise broke aptly publish
#mirantis-openstack-8.0-security-trusty:
# source: http://mirror.fuel-infra.org/mos-repos/ubuntu/8.0-mu-3/
# distribution: mos8.0-security
diff --git a/aptly/server/mirror/ubuntu/trusty/mos9.yml b/aptly/server/mirror/ubuntu/trusty/mos9.yml
index 20f87b2..29415ab 100644
--- a/aptly/server/mirror/ubuntu/trusty/mos9.yml
+++ b/aptly/server/mirror/ubuntu/trusty/mos9.yml
@@ -37,6 +37,7 @@
component: main
distributions:
- mos9/mos9.0-proposed
+ # FIXME, enable security once contain packages, otherwise broke aptly publish
#mirantis-openstack-9.0-security-trusty:
# source: http://mirror.fuel-infra.org/mos-repos/ubuntu/9.0/
# distribution: mos9.0-security
@@ -62,7 +63,7 @@
distributions:
- mos9/mos9.0-updates
mirantis-openstack-9.0-extras-murano:
- source: http://mirror.fuel-infra.org/extras/murano-plugin-repos/release/1.1.0/ubuntu/9.0/
+ source: http://mirror.fuel-infra.org/extras/murano-plugin-repos/release/1.2.0/ubuntu/9.0/
distribution: mos9.0
components: main restricted
architectures: amd64
diff --git a/aptly/server/mirror/ubuntu/trusty/ubuntu.yml b/aptly/server/mirror/ubuntu/trusty/ubuntu.yml
index 22e83df..3cd7c7b 100644
--- a/aptly/server/mirror/ubuntu/trusty/ubuntu.yml
+++ b/aptly/server/mirror/ubuntu/trusty/ubuntu.yml
@@ -1,10 +1,12 @@
parameters:
+ _param:
+ linux_system_country_code: cz
aptly:
server:
mirror:
# trusty
trusty-main:
- source: http://cz.archive.ubuntu.com/ubuntu/
+ source: http://${_param:linux_system_country_code}.archive.ubuntu.com/ubuntu/
distribution: trusty
components: main
architectures: amd64
@@ -17,7 +19,7 @@
distributions:
- ubuntu/trusty
trusty-multiverse:
- source: http://cz.archive.ubuntu.com/ubuntu/
+ source: http://${_param:linux_system_country_code}.archive.ubuntu.com/ubuntu/
distribution: trusty
components: multiverse
architectures: amd64
@@ -30,7 +32,7 @@
distributions:
- ubuntu/trusty
trusty-restricted:
- source: http://cz.archive.ubuntu.com/ubuntu/
+ source: http://${_param:linux_system_country_code}.archive.ubuntu.com/ubuntu/
distribution: trusty
components: restricted
architectures: amd64
@@ -43,7 +45,7 @@
distributions:
- ubuntu/trusty
trusty-universe:
- source: http://cz.archive.ubuntu.com/ubuntu/
+ source: http://${_param:linux_system_country_code}.archive.ubuntu.com/ubuntu/
distribution: trusty
components: universe
architectures: amd64
@@ -58,7 +60,7 @@
# trusty-updates
trusty-updates-main:
- source: http://cz.archive.ubuntu.com/ubuntu/
+ source: http://${_param:linux_system_country_code}.archive.ubuntu.com/ubuntu/
distribution: trusty-updates
components: main
architectures: amd64
@@ -71,7 +73,7 @@
distributions:
- ubuntu/trusty-updates
trusty-updates-multiverse:
- source: http://cz.archive.ubuntu.com/ubuntu/
+ source: http://${_param:linux_system_country_code}.archive.ubuntu.com/ubuntu/
distribution: trusty-updates
components: multiverse
architectures: amd64
@@ -84,7 +86,7 @@
distributions:
- ubuntu/trusty-updates
trusty-updates-restricted:
- source: http://cz.archive.ubuntu.com/ubuntu/
+ source: http://${_param:linux_system_country_code}.archive.ubuntu.com/ubuntu/
distribution: trusty-updates
components: restricted
architectures: amd64
@@ -97,7 +99,7 @@
distributions:
- ubuntu/trusty-updates
trusty-updates-universe:
- source: http://cz.archive.ubuntu.com/ubuntu/
+ source: http://${_param:linux_system_country_code}.archive.ubuntu.com/ubuntu/
distribution: trusty-updates
components: universe
architectures: amd64
@@ -112,7 +114,7 @@
#trusty-security:
trusty-security-main:
- source: http://cz.archive.ubuntu.com/ubuntu/
+ source: http://${_param:linux_system_country_code}.archive.ubuntu.com/ubuntu/
distribution: trusty-security
components: main
architectures: amd64
@@ -125,7 +127,7 @@
distributions:
- ubuntu/trusty-security
trusty-security-multiverse:
- source: http://cz.archive.ubuntu.com/ubuntu/
+ source: http://${_param:linux_system_country_code}.archive.ubuntu.com/ubuntu/
distribution: trusty-security
components: multiverse
architectures: amd64
@@ -138,7 +140,7 @@
distributions:
- ubuntu/trusty-security
trusty-security-restricted:
- source: http://cz.archive.ubuntu.com/ubuntu/
+ source: http://${_param:linux_system_country_code}.archive.ubuntu.com/ubuntu/
distribution: trusty-security
components: restricted
architectures: amd64
@@ -151,7 +153,7 @@
distributions:
- ubuntu/trusty-security
trusty-security-universe:
- source: http://cz.archive.ubuntu.com/ubuntu/
+ source: http://${_param:linux_system_country_code}.archive.ubuntu.com/ubuntu/
distribution: trusty-security
components: universe
architectures: amd64
@@ -166,7 +168,7 @@
#trusty-proposed:
trusty-proposed-main:
- source: http://cz.archive.ubuntu.com/ubuntu/
+ source: http://${_param:linux_system_country_code}.archive.ubuntu.com/ubuntu/
distribution: trusty-proposed
components: main
architectures: amd64
@@ -179,7 +181,7 @@
distributions:
- ubuntu/trusty-proposed
trusty-proposed-multiverse:
- source: http://cz.archive.ubuntu.com/ubuntu/
+ source: http://${_param:linux_system_country_code}.archive.ubuntu.com/ubuntu/
distribution: trusty-proposed
components: multiverse
architectures: amd64
@@ -192,7 +194,7 @@
distributions:
- ubuntu/trusty-proposed
trusty-proposed-restricted:
- source: http://cz.archive.ubuntu.com/ubuntu/
+ source: http://${_param:linux_system_country_code}.archive.ubuntu.com/ubuntu/
distribution: trusty-proposed
components: restricted
architectures: amd64
@@ -205,7 +207,7 @@
distributions:
- ubuntu/trusty-proposed
trusty-proposed-universe:
- source: http://cz.archive.ubuntu.com/ubuntu/
+ source: http://${_param:linux_system_country_code}.archive.ubuntu.com/ubuntu/
distribution: trusty-proposed
components: universe
architectures: amd64
@@ -220,7 +222,7 @@
#trusty-backports:
trusty-backports-main:
- source: http://cz.archive.ubuntu.com/ubuntu/
+ source: http://${_param:linux_system_country_code}.archive.ubuntu.com/ubuntu/
distribution: trusty-backports
components: main
architectures: amd64
@@ -233,7 +235,7 @@
distributions:
- ubuntu/trusty-backports
trusty-backports-multiverse:
- source: http://cz.archive.ubuntu.com/ubuntu/
+ source: http://${_param:linux_system_country_code}.archive.ubuntu.com/ubuntu/
distribution: trusty-backports
components: multiverse
architectures: amd64
@@ -246,7 +248,7 @@
distributions:
- ubuntu/trusty-backports
trusty-backports-restricted:
- source: http://cz.archive.ubuntu.com/ubuntu/
+ source: http://${_param:linux_system_country_code}.archive.ubuntu.com/ubuntu/
distribution: trusty-backports
components: restricted
architectures: amd64
@@ -259,7 +261,7 @@
distributions:
- ubuntu/trusty-backports
trusty-backports-universe:
- source: http://cz.archive.ubuntu.com/ubuntu/
+ source: http://${_param:linux_system_country_code}.archive.ubuntu.com/ubuntu/
distribution: trusty-backports
components: universe
architectures: amd64
diff --git a/aptly/server/mirror/ubuntu/xenial/ceph_mirantis.yml b/aptly/server/mirror/ubuntu/xenial/ceph_mirantis.yml
index 1bc4341..3401a4e 100644
--- a/aptly/server/mirror/ubuntu/xenial/ceph_mirantis.yml
+++ b/aptly/server/mirror/ubuntu/xenial/ceph_mirantis.yml
@@ -2,7 +2,7 @@
aptly:
server:
mirror:
- ceph-mirantis-xenial:
+ ubuntu-xenial-ceph-mirantis:
source: http://eu.mirror.fuel-infra.org/decapod/ceph/apt
distribution: jewel-xenial
components: main
@@ -12,8 +12,8 @@
publisher:
component: ceph-mirantis
distributions:
- - xenial/nightly
- decapod-ceph-mirantis-xenial:
+ - ubuntu-xenial/nightly
+ ubuntu-xenial-decapod-ceph-mirantis:
source: http://eu.mirror.fuel-infra.org/decapod/ceph/apt
distribution: jewel-xenial
components: main
diff --git a/aptly/server/mirror/ubuntu/xenial/ubuntu.yml b/aptly/server/mirror/ubuntu/xenial/ubuntu.yml
index 10c54a5..4675063 100644
--- a/aptly/server/mirror/ubuntu/xenial/ubuntu.yml
+++ b/aptly/server/mirror/ubuntu/xenial/ubuntu.yml
@@ -1,10 +1,14 @@
parameters:
+ _param:
+ linux_system_country_code_default: cz
+ linux_system_country_code: ${_param:linux_system_country_code_default}
aptly:
server:
mirror:
# xenial
xenial-main:
- source: http://cz.archive.ubuntu.com/ubuntu/
+ sources: true
+ source: http://${_param:linux_system_country_code}.archive.ubuntu.com/ubuntu/
distribution: xenial
components: main
architectures: amd64
@@ -17,7 +21,8 @@
distributions:
- ubuntu/xenial
xenial-multiverse:
- source: http://cz.archive.ubuntu.com/ubuntu/
+ sources: true
+ source: http://${_param:linux_system_country_code}.archive.ubuntu.com/ubuntu/
distribution: xenial
components: multiverse
architectures: amd64
@@ -30,7 +35,8 @@
distributions:
- ubuntu/xenial
xenial-restricted:
- source: http://cz.archive.ubuntu.com/ubuntu/
+ sources: true
+ source: http://${_param:linux_system_country_code}.archive.ubuntu.com/ubuntu/
distribution: xenial
components: restricted
architectures: amd64
@@ -43,7 +49,8 @@
distributions:
- ubuntu/xenial
xenial-universe:
- source: http://cz.archive.ubuntu.com/ubuntu/
+ sources: true
+ source: http://${_param:linux_system_country_code}.archive.ubuntu.com/ubuntu/
distribution: xenial
components: universe
architectures: amd64
@@ -58,7 +65,8 @@
# xenial-updates
xenial-updates-main:
- source: http://cz.archive.ubuntu.com/ubuntu/
+ sources: true
+ source: http://${_param:linux_system_country_code}.archive.ubuntu.com/ubuntu/
distribution: xenial-updates
components: main
architectures: amd64
@@ -71,7 +79,8 @@
distributions:
- ubuntu/xenial-updates
xenial-updates-multiverse:
- source: http://cz.archive.ubuntu.com/ubuntu/
+ sources: true
+ source: http://${_param:linux_system_country_code}.archive.ubuntu.com/ubuntu/
distribution: xenial-updates
components: multiverse
architectures: amd64
@@ -84,7 +93,8 @@
distributions:
- ubuntu/xenial-updates
xenial-updates-restricted:
- source: http://cz.archive.ubuntu.com/ubuntu/
+ sources: true
+ source: http://${_param:linux_system_country_code}.archive.ubuntu.com/ubuntu/
distribution: xenial-updates
components: restricted
architectures: amd64
@@ -97,7 +107,8 @@
distributions:
- ubuntu/xenial-updates
xenial-updates-universe:
- source: http://cz.archive.ubuntu.com/ubuntu/
+ sources: true
+ source: http://${_param:linux_system_country_code}.archive.ubuntu.com/ubuntu/
distribution: xenial-updates
components: universe
architectures: amd64
@@ -112,7 +123,8 @@
#xenial-security:
xenial-security-main:
- source: http://cz.archive.ubuntu.com/ubuntu/
+ sources: true
+ source: http://${_param:linux_system_country_code}.archive.ubuntu.com/ubuntu/
distribution: xenial-security
components: main
architectures: amd64
@@ -125,7 +137,8 @@
distributions:
- ubuntu/xenial-security
xenial-security-multiverse:
- source: http://cz.archive.ubuntu.com/ubuntu/
+ sources: true
+ source: http://${_param:linux_system_country_code}.archive.ubuntu.com/ubuntu/
distribution: xenial-security
components: multiverse
architectures: amd64
@@ -138,7 +151,8 @@
distributions:
- ubuntu/xenial-security
xenial-security-restricted:
- source: http://cz.archive.ubuntu.com/ubuntu/
+ sources: true
+ source: http://${_param:linux_system_country_code}.archive.ubuntu.com/ubuntu/
distribution: xenial-security
components: restricted
architectures: amd64
@@ -151,7 +165,8 @@
distributions:
- ubuntu/xenial-security
xenial-security-universe:
- source: http://cz.archive.ubuntu.com/ubuntu/
+ sources: true
+ source: http://${_param:linux_system_country_code}.archive.ubuntu.com/ubuntu/
distribution: xenial-security
components: universe
architectures: amd64
@@ -166,7 +181,8 @@
#xenial-proposed:
xenial-proposed-main:
- source: http://cz.archive.ubuntu.com/ubuntu/
+ sources: true
+ source: http://${_param:linux_system_country_code}.archive.ubuntu.com/ubuntu/
distribution: xenial-proposed
components: main
architectures: amd64
@@ -179,7 +195,8 @@
distributions:
- ubuntu/xenial-proposed
xenial-proposed-multiverse:
- source: http://cz.archive.ubuntu.com/ubuntu/
+ sources: true
+ source: http://${_param:linux_system_country_code}.archive.ubuntu.com/ubuntu/
distribution: xenial-proposed
components: multiverse
architectures: amd64
@@ -192,7 +209,7 @@
distributions:
- ubuntu/xenial-proposed
xenial-proposed-restricted:
- source: http://cz.archive.ubuntu.com/ubuntu/
+ source: http://${_param:linux_system_country_code}.archive.ubuntu.com/ubuntu/
distribution: xenial-proposed
components: restricted
architectures: amd64
@@ -205,7 +222,7 @@
distributions:
- ubuntu/xenial-proposed
xenial-proposed-universe:
- source: http://cz.archive.ubuntu.com/ubuntu/
+ source: http://${_param:linux_system_country_code}.archive.ubuntu.com/ubuntu/
distribution: xenial-proposed
components: universe
architectures: amd64
@@ -220,7 +237,7 @@
#xenial-backports:
xenial-backports-main:
- source: http://cz.archive.ubuntu.com/ubuntu/
+ source: http://${_param:linux_system_country_code}.archive.ubuntu.com/ubuntu/
distribution: xenial-backports
components: main
architectures: amd64
@@ -233,7 +250,7 @@
distributions:
- ubuntu/xenial-backports
xenial-backports-multiverse:
- source: http://cz.archive.ubuntu.com/ubuntu/
+ source: http://${_param:linux_system_country_code}.archive.ubuntu.com/ubuntu/
distribution: xenial-backports
components: multiverse
architectures: amd64
@@ -246,7 +263,8 @@
distributions:
- ubuntu/xenial-backports
xenial-backports-restricted:
- source: http://cz.archive.ubuntu.com/ubuntu/
+ sources: true
+ source: http://${_param:linux_system_country_code}.archive.ubuntu.com/ubuntu/
distribution: xenial-backports
components: restricted
architectures: amd64
@@ -259,7 +277,8 @@
distributions:
- ubuntu/xenial-backports
xenial-backports-universe:
- source: http://cz.archive.ubuntu.com/ubuntu/
+ sources: true
+ source: http://${_param:linux_system_country_code}.archive.ubuntu.com/ubuntu/
distribution: xenial-backports
components: universe
architectures: amd64
diff --git a/aptly/server/single.yml b/aptly/server/single.yml
index 095c396..8b71974 100644
--- a/aptly/server/single.yml
+++ b/aptly/server/single.yml
@@ -73,6 +73,7 @@
server:
enabled: true
secure: ${_param:aptly_server_secure}
- gpg_keypair_id: ${_param:aptly_gpg_keypair_id}
- gpg_public_key: ${_param:aptly_gpg_public_key}
- gpg_private_key: ${_param:aptly_gpg_private_key}
+ gpg:
+ keypair_id: ${_param:aptly_gpg_keypair_id}
+ public_key: ${_param:aptly_gpg_public_key}
+ private_key: ${_param:aptly_gpg_private_key}
diff --git a/devops_portal/service/gerrit.yml b/devops_portal/service/gerrit.yml
new file mode 100644
index 0000000..6dcad9c
--- /dev/null
+++ b/devops_portal/service/gerrit.yml
@@ -0,0 +1,9 @@
+parameters:
+ devops_portal:
+ config:
+ service:
+ gerrit:
+ endpoint:
+ address: ${_param:haproxy_gerrit_bind_host}
+ port: ${_param:haproxy_gerrit_bind_port}
+ https: ${_param:haproxy_gerrit_ssl:enabled}
diff --git a/devops_portal/service/jenkins.yml b/devops_portal/service/jenkins.yml
new file mode 100644
index 0000000..349a707
--- /dev/null
+++ b/devops_portal/service/jenkins.yml
@@ -0,0 +1,9 @@
+parameters:
+ devops_portal:
+ config:
+ service:
+ jenkins:
+ endpoint:
+ address: ${_param:haproxy_jenkins_bind_host}
+ port: ${_param:haproxy_jenkins_bind_port}
+ https: ${_param:haproxy_jenkins_ssl:enabled}
diff --git a/devops_portal/service/rundeck.yml b/devops_portal/service/rundeck.yml
new file mode 100644
index 0000000..1a15473
--- /dev/null
+++ b/devops_portal/service/rundeck.yml
@@ -0,0 +1,13 @@
+parameters:
+ devops_portal:
+ config:
+ service:
+ rundeck:
+ configure_proxy: true
+ credentials:
+ username: admin
+ password: ${_param:rundeck_admin_password}
+ endpoint:
+ address: ${_param:haproxy_rundeck_bind_host}
+ port: ${_param:haproxy_rundeck_bind_port}
+ https: ${_param:haproxy_rundeck_ssl:enabled}
diff --git a/docker/swarm/service/devops_portal.yml b/docker/swarm/service/devops_portal.yml
new file mode 100644
index 0000000..6a82aa5
--- /dev/null
+++ b/docker/swarm/service/devops_portal.yml
@@ -0,0 +1,23 @@
+parameters:
+ _param:
+ docker_devops_portal_replicas: 1
+ docker_image_devops_portal: docker-sandbox.sandbox.mirantis.net/ikharin/oss/devops-portal:latest
+ docker:
+ client:
+ service:
+ devops-portal:
+ replicas: ${_param:docker_devops_portal_replicas}
+ image: ${_param:docker_image_devops_portal}
+ restart:
+ condition: any
+ ports:
+ - 18800:8000
+ volume:
+ nginx:
+ type: bind
+ source: /srv/volumes/devops_portal/nginx/
+ destination: /etc/nginx/config
+ config:
+ type: bind
+ source: /srv/volumes/devops_portal/config/
+ destination: /opt/devops-portal/config
diff --git a/docker/swarm/service/rundeck.yml b/docker/swarm/service/rundeck.yml
new file mode 100644
index 0000000..baad94a
--- /dev/null
+++ b/docker/swarm/service/rundeck.yml
@@ -0,0 +1,47 @@
+parameters:
+ _param:
+ docker_rundeck_replicas: 1
+ docker_image_rundeck: docker-sandbox.sandbox.mirantis.net/ikharin/oss/rundeck:latest
+ rundeck_admin_password: password
+ docker:
+ client:
+ service:
+ rundeck:
+ environment:
+ SERVER_URL: "http://${_param:haproxy_rundeck_bind_host}:${_param:haproxy_rundeck_bind_port}"
+ RUNDECK_ADMIN_PASSWORD: ${_param:rundeck_admin_password}
+ replicas: ${_param:docker_rundeck_replicas}
+ image: ${_param:docker_image_rundeck}
+ restart:
+ condition: any
+ ports:
+ - 14440:4440
+ volume:
+ etc:
+ type: bind
+ source: /srv/volumes/rundeck/etc
+ destination: /etc/rundeck
+ rundeck:
+ type: bind
+ source: /srv/volumes/rundeck/rundeck
+ destination: /var/rundeck
+ mysql:
+ type: bind
+ source: /srv/volumes/rundeck/mysql
+ destination: /var/lib/mysql
+ log:
+ type: bind
+ source: /srv/volumes/rundeck/log
+ destination: /var/log/rundeck
+ logs:
+ type: bind
+ source: /srv/volumes/rundeck/logs
+ destination: /var/lib/rundeck/logs
+ plugins:
+ type: bind
+ source: /srv/volumes/rundeck/plugins
+ destination: /opt/rundeck-plugins
+ storage:
+ type: bind
+ source: /srv/volumes/rundeck/storage
+ destination: /var/lib/rundeck/var/storage
diff --git a/glusterfs/client/volume/devops_portal.yml b/glusterfs/client/volume/devops_portal.yml
new file mode 100644
index 0000000..9a3c291
--- /dev/null
+++ b/glusterfs/client/volume/devops_portal.yml
@@ -0,0 +1,10 @@
+parameters:
+ _param:
+ devops_portal_glusterfs_service_host: ${_param:glusterfs_service_host}
+ glusterfs:
+ client:
+ volumes:
+ devops_portal:
+ path: /srv/volumes/devops_portal
+ server: ${_param:devops_portal_glusterfs_service_host}
+ opts: 'defaults'
diff --git a/glusterfs/client/volume/rundeck.yml b/glusterfs/client/volume/rundeck.yml
new file mode 100644
index 0000000..b226aeb
--- /dev/null
+++ b/glusterfs/client/volume/rundeck.yml
@@ -0,0 +1,10 @@
+parameters:
+ _param:
+ rundeck_glusterfs_service_host: ${_param:glusterfs_service_host}
+ glusterfs:
+ client:
+ volumes:
+ rundeck:
+ path: /srv/volumes/rundeck
+ server: ${_param:rundeck_glusterfs_service_host}
+ opts: 'defaults'
diff --git a/glusterfs/server/volume/devops_portal.yml b/glusterfs/server/volume/devops_portal.yml
new file mode 100644
index 0000000..0b71b62
--- /dev/null
+++ b/glusterfs/server/volume/devops_portal.yml
@@ -0,0 +1,17 @@
+parameters:
+ glusterfs:
+ server:
+ volumes:
+ devops_portal:
+ storage: /srv/glusterfs/devops_portal
+ replica: 3
+ bricks:
+ - ${_param:cluster_node01_address}:/srv/glusterfs/devops_portal
+ - ${_param:cluster_node02_address}:/srv/glusterfs/devops_portal
+ - ${_param:cluster_node03_address}:/srv/glusterfs/devops_portal
+ options:
+ cluster.readdir-optimize: On
+ nfs.disable: On
+ network.remote-dio: On
+ diagnostics.client-log-level: WARNING
+ diagnostics.brick-log-level: WARNING
diff --git a/glusterfs/server/volume/rundeck.yml b/glusterfs/server/volume/rundeck.yml
new file mode 100644
index 0000000..22e5563
--- /dev/null
+++ b/glusterfs/server/volume/rundeck.yml
@@ -0,0 +1,17 @@
+parameters:
+ glusterfs:
+ server:
+ volumes:
+ rundeck:
+ storage: /srv/glusterfs/rundeck
+ replica: 3
+ bricks:
+ - ${_param:cluster_node01_address}:/srv/glusterfs/rundeck
+ - ${_param:cluster_node02_address}:/srv/glusterfs/rundeck
+ - ${_param:cluster_node03_address}:/srv/glusterfs/rundeck
+ options:
+ cluster.readdir-optimize: On
+ nfs.disable: On
+ network.remote-dio: On
+ diagnostics.client-log-level: WARNING
+ diagnostics.brick-log-level: WARNING
diff --git a/haproxy/proxy/listen/oss/devops_portal.yml b/haproxy/proxy/listen/oss/devops_portal.yml
new file mode 100644
index 0000000..e5c25cf
--- /dev/null
+++ b/haproxy/proxy/listen/oss/devops_portal.yml
@@ -0,0 +1,37 @@
+parameters:
+ _param:
+ haproxy_devops_portal_bind_host: ${_param:haproxy_bind_address}
+ haproxy_devops_portal_bind_port: 8800
+ haproxy_devops_portal_ssl:
+ enabled: false
+ haproxy:
+ proxy:
+ listen:
+ devops_portal:
+ 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_devops_portal_bind_host}
+ port: ${_param:haproxy_devops_portal_bind_port}
+ ssl: ${_param:haproxy_devops_portal_ssl}
+ servers:
+ - name: ${_param:cluster_node01_name}
+ host: ${_param:cluster_node01_address}
+ port: 18800
+ params: check
+ - name: ${_param:cluster_node02_name}
+ host: ${_param:cluster_node02_address}
+ port: 18800
+ params: backup check
+ - name: ${_param:cluster_node03_name}
+ host: ${_param:cluster_node03_address}
+ port: 18800
+ params: backup check
diff --git a/haproxy/proxy/listen/oss/rundeck.yml b/haproxy/proxy/listen/oss/rundeck.yml
new file mode 100644
index 0000000..fbabb38
--- /dev/null
+++ b/haproxy/proxy/listen/oss/rundeck.yml
@@ -0,0 +1,37 @@
+parameters:
+ _param:
+ haproxy_rundeck_bind_host: ${_param:haproxy_bind_address}
+ haproxy_rundeck_bind_port: 4440
+ haproxy_rundeck_ssl:
+ enabled: false
+ haproxy:
+ proxy:
+ listen:
+ rundeck:
+ 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_rundeck_bind_host}
+ port: ${_param:haproxy_rundeck_bind_port}
+ ssl: ${_param:haproxy_rundeck_ssl}
+ servers:
+ - name: ${_param:cluster_node01_name}
+ host: ${_param:cluster_node01_address}
+ port: 14440
+ params: check
+ - name: ${_param:cluster_node02_name}
+ host: ${_param:cluster_node02_address}
+ port: 14440
+ params: backup check
+ - name: ${_param:cluster_node03_name}
+ host: ${_param:cluster_node03_address}
+ port: 14440
+ params: backup check
diff --git a/horizon/server/single.yml b/horizon/server/single.yml
index 5a83b2a..c20de5a 100644
--- a/horizon/server/single.yml
+++ b/horizon/server/single.yml
@@ -1,6 +1,5 @@
classes:
- service.horizon.server.single
-- system.horizon.server.plugin.theme
parameters:
_param:
horizon_site_branding: OpenStack Dashboard
diff --git a/openssh/server/team/mcp_qa.yml b/openssh/server/team/mcp_qa.yml
index e4677dc..766044d 100644
--- a/openssh/server/team/mcp_qa.yml
+++ b/openssh/server/team/mcp_qa.yml
@@ -38,6 +38,66 @@
sudo: true
full_name: Denis Deryabin
home: /home/dderyabin
+ ababich:
+ enabled: true
+ name: ababich
+ sudo: true
+ full_name: Anna Babich
+ home: /home/ababich
+ esikachev:
+ enabled: true
+ name: esikachev
+ sudo: true
+ full_name: Evgeny Sikachev
+ home: /home/esikachev
+ akalach:
+ enabled: true
+ name: akalach
+ sudo: true
+ full_name: Andrew Kalach
+ home: /home/akalach
+ aheczko:
+ enabled: true
+ name: aheczko
+ sudo: true
+ full_name: Adam Heczko
+ home: /home/aheczko
+ ssokolov:
+ enabled: true
+ name: ssokolov
+ sudo: true
+ full_name: Sergey Sokolov
+ home: /home/ssokolov
+ mshalamov:
+ enabled: true
+ name: mshalamov
+ sudo: true
+ full_name: Maksym Shalamov
+ home: /home/mshalamov
+ schipiga:
+ enabled: true
+ name: schipiga
+ sudo: true
+ full_name: Sergey Chipiga
+ home: /home/schipiga
+ obutenko:
+ enabled: true
+ name: obutenko
+ sudo: true
+ full_name: Oleksii Butenko
+ home: /home/obutenko
+ ylobankov:
+ enabled: true
+ name: ylobankov
+ sudo: true
+ full_name: Yaroslav Lobankov
+ home: /home/ylobankov
+ vryzhenkin:
+ enabled: true
+ name: vryzhenkin
+ sudo: true
+ full_name: Victor Ryzhenkin
+ home: /home/vryzhenkin
dkalashnik:
enabled: true
name: dkalashnik
@@ -97,6 +157,56 @@
public_keys:
- ${public_keys:dderyabin}
user: ${linux:system:user:dderyabin}
+ ababich:
+ enabled: true
+ public_keys:
+ - ${public_keys:ababich}
+ user: ${linux:system:user:ababich}
+ esikachev:
+ enabled: true
+ public_keys:
+ - ${public_keys:esikachev}
+ user: ${linux:system:user:esikachev}
+ akalach:
+ enabled: true
+ public_keys:
+ - ${public_keys:akalach}
+ user: ${linux:system:user:akalach}
+ aheczko:
+ enabled: true
+ public_keys:
+ - ${public_keys:aheczko}
+ user: ${linux:system:user:aheczko}
+ ssokolov:
+ enabled: true
+ public_keys:
+ - ${public_keys:ssokolov}
+ user: ${linux:system:user:ssokolov}
+ mshalamov:
+ enabled: true
+ public_keys:
+ - ${public_keys:mshalamov}
+ user: ${linux:system:user:mshalamov}
+ schipiga:
+ enabled: true
+ public_keys:
+ - ${public_keys:schipiga}
+ user: ${linux:system:user:schipiga}
+ obutenko:
+ enabled: true
+ public_keys:
+ - ${public_keys:obutenko}
+ user: ${linux:system:user:obutenko}
+ ylobankov:
+ enabled: true
+ public_keys:
+ - ${public_keys:ylobankov}
+ user: ${linux:system:user:ylobankov}
+ vryzhenkin:
+ enabled: true
+ public_keys:
+ - ${public_keys:vryzhenkin}
+ user: ${linux:system:user:vryzhenkin}
dkalashnik:
enable: true
public_keys:
@@ -125,6 +235,26 @@
key: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCWvKNMfHlugrEUMtDDJzZb3T1UzThOp/UtvQvyFTf1rlKN/i14b1cCVmbPaSKR6W4bqZ4YLnRfb5Z66ktEACL02RdC4FkCiGa8yFDAGXLbM2WJhHyA3ksu91z3wK2QRuKJuZuvjmelds1shTK1a31LgTqa7CNPfkfE9h+CsAizZfAhHg1yVqg0/CGKP8+iV8owR5MP9t8+JXTC40G6Qkjzrf/vuA13bT1X+JSWzLoI2OefezZ+X128fLkssPkr4IS1Jg+cbRvSRmGTVjvtk4dnDo3QxF5lUl6JZAUjPslMCxaqDvRFXn86UZ74g6iJ5dZjrU0vn6X+Ov+KVYmZ5znd yshapovalov@ys-pc
dderyabin:
key: AAAAB3NzaC1yc2EAAAADAQABAAABAQCljOKDvsoOsQFOsabL68kVTlzZOObP9d13Oqc7Lafew1MJx0uaCjabpfcaSOrLrqYu42akkpnHQ0ypQbzRWDREYWKciKmE1TKzRUTXZIF1FNNoFrDT7FfjrKVP42alk4isB0Yj9mvA6AhJGFM7pAy55dVEII30Rc0wKW6XCBAX8fIq3rHDnDYq7KuaSAtxkqj6u/C9eUcGBB+JIQ0NRhTVyIZlqjNeojXoM7py8pGDnGj54bIbpFtYiLU1hbowKfVVcJgHIE+17KsNvR7HwwZZ5lbUxzrOiOnoBq1JKF15JHQ3el358aKw3Ee7rqmVrHszohEBLfxRbWbACoTUem75 denis@usvbox
+ ababich:
+ key: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDo2CJRAQeUeZbjDLdcE7GxQM82kL41YIyuOpNbpzFXphK4gljSMoKH9TJRdlx5S/AGDJltosDym9lY7gi3DqW4z/+k9pHBLQSdr4yDp0iCJcZc8LG3KUbZkZwwCYjf8FTz5tAWgS9z8IKNRMcfReJCkeaFI29p0PVgPqchNaQHUG40iiIl51uLsF4pCF2GbF/10drBCubENlWLoGv/+OwiNzeOvGANeX8jBivevfus2hZbTh1Zf8HsXqd5HLTMRn/BJOJRbLFd74BauAY/J/wOM9SJOaFZU201A2eYgMsamXT159O8e1Q5GMtL4uhseXZzQgKwF9tW/EFBDPwXvC+n ababich@ababich-pc
+ esikachev:
+ key: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQC9zHSDorWIKSB5QH4y8bcdzsx0yE7cA/Eg3M98+qPkZPAJl1FgFXYo8XcMod52tVDsfap/mLg1k0pwmmocUGSoESAUs7Wdo5wKhRdsEo+SYxjfL3QVIlKpocho7DmBgudkRLk9mjzcjNBdWyuw9dH6/hy+FK77i5xUqIwJR0koc1WcvzyzZcacMZLYG26rxO0CMC9aTWIZcEFrv4hk7CSb+KFNfbvRN0vHjdp31GuEWDVZ6oSv8V5ipGCJS/HCuTzb/Wqjxgwh5OAqZoepdBaiqNhEmLbFBqQ0vtBwTjWixDRLry06s4J5WWFSGu6GrRbgHnd08752o2TiB28Af4F/ esikachev@Evgenys-MacBook-Pro.local
+ akalach:
+ key: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDOGQ6j4Fy1Lm00UihYbmJ88ctLGaVXlSPys8lk1gUsT8lR2oOZvERl8FIsSlN47Z2wbvcTCq3aOlxvuV/UyT8+r8LEGM5Wk1XSsDMRsvc92qfeRQhAJDp8f+2pUkNfc8rXaPKUDkz0iI6iwANOIR+P7Xx11w//0itDBBKX7sEBsxJbSjm6DLyfs1yn6tT5S4kqAcq5jpX3YMH0MqhcWPS0tK1W6QW13KDt317CIWmoVQMvdmzF/QenXIbV6PZjBy2DvkFVOThdH+OZDMgo4mggGqnsokjy6ZjT0LzKAptKrFKd/xRQUUelWY5XvXtH8RxVtg92Xqh2CjdA4OfYPn6x
+ aheczko:
+ key: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDGGRD/zStceB/CAJu8bnsWs9VPWY8W1F6fz2AvX2BiyEXCE2W4uMY11In+qHQtIaWeyWVR/XmoCw0mZxk7emTz91Y1FioinEgumkhpNPLY0fPdDHzwu3atCjAc7B3ZCCXusiUC6k99aCa9YXIZ0/0/75kqilRmIcxGeneL9S2+iuFn/HSpNR7IZN03AEzWgIfXEhB4lyNs9n3RHf+XXy2wxAKkcKpMyocEO9gc3uLY5OdUhGFHRKhEZwgz3K6ysDOCIOTkiiJ8KXMM07FIDLjs5pjUjnVkZ1kWq+virLMbhhyCbMR8zrPvWMjP5oYGm9U9aEeUMA5iMCa7K+qs2AM3 adamheczko@Adams-MacBook-Pro.local
+ ssokolov:
+ key: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDHuIo/dLh5qt+8jV4UUPqDo6ktJc12HVFg10S3hinjJUlAOxq8554l0LMvxmiZSrIjxGE/qUr8PlRgjLi4x4zQDggBdNGC/S4zcYNEiTQ7HaOFOjEJ0si6ODZfssQsr/A/bXdNOZE/nIZTUhTddJG+3nKUvuPnTeOQLqEOp4IFJwwvwnD2Wo4I1nc6+yDSJLuG8ANLtLlStzpMKr8wHvPWCUcB9B1oeeOVtw9+vEKxuUBkheXnXMh7shiyt4vmaFVbcgcHGPg8DjP8alKeAbIk0AYhiuNHV/rFzL+/kfImS94gU93A8vt0U2vCj8golqt2huxJblKDr4Abq1lDXLwn ssm@n104309
+ mshalamov:
+ key: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQDISS6h3QAYC7u5njMks8Wsb6dHd/+HnU4nCEkqn7At5V7IdhD8K7m/9woyEdsDEPEHfqIkS7VAtjZbWlpUdNDFFos6yDFusOqLOoEOVdhuVZISUQZpsZExQ7poUN+w2Z9wmxSZ5sAL5iaamMDKhxR/ANL+olnXRxl4qmWSm4RYgQ5z4+Md1gorsy1Lnz1rEalhbUFPtfwiQgWZzNiTat0oMuRVOTASHjvE7+Tu8yt3nZ63OzGGzCBIq94PITh9wjRqoRn71PM8Q4U/UWhMApQSh/GWB0Y5VaCfIHdvnI0V+OIVGecd6sMgqVIy3DH+P4afZ6xIJ5jjeAi27HhuM/Tqr0yHn5TRa95WoH/zp8GVIdNxiBGZdhxEwzUctKzXN9LKmWRd37xywmrnLWdFtDWgE4I4xxadAU1qQqENeGoNnHofalrMPF95VZApkA7kDMNedrPha0bwbErX8gjtVs0K8QCLSc2n94obOCSQKTBx/NEq2Nq28mr9FKcmtFmu5sQYab4AbUmh7e+CHZYUCg0TIWcSEfPjSjur3AwvTq+4rJ0vUCqhthQspgLhkomzaWG1bhSeNs3Tq2Pq9l1kBsaMao2zu0uYu4Na2YzptsqAue7MybHLQW8O7TyMycfGNGv23i1g/EZWUhVyGQswEThkvafymZi5EUm5AbYf7ud0FQ== mshalamov@mirantis.com
+ schipiga:
+ key: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDamKTbqCQCGW1JLo+4PgntC1TkRrwbDOELyRVHxAlc56CcJE9QjrNnCOTqvgRoAmIC+P86nzUQxwSREMd0qgVCefAxKQVFVQ38oym9G90TF0nx4fFT3hUhEQwjMBjHhR2Vo+uUwbT2Hg51U1gBPx/WFa0U5Cf7V6+XNJ3r22W4XG8OrbuAoapwl4WN1346HEj3d0U6Z8Unsqjx9pRpZ1eYCeng4emLZ1UOhvLBfw22vSTkujjjRdfY6g52Gv4hRsgsS+JWulO+z/qd1GFcUp9j+yIvur+eeTWHelAbXq4kRNQfQjAs6nMM8Hp8gPa5jLYqMz2GgD96p8wOQCdK2nyL schipiga@mirantis.com
+ obutenko:
+ key: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQC1AfAmTtaBkg+8osdkG37KSHGc1r7k0ZWIgTR+COgPBnGGySRFrL3paG8PJ+JaEtZwj0git/Kufr+Mlcdln3x21kI3V4Jol0bgfx3d+AVZ2niyjwEHEl1vN6ffevzJUPVvLlUWlykKrEnGp1+RXKT3MEaoDcexzRLRgZB/FLaX79i1tE/AqB35rH5MZLBGCRYJdisUrpj70UHwIsqgikwr3P/JNr5gJzYTewPM8ls9Y9BtFNbFHmU8L9b8jFjmhOnCJmXXJPoLxQYRX+MQbcov7r2omZ95xulRnJsvY6xY2BSe8FAVmT8UzXnkWi3CrXwqPBdutu9GUCsQmH934vdJ obutenko@obutenko-pc
+ ylobankov:
+ key: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQDiBwStgCHjvPFYOAJgFXAFSFZaf57fJoSJV2Ijeg3uC3owsfQCgp6xd0aqSAUPYwnyV88IiDhNESeltJc3HmrA7kHWzziKCe4H7HEIg3IPGUKcnG7HF9izkmVTxqI/sXoyPvFoel5mJhtSes3A8Nk8IfWOexTy8NBfh2Te4PWqsYqEmHn2AdJ4oVBBrRDoxH8jac8vimOCZ742qMvF9lRWtItWatuEA8+moOyzAxLc0k1e7E8Myp37jE7LeXdoCE97rNp3OX7JHnfCYsthbRytA3Xjh8WLTdAaI1RCj0GqnVS3jdPS/Qzreit1gh7c74HWH/h/aj/U2wjHK1X63fJx/ZhzyqCwHjJ3spDPcIZ0tujZhw0ZjD/MiVxRze1EpmVJ3Zt0S6sgrOFXPSeC+3BEW6LD+jVIb33kS5y3bN1CXikv18WdCaLYjOGHolYF18Z5VgrxQh6hq94cSuJCYTDnbhkbww8XXCPiB2JKVF6KlD3MwfqlGKD+pyUWXKF0ZC8J4IO+keMnGGuausOFoRxg0vmpJ0fb0HODGofNIcwqnXSGmTYucBxWVs1Y4vs7NQPNJyzTcXcM8NyPpsG2uy1pwvDo+rTZ/nWFdu1mvW11hfInkNXTXjWljlNwhJCfRyNFvoUbahfRaNaBRIhy4GlGYjAHaMfkdYTYm0Dqt00YjQ== ylobankov@ylobankov
+ vryzhenkin:
+ key: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDwqFlEKeZDHKPSwIRXN7Bprc9G8HRvuq2ht+XPFixkX3H/GLrsy781PkE9CM3ZVhz7h68Rmyt3n6B1d0ewvcCHj2m/rixJj8rayNOuQN7v8yflTB/iKFZW7BZ9yxu3OSkQScrjQ6YRcifDYBMDFTkMrKsrIkfMBasvOGcK6BoPx1s3diupG8gN0fpGZ/BPIia+mGz+3jRk6aFBI9n5G1bbFikUPonhjlEoHoQv2ngKGvmDr8FWoItuvzQ7HH9mEwRTqVMzCNdeVxvNNNTLJ72ikig1FaCyAxGViVCa2Xidug9iRHE6dUWsqvaxNtXIrGX4E5lvNXHiJYi/mVcQR+Dx freerunner@pegasus
dkalashnik:
key: ssh-rsa AAAAB3NzaC1yc2EAAAABJQAAAIEAyz5ovMK/rRxlhiy7x4dVwFkUqN/hhdVIpsQRQoGgTOjVhH6Y+eTE3si0RRq/HKZMwkcClJIqzMgjoajT5eQQphQrAAn2pwuCyZj0mXJJ1RSXQm+nSnhoqyB1r7Nl3keopgxrDlBLWyvyS3dJM9RJy4TimIwhuSA3qdhmfeqRm5M=
rpromyshlennikov:
diff --git a/salt/master/formula/git/oss.yml b/salt/master/formula/git/oss.yml
new file mode 100644
index 0000000..9354935
--- /dev/null
+++ b/salt/master/formula/git/oss.yml
@@ -0,0 +1,13 @@
+parameters:
+ _param:
+ salt_master_oss_repository: https://gerrit.mcp.mirantis.net/oss
+ salt_master_oss_revision: master
+ salt:
+ master:
+ environment:
+ dev:
+ formula:
+ devops-portal:
+ source: git
+ address: '${_param:salt_master_oss_repository}/salt-formula-devops-portal.git'
+ revision: ${_param:salt_master_oss_revision}