Merge pull request #200 from simonpasquier/split-nagios-output
Make Nagios an optional feature
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/mcp/apt_mk.yml b/aptly/server/mirror/ubuntu/trusty/mcp/apt_mk.yml
new file mode 100644
index 0000000..553e6dd
--- /dev/null
+++ b/aptly/server/mirror/ubuntu/trusty/mcp/apt_mk.yml
@@ -0,0 +1,79 @@
+parameters:
+ _param:
+ apt_mk_version: stable
+ aptly:
+ server:
+ mirror:
+ # required for opencontrail formulas
+ mcp_opencontrail_trusty_oc311:
+ source: http://apt-mk.mirantis.com/trusty/
+ distribution: ${_param:apt_mk_version}
+ components: oc311
+ architectures: amd64
+ key_url: "http://apt-mk.mirantis.com/public.gpg"
+ gpgkeys:
+ - A76882D3
+ publisher:
+ component: oc311
+ distributions:
+ - ubuntu-trusty/${_param:apt_mk_version}
+ mcp_opencontrail_trusty_oc31:
+ source: http://apt-mk.mirantis.com/trusty/
+ distribution: ${_param:apt_mk_version}
+ components: oc31
+ architectures: amd64
+ key_url: "http://apt-mk.mirantis.com/public.gpg"
+ gpgkeys:
+ - A76882D3
+ publisher:
+ component: oc31
+ distributions:
+ - ubuntu-trusty/${_param:apt_mk_version}
+ mcp_opencontrail_trusty_oc32:
+ source: http://apt-mk.mirantis.com/trusty/
+ distribution: ${_param:apt_mk_version}
+ components: oc32
+ architectures: amd64
+ key_url: "http://apt-mk.mirantis.com/public.gpg"
+ gpgkeys:
+ - A76882D3
+ publisher:
+ component: oc32
+ distributions:
+ - ubuntu-trusty/${_param:apt_mk_version}
+ mcp_opencontrail_trusty_oc303:
+ source: http://apt-mk.mirantis.com/trusty/
+ distribution: ${_param:apt_mk_version}
+ components: oc303
+ architectures: amd64
+ key_url: "http://apt-mk.mirantis.com/public.gpg"
+ gpgkeys:
+ - A76882D3
+ publisher:
+ component: oc303
+ distributions:
+ - ubuntu-trusty/${_param:apt_mk_version}
+ mirantis_openstack_trusty_extra:
+ source: http://apt-mk.mirantis.com/trusty/
+ distribution: ${_param:apt_mk_version}
+ components: extra
+ architectures: amd64
+ key_url: "http://apt-mk.mirantis.com/public.gpg"
+ gpgkeys:
+ - A76882D3
+ publisher:
+ component: extra
+ distributions:
+ - ubuntu-trusty/${_param:apt_mk_version}
+ mirantis_openstack_trusty_salt:
+ source: http://apt-mk.mirantis.com/trusty/
+ distribution: ${_param:apt_mk_version}
+ components: salt
+ architectures: amd64
+ key_url: "http://apt-mk.mirantis.com/public.gpg"
+ gpgkeys:
+ - A76882D3
+ publisher:
+ component: salt
+ distributions:
+ - ubuntu-trusty/${_param:apt_mk_version}
diff --git a/aptly/server/mirror/ubuntu/trusty/mcp/openstack.yml b/aptly/server/mirror/ubuntu/trusty/mcp/openstack.yml
new file mode 100644
index 0000000..b419b8b
--- /dev/null
+++ b/aptly/server/mirror/ubuntu/trusty/mcp/openstack.yml
@@ -0,0 +1,74 @@
+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}
+ 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"
+ gpgkeys:
+ - 1FA22B08
+ publisher:
+ component: main
+ distributions:
+ - ubuntu-trusty/mitaka
+
+ mirantis_openstack_hotfix_trusty:
+ source: http://mirror.fuel-infra.org/mcp-repos/${_param:mcp_repo_version}/${_param:linux_system_codename}
+ 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"
+ gpgkeys:
+ - 1FA22B08
+ publisher:
+ component: main
+ distributions:
+ - ubuntu-trusty/mitaka-hotfix
+
+ mirantis_openstack_security_trusty:
+ source: http://mirror.fuel-infra.org/mcp-repos/${_param:mcp_repo_version}/${_param:linux_system_codename}
+ 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"
+ gpgkeys:
+ - 1FA22B08
+ publisher:
+ component: main
+ distributions:
+ - ubuntu-trusty/mitaka-security
+
+ # 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}
+ 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"
+ gpgkeys:
+ - 1FA22B08
+ publisher:
+ component: main
+ distributions:
+ - ubuntu-trusty/mitaka-updates
+
+ # required for salt formulas
+ mirantis_openstack_holdback_trusty:
+ source: http://mirror.fuel-infra.org/mcp-repos/${_param:mcp_repo_version}/${_param:linux_system_codename}
+ 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"
+ gpgkeys:
+ - 1FA22B08
+ publisher:
+ component: main
+ distributions:
+ - ubuntu-trusty/mitaka-holdback
+
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/mcp/apt_mk.yml b/aptly/server/mirror/ubuntu/xenial/mcp/apt_mk.yml
new file mode 100644
index 0000000..6272b69
--- /dev/null
+++ b/aptly/server/mirror/ubuntu/xenial/mcp/apt_mk.yml
@@ -0,0 +1,79 @@
+parameters:
+ _param:
+ apt_mk_version: stable
+ aptly:
+ server:
+ mirror:
+ # required for opencontrail formulas
+ mcp_opencontrail_xenial_oc311:
+ source: http://apt-mk.mirantis.com/xenial/
+ distribution: ${_param:apt_mk_version}
+ components: oc311
+ architectures: amd64
+ key_url: "http://apt-mk.mirantis.com/public.gpg"
+ gpgkeys:
+ - A76882D3
+ publisher:
+ component: oc311
+ distributions:
+ - ubuntu-xenial/${_param:apt_mk_version}
+ mcp_opencontrail_xenial_oc31:
+ source: http://apt-mk.mirantis.com/xenial/
+ distribution: ${_param:apt_mk_version}
+ components: oc31
+ architectures: amd64
+ key_url: "http://apt-mk.mirantis.com/public.gpg"
+ gpgkeys:
+ - A76882D3
+ publisher:
+ component: oc31
+ distributions:
+ - ubuntu-xenial/${_param:apt_mk_version}
+ mcp_opencontrail_xenial_oc32:
+ source: http://apt-mk.mirantis.com/xenial/
+ distribution: ${_param:apt_mk_version}
+ components: oc32
+ architectures: amd64
+ key_url: "http://apt-mk.mirantis.com/public.gpg"
+ gpgkeys:
+ - A76882D3
+ publisher:
+ component: oc32
+ distributions:
+ - ubuntu-xenial/${_param:apt_mk_version}
+ mcp_opencontrail_xenial_oc303:
+ source: http://apt-mk.mirantis.com/xenial/
+ distribution: ${_param:apt_mk_version}
+ components: oc303
+ architectures: amd64
+ key_url: "http://apt-mk.mirantis.com/public.gpg"
+ gpgkeys:
+ - A76882D3
+ publisher:
+ component: oc303
+ distributions:
+ - ubuntu-xenial/${_param:apt_mk_version}
+ mirantis_openstack_xenial_extra:
+ source: http://apt-mk.mirantis.com/xenial/
+ distribution: ${_param:apt_mk_version}
+ components: extra
+ architectures: amd64
+ key_url: "http://apt-mk.mirantis.com/public.gpg"
+ gpgkeys:
+ - A76882D3
+ publisher:
+ component: extra
+ distributions:
+ - ubuntu-xenial/${_param:apt_mk_version}
+ mirantis_openstack_xenial_salt:
+ source: http://apt-mk.mirantis.com/xenial/
+ distribution: ${_param:apt_mk_version}
+ components: salt
+ architectures: amd64
+ key_url: "http://apt-mk.mirantis.com/public.gpg"
+ gpgkeys:
+ - A76882D3
+ publisher:
+ component: salt
+ distributions:
+ - ubuntu-xenial/${_param:apt_mk_version}
diff --git a/aptly/server/mirror/ubuntu/xenial/mcp/openstack.yml b/aptly/server/mirror/ubuntu/xenial/mcp/openstack.yml
new file mode 100644
index 0000000..0d07f5a
--- /dev/null
+++ b/aptly/server/mirror/ubuntu/xenial/mcp/openstack.yml
@@ -0,0 +1,74 @@
+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}
+ 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"
+ gpgkeys:
+ - 1FA22B08
+ publisher:
+ component: main
+ distributions:
+ - ubuntu-xenial/mitaka
+
+ mirantis_openstack_hotfix_xenial:
+ source: http://mirror.fuel-infra.org/mcp-repos/${_param:mcp_repo_version}/${_param:linux_system_codename}
+ 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"
+ gpgkeys:
+ - 1FA22B08
+ publisher:
+ component: main
+ distributions:
+ - ubuntu-xenial/mitaka-hotfix
+
+ mirantis_openstack_security_xenial:
+ source: http://mirror.fuel-infra.org/mcp-repos/${_param:mcp_repo_version}/${_param:linux_system_codename}
+ 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"
+ gpgkeys:
+ - 1FA22B08
+ publisher:
+ component: main
+ distributions:
+ - ubuntu-xenial/mitaka-security
+
+ # 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}
+ 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"
+ gpgkeys:
+ - 1FA22B08
+ publisher:
+ component: main
+ distributions:
+ - ubuntu-xenial/mitaka-updates
+
+ # required for salt formulas
+ mirantis_openstack_holdback_xenial:
+ source: http://mirror.fuel-infra.org/mcp-repos/${_param:mcp_repo_version}/${_param:linux_system_codename}
+ 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"
+ gpgkeys:
+ - 1FA22B08
+ publisher:
+ component: main
+ distributions:
+ - ubuntu-xenial/mitaka-holdback
+
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/manager.yml b/docker/swarm/manager.yml
index 36f5bcb..25a7fbe 100644
--- a/docker/swarm/manager.yml
+++ b/docker/swarm/manager.yml
@@ -1,4 +1,8 @@
+classes:
+ - system.docker.swarm.network.gwbridge
parameters:
+ _param:
+ docker_gwbridge_subnet: 10.20.0.0/16
docker:
swarm:
role: manager
diff --git a/docker/swarm/master.yml b/docker/swarm/master.yml
index bb2d83b..fba9af3 100644
--- a/docker/swarm/master.yml
+++ b/docker/swarm/master.yml
@@ -1,4 +1,8 @@
+classes:
+ - system.docker.swarm.network.gwbridge
parameters:
+ _param:
+ docker_gwbridge_subnet: 10.20.0.0/16
docker:
swarm:
role: master
diff --git a/docker/swarm/network/gwbridge.yml b/docker/swarm/network/gwbridge.yml
new file mode 100644
index 0000000..8208d3d
--- /dev/null
+++ b/docker/swarm/network/gwbridge.yml
@@ -0,0 +1,10 @@
+parameters:
+ docker:
+ swarm:
+ network:
+ docker_gwbridge:
+ subnet: ${_param:docker_gwbridge_subnet}
+ opt:
+ com.docker.network.bridge.name: docker_gwbridge
+ com.docker.network.bridge.enable_icc: false
+ com.docker.network.bridge.enable_ip_masquerade: true
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/openldap.yml b/docker/swarm/service/openldap.yml
index e390772..863144c 100644
--- a/docker/swarm/service/openldap.yml
+++ b/docker/swarm/service/openldap.yml
@@ -1,6 +1,6 @@
parameters:
_param:
- docker_image_openldap: osixia/openldap:1.1.7
+ docker_image_openldap: osixia/openldap:1.1.8
docker:
client:
service:
@@ -10,19 +10,24 @@
restart:
condition: any
image: ${_param:docker_image_openldap}
+ hostname: ldap01.${_param:openldap_domain}
+ hosts:
+ ldap01:
+ name: ldap01.${_param:openldap_domain}
+ address: 127.0.0.1
environment:
- HOSTNAME: ldap01.${_param:cluster_public_host}
+ HOSTNAME: ldap01.${_param:openldap_domain}
LDAP_ORGANISATION: "${_param:openldap_organisation}"
LDAP_DOMAIN: "${_param:openldap_domain}"
LDAP_ADMIN_PASSWORD: ${_param:openldap_admin_password}
LDAP_CONFIG_PASSWORD: ${_param:openldap_config_password}
- LDAP_READONLY_USER: true
+ LDAP_READONLY_USER: "true"
LDAP_READONLY_USER_USERNAME: readonly
LDAP_READONLY_USER_PASSWORD: ${_param:openldap_readonly_password}
- LDAP_TLS: false
+ LDAP_TLS: "false"
ports:
- - 389:389
- - 636:636
+ - 1389:389
+ - 1636:636
volume:
database:
type: bind
diff --git a/docker/swarm/service/phpldapadmin.yml b/docker/swarm/service/phpldapadmin.yml
new file mode 100644
index 0000000..fadf714
--- /dev/null
+++ b/docker/swarm/service/phpldapadmin.yml
@@ -0,0 +1,21 @@
+parameters:
+ _param:
+ docker_image_phpldapadmin: osixia/phpldapadmin:0.6.12
+ docker:
+ client:
+ service:
+ phpldapadmin:
+ restart:
+ condition: any
+ image: ${_param:docker_image_phpldapadmin}
+ hosts:
+ ldap:
+ name: ldap.${_param:openldap_domain}
+ address: ${_param:cluster_vip_address}
+ environment:
+ PHPLDAPADMIN_LDAP_HOSTS: "#PYTHON2BASH:[{'ldap.${_param:openldap_domain}': [{'server': [{'tls': False}]},{'login': [{'bind_id': 'cn=admin,${_param:openldap_dn}'},{'bind_pass': '${_param:openldap_admin_password}'}]}]}]"
+ PHPLDAPADMIN_HTTPS: false
+ PHPLDAPADMIN_TRUST_PROXY_SSL: true
+ PHPLDAPADMIN_SERVER_ADMIN: ${_param:admin_email}
+ ports:
+ - 18089:80
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/docker/swarm/worker.yml b/docker/swarm/worker.yml
index acdb0cf..643b207 100644
--- a/docker/swarm/worker.yml
+++ b/docker/swarm/worker.yml
@@ -1,4 +1,8 @@
+classes:
+ - system.docker.swarm.network.gwbridge
parameters:
+ _param:
+ docker_gwbridge_subnet: 10.20.0.0/16
docker:
swarm:
role: worker
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/openldap.yml b/haproxy/proxy/listen/openldap.yml
new file mode 100644
index 0000000..b6f79a0
--- /dev/null
+++ b/haproxy/proxy/listen/openldap.yml
@@ -0,0 +1,46 @@
+parameters:
+ _param:
+ haproxy_openldap_bind_host: ${_param:haproxy_bind_address}
+ haproxy_openldap_bind_port: 389
+ haproxy_openldap_ssl_bind_port: 636
+ haproxy:
+ proxy:
+ listen:
+ openldap:
+ mode: tcp
+ balance: source
+ binds:
+ - address: ${_param:haproxy_openldap_bind_host}
+ port: ${_param:haproxy_openldap_bind_port}
+ servers:
+ - name: ${_param:cluster_node01_name}
+ host: ${_param:cluster_node01_address}
+ port: 1389
+ params: check
+ - name: ${_param:cluster_node02_name}
+ host: ${_param:cluster_node02_address}
+ port: 1389
+ params: backup check
+ - name: ${_param:cluster_node03_name}
+ host: ${_param:cluster_node03_address}
+ port: 1389
+ params: backup check
+ openldap_ssl:
+ mode: tcp
+ balance: source
+ binds:
+ - address: ${_param:haproxy_openldap_bind_host}
+ port: ${_param:haproxy_openldap_ssl_bind_port}
+ servers:
+ - name: ${_param:cluster_node01_name}
+ host: ${_param:cluster_node01_address}
+ port: 1636
+ params: check
+ - name: ${_param:cluster_node02_name}
+ host: ${_param:cluster_node02_address}
+ port: 1636
+ params: backup check
+ - name: ${_param:cluster_node03_name}
+ host: ${_param:cluster_node03_address}
+ port: 1636
+ params: backup check
diff --git a/haproxy/proxy/listen/openstack/murano.yml b/haproxy/proxy/listen/openstack/murano.yml
new file mode 100644
index 0000000..0427820
--- /dev/null
+++ b/haproxy/proxy/listen/openstack/murano.yml
@@ -0,0 +1,18 @@
+parameters:
+ haproxy:
+ proxy:
+ listen:
+ murano_api:
+ type: openstack-service
+ check: false
+ binds:
+ - address: ${_param:cluster_vip_address}
+ port: 8082
+ servers:
+ - name: ${_param:cluster_node01_hostname}
+ host: ${_param:cluster_node01_address}
+ port: 8082
+ params: check
+ - name: ${_param:cluster_node02_hostname}
+ host: ${_param:cluster_node02_address}
+ port: 8082
\ No newline at end of file
diff --git a/haproxy/proxy/listen/openstack/novnc.yml b/haproxy/proxy/listen/openstack/novnc.yml
index 9646651..78b7d98 100644
--- a/haproxy/proxy/listen/openstack/novnc.yml
+++ b/haproxy/proxy/listen/openstack/novnc.yml
@@ -5,7 +5,7 @@
nova_novnc:
type: general-service
service_name: http
- check: false
+ check: true
binds:
- address: ${_param:cluster_vip_address}
port: 6080
diff --git a/haproxy/proxy/listen/openstack/sahara.yml b/haproxy/proxy/listen/openstack/sahara.yml
new file mode 100644
index 0000000..3bbf809
--- /dev/null
+++ b/haproxy/proxy/listen/openstack/sahara.yml
@@ -0,0 +1,24 @@
+parameters:
+ haproxy:
+ proxy:
+ listen:
+ sahara_api:
+ type: openstack-service
+ options:
+ - httplog
+ binds:
+ - address: ${_param:cluster_vip_address}
+ port: 8386
+ servers:
+ - name: ctl01
+ host: ${_param:cluster_node01_address}
+ port: 8386
+ params: check inter 10s fastinter 2s downinter 3s rise 3 fall 3
+ - name: ctl02
+ host: ${_param:cluster_node02_address}
+ port: 8386
+ params: check inter 10s fastinter 2s downinter 3s rise 3 fall 3
+ - name: ctl03
+ host: ${_param:cluster_node03_address}
+ port: 8386
+ params: check inter 10s fastinter 2s downinter 3s rise 3 fall 3
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/haproxy/proxy/listen/phpldapadmin.yml b/haproxy/proxy/listen/phpldapadmin.yml
new file mode 100644
index 0000000..b2b7f93
--- /dev/null
+++ b/haproxy/proxy/listen/phpldapadmin.yml
@@ -0,0 +1,30 @@
+parameters:
+ _param:
+ haproxy_phpldapadmin_bind_host: ${_param:haproxy_bind_address}
+ haproxy_phpldapadmin_bind_port: 8089
+ haproxy:
+ proxy:
+ listen:
+ phpldapadmin:
+ mode: http
+ options:
+ - forwardfor
+ - httpclose
+ - httplog
+ balance: source
+ binds:
+ - address: ${_param:haproxy_phpldapadmin_bind_host}
+ port: ${_param:haproxy_phpldapadmin_bind_port}
+ servers:
+ - name: ${_param:cluster_node01_name}
+ host: ${_param:cluster_node01_address}
+ port: 18089
+ params: check
+ - name: ${_param:cluster_node02_name}
+ host: ${_param:cluster_node02_address}
+ port: 18089
+ params: backup check
+ - name: ${_param:cluster_node03_name}
+ host: ${_param:cluster_node03_address}
+ port: 18089
+ 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/jenkins/client/approved_scripts.yml b/jenkins/client/approved_scripts.yml
new file mode 100644
index 0000000..3be23f3
--- /dev/null
+++ b/jenkins/client/approved_scripts.yml
@@ -0,0 +1,89 @@
+parameters:
+ jenkins:
+ client:
+ approved_scripts:
+ - field java.lang.String value
+ - field java.util.ArrayList size
+ - method com.cloudbees.jenkins.plugins.sshcredentials.SSHUserPrivateKey getPrivateKey
+ - method com.cloudbees.plugins.credentials.common.IdCredentials getId
+ - method com.cloudbees.plugins.credentials.common.PasswordCredentials getPassword
+ - method com.cloudbees.plugins.credentials.common.UsernameCredentials getUsername
+ - method groovy.json.JsonBuilder toPrettyString
+ - method groovy.json.JsonSlurperClassic parseText java.lang.String
+ - method groovy.lang.GString getBytes
+ - method groovy.lang.GroovyObject getProperty java.lang.String
+ - method hudson.PluginManager getPlugins
+ - method hudson.PluginWrapper getShortName
+ - method hudson.model.Item getName
+ - method hudson.model.ItemGroup getItem java.lang.String
+ - method hudson.model.ItemGroup getItems
+ - method hudson.model.Job getBuilds
+ - method hudson.model.Job getLastBuild
+ - method hudson.model.Run getEnvironment
+ - method hudson.model.Run getResult
+ - method hudson.model.Run getTimeInMillis
+ - method hudson.model.Run isBuilding
+ - method java.io.File getAbsolutePath
+ - method java.io.File getName
+ - method java.io.File getParent
+ - method java.io.Writer write java.lang.String
+ - method java.lang.AutoCloseable close
+ - method java.lang.Class isInstance java.lang.Object
+ - method java.lang.Iterable iterator
+ - method java.net.HttpURLConnection getResponseCode
+ - method java.net.HttpURLConnection setRequestMethod java.lang.String
+ - method java.net.URI getHost
+ - method java.net.URI getPort
+ - method java.net.URL openConnection
+ - method java.net.URLConnection getHeaderField java.lang.String
+ - method java.net.URLConnection getInputStream
+ - method java.net.URLConnection getOutputStream
+ - method java.net.URLConnection setDoOutput boolean
+ - method java.net.URLConnection setRequestProperty java.lang.String java.lang.String
+ - method java.util.Collection remove java.lang.Object
+ - method java.util.LinkedHashMap$LinkedHashIterator hasNext
+ - method java.util.List subList int int
+ - method java.util.Map remove java.lang.Object
+ - method java.util.Map size
+ - method java.util.regex.MatchResult group int
+ - method java.util.regex.Matcher matches
+ - method java.util.regex.Pattern matcher java.lang.CharSequence
+ - method jenkins.model.Jenkins getPluginManager
+ - method org.jenkinsci.plugins.workflow.job.WorkflowRun doStop
+ - method org.jenkinsci.plugins.workflow.support.steps.build.RunWrapper build
+ - new groovy.json.JsonBuilder java.lang.Object
+ - new groovy.json.JsonSlurperClassic
+ - new java.io.File java.lang.String
+ - new java.io.OutputStreamWriter java.io.OutputStream
+ - new java.lang.Exception java.lang.String
+ - new java.lang.InterruptedException
+ - new java.net.URI java.lang.String
+ - new java.util.Date
+ - staticField groovy.io.FileType FILES
+ - staticMethod com.cloudbees.plugins.credentials.CredentialsProvider lookupCredentials java.lang.Class hudson.model.ItemGroup
+ - staticMethod java.lang.Integer valueOf java.lang.String
+ - staticMethod java.lang.String format java.lang.String java.lang.Object[]
+ - staticMethod java.lang.System exit int
+ - staticMethod java.lang.System getProperty java.lang.String
+ - staticMethod java.lang.System getenv java.lang.String
+ - staticMethod java.util.regex.Pattern quote java.lang.String
+ - staticMethod jenkins.model.Jenkins getInstance
+ - staticMethod org.codehaus.groovy.runtime.DefaultGroovyMethods collect java.util.Map groovy.lang.Closure
+ - staticMethod org.codehaus.groovy.runtime.DefaultGroovyMethods eachFile java.io.File groovy.io.FileType groovy.lang.Closure
+ - staticMethod org.codehaus.groovy.runtime.DefaultGroovyMethods find java.util.Collection groovy.lang.Closure
+ - staticMethod org.codehaus.groovy.runtime.DefaultGroovyMethods findAll java.util.List groovy.lang.Closure
+ - staticMethod org.codehaus.groovy.runtime.DefaultGroovyMethods get java.util.Map java.lang.Object java.lang.Object
+ - staticMethod org.codehaus.groovy.runtime.DefaultGroovyMethods getAt java.lang.Iterable int
+ - staticMethod org.codehaus.groovy.runtime.DefaultGroovyMethods getAt java.lang.String int
+ - staticMethod org.codehaus.groovy.runtime.DefaultGroovyMethods getBytes java.io.File
+ - staticMethod org.codehaus.groovy.runtime.DefaultGroovyMethods getText java.io.InputStream
+ - staticMethod org.codehaus.groovy.runtime.DefaultGroovyMethods hasProperty java.lang.Object java.lang.String
+ - staticMethod org.codehaus.groovy.runtime.DefaultGroovyMethods iterator java.lang.Object
+ - staticMethod org.codehaus.groovy.runtime.DefaultGroovyMethods iterator java.lang.Object[]
+ - staticMethod org.codehaus.groovy.runtime.DefaultGroovyMethods plus java.util.List java.lang.Iterable
+ - staticMethod org.codehaus.groovy.runtime.DefaultGroovyMethods plus java.util.List java.lang.Object
+ - staticMethod org.codehaus.groovy.runtime.DefaultGroovyMethods plus java.util.List java.util.Collection
+ - staticMethod org.codehaus.groovy.runtime.DefaultGroovyMethods println java.lang.Object java.lang.Object
+ - staticMethod org.codehaus.groovy.runtime.DefaultGroovyMethods putAt java.lang.Object java.lang.String java.lang.Object
+ - staticMethod org.codehaus.groovy.runtime.EncodingGroovyMethods encodeBase64 byte[]
+ - staticMethod org.codehaus.groovy.runtime.ScriptBytecodeAdapter bitwiseNegate java.lang.Object
diff --git a/jenkins/client/init.yml b/jenkins/client/init.yml
index aac50e9..41e639d 100644
--- a/jenkins/client/init.yml
+++ b/jenkins/client/init.yml
@@ -1,6 +1,7 @@
classes:
- service.jenkins.support
- service.jenkins.client
+ - system.jenkins.client.approved_scripts
parameters:
_param:
jenkins_client_user: none
@@ -44,88 +45,3 @@
enabled: true
url: ${_param:jenkins_gerrit_url}/mcp-ci/pipeline-library
credential_id: gerrit
- approved_scripts:
- - field java.lang.String value
- - field java.util.ArrayList size
- - method com.cloudbees.jenkins.plugins.sshcredentials.SSHUserPrivateKey getPrivateKey
- - method com.cloudbees.plugins.credentials.common.IdCredentials getId
- - method com.cloudbees.plugins.credentials.common.PasswordCredentials getPassword
- - method com.cloudbees.plugins.credentials.common.UsernameCredentials getUsername
- - method groovy.json.JsonBuilder toPrettyString
- - method groovy.json.JsonSlurperClassic parseText java.lang.String
- - method groovy.lang.GString getBytes
- - method groovy.lang.GroovyObject getProperty java.lang.String
- - method hudson.model.Run getEnvironment
- - method java.io.File getAbsolutePath
- - method java.io.File getName
- - method java.io.File getParent
- - method java.io.Writer write java.lang.String
- - method java.lang.AutoCloseable close
- - method java.lang.Class isInstance java.lang.Object
- - method java.lang.Iterable iterator
- - method java.net.HttpURLConnection getResponseCode
- - method java.net.HttpURLConnection setRequestMethod java.lang.String
- - method java.net.URI getHost
- - method java.net.URI getPort
- - method java.net.URL openConnection
- - method java.net.URLConnection getHeaderField java.lang.String
- - method java.net.URLConnection getInputStream
- - method java.net.URLConnection getOutputStream
- - method java.net.URLConnection setDoOutput boolean
- - method java.net.URLConnection setRequestProperty java.lang.String java.lang.String
- - method java.util.LinkedHashMap$LinkedHashIterator hasNext
- - method java.util.Map size
- - method java.util.regex.MatchResult group int
- - method java.util.regex.Matcher matches
- - method java.util.regex.Pattern matcher java.lang.CharSequence
- - method org.jenkinsci.plugins.workflow.job.WorkflowRun doStop
- - method org.jenkinsci.plugins.workflow.support.steps.build.RunWrapper build
- - new groovy.json.JsonBuilder java.lang.Object
- - new groovy.json.JsonSlurperClassic
- - new java.io.File java.lang.String
- - new java.io.OutputStreamWriter java.io.OutputStream
- - new java.lang.Exception java.lang.String
- - new java.lang.InterruptedException
- - new java.net.URI java.lang.String
- - new java.util.Date
- - staticField groovy.io.FileType FILES
- - staticMethod com.cloudbees.plugins.credentials.CredentialsProvider lookupCredentials java.lang.Class hudson.model.ItemGroup
- - staticMethod java.lang.System getenv java.lang.String
- - staticMethod jenkins.model.Jenkins getInstance
- - staticMethod org.codehaus.groovy.runtime.DefaultGroovyMethods collect java.util.Map groovy.lang.Closure
- - staticMethod org.codehaus.groovy.runtime.DefaultGroovyMethods eachFile java.io.File groovy.io.FileType groovy.lang.Closure
- - staticMethod org.codehaus.groovy.runtime.DefaultGroovyMethods get java.util.Map java.lang.Object java.lang.Object
- - staticMethod org.codehaus.groovy.runtime.DefaultGroovyMethods getAt java.lang.Iterable int
- - staticMethod org.codehaus.groovy.runtime.DefaultGroovyMethods getAt java.lang.String int
- - staticMethod org.codehaus.groovy.runtime.DefaultGroovyMethods getBytes java.io.File
- - staticMethod org.codehaus.groovy.runtime.DefaultGroovyMethods getText java.io.InputStream
- - staticMethod org.codehaus.groovy.runtime.DefaultGroovyMethods hasProperty java.lang.Object java.lang.String
- - staticMethod org.codehaus.groovy.runtime.DefaultGroovyMethods iterator java.lang.Object
- - staticMethod org.codehaus.groovy.runtime.DefaultGroovyMethods iterator java.lang.Object[]
- - staticMethod org.codehaus.groovy.runtime.DefaultGroovyMethods plus java.util.List java.lang.Iterable
- - staticMethod org.codehaus.groovy.runtime.DefaultGroovyMethods plus java.util.List java.lang.Object
- - staticMethod org.codehaus.groovy.runtime.DefaultGroovyMethods plus java.util.List java.util.Collection
- - staticMethod org.codehaus.groovy.runtime.DefaultGroovyMethods putAt java.lang.Object java.lang.String java.lang.Object
- - staticMethod org.codehaus.groovy.runtime.EncodingGroovyMethods encodeBase64 byte[]
- - staticMethod org.codehaus.groovy.runtime.ScriptBytecodeAdapter bitwiseNegate java.lang.Object
- - staticMethod org.codehaus.groovy.runtime.DefaultGroovyMethods println java.lang.Object java.lang.Object
- - method hudson.PluginWrapper getShortName
- - method hudson.PluginManager getPlugins
- - method jenkins.model.Jenkins getPluginManager
- - method hudson.model.ItemGroup getItem java.lang.String
- - method hudson.model.Job getLastBuild
- - method hudson.model.Run getResult
- - method hudson.model.Job getBuilds
- - staticMethod java.lang.String format java.lang.String java.lang.Object[]
- - staticMethod java.util.regex.Pattern quote java.lang.String
- - staticMethod org.codehaus.groovy.runtime.DefaultGroovyMethods findAll java.util.List groovy.lang.Closure
- - staticMethod org.codehaus.groovy.runtime.DefaultGroovyMethods find java.util.Collection groovy.lang.Closure
- - method java.util.Collection remove java.lang.Object
- - staticMethod java.lang.System exit int
- - method hudson.model.ItemGroup getItems
- - method hudson.model.Item getName
- - method java.util.Map remove java.lang.Object
- - staticMethod java.lang.System getProperty java.lang.String
- - staticMethod java.lang.Integer valueOf java.lang.String
- - method java.util.List subList int int
-
diff --git a/jenkins/client/job/debian/packages/horizon/modules.yml b/jenkins/client/job/debian/packages/horizon/modules.yml
index 30d7c64..2b6477b 100644
--- a/jenkins/client/job/debian/packages/horizon/modules.yml
+++ b/jenkins/client/job/debian/packages/horizon/modules.yml
@@ -17,6 +17,18 @@
dist: xenial
os_version: mitaka
branch: master
+ # Trusty
+ - name: horizon-contrail-panels
+ os: ubuntu
+ dist: trusty
+ os_version: mitaka
+ branch: stable/mitaka
+ # Xenial
+ - name: horizon-contrail-panels
+ os: ubuntu
+ dist: xenial
+ os_version: mitaka
+ branch: stable/mitaka
template:
discard:
build:
diff --git a/jenkins/client/job/debian/packages/salt.yml b/jenkins/client/job/debian/packages/salt.yml
index 5375d60..730eeba 100644
--- a/jenkins/client/job/debian/packages/salt.yml
+++ b/jenkins/client/job/debian/packages/salt.yml
@@ -9,6 +9,8 @@
dist: trusty
- name: apache
dist: trusty
+ - name: aptcacher
+ dist: trusty
- name: aptly
dist: trusty
- name: artifactory
@@ -39,6 +41,8 @@
dist: trusty
- name: dekapod
dist: trusty
+ - name: devops-portal
+ dist: trusty
- name: docker
dist: trusty
- name: dovecot
@@ -179,6 +183,8 @@
dist: xenial
- name: apache
dist: xenial
+ - name: aptcacher
+ dist: xenial
- name: aptly
dist: xenial
- name: artifactory
@@ -209,6 +215,8 @@
dist: xenial
- name: dekapod
dist: xenial
+ - name: devops-portal
+ dist: xenial
- name: docker
dist: xenial
- name: dovecot
diff --git a/jenkins/client/job/deploy/lab/mk/init.yml b/jenkins/client/job/deploy/lab/mk/init.yml
index 7da9149..bf58f39 100644
--- a/jenkins/client/job/deploy/lab/mk/init.yml
+++ b/jenkins/client/job/deploy/lab/mk/init.yml
@@ -1,7 +1,6 @@
parameters:
_param:
jenkins_deploy_lab_mk_jobs: []
- jenkins_salt_api_url: "http://${_param:salt_master_host}:6969"
jenkins:
client:
job_template:
@@ -70,7 +69,7 @@
default: "salt-qa-credentials"
SALT_MASTER_URL:
type: string
- default: "${_param:jenkins_salt_api_url}"
+ default: ""
# openstack api
OPENSTACK_API_URL:
@@ -102,3 +101,7 @@
type: string
default: "sandbox-docker-prod-local.docker.mirantis.net/mirantis/rally_tempest:0.1"
+ ASK_ON_ERROR:
+ type: boolean
+ default: 'false'
+
diff --git a/jenkins/client/job/deploy/openstack.yml b/jenkins/client/job/deploy/openstack.yml
index 48de021..644b16b 100644
--- a/jenkins/client/job/deploy/openstack.yml
+++ b/jenkins/client/job/deploy/openstack.yml
@@ -31,3 +31,6 @@
SALT_MASTER_URL:
type: string
default: ""
+ ASK_ON_ERROR:
+ type: boolean
+ default: 'false'
diff --git a/jenkins/client/job/opencontrail/build/generic.yml b/jenkins/client/job/opencontrail/build/generic.yml
index e994323..7516354 100644
--- a/jenkins/client/job/opencontrail/build/generic.yml
+++ b/jenkins/client/job/opencontrail/build/generic.yml
@@ -64,67 +64,6 @@
credentials: "gerrit"
github:
url: https://github.com/Mirantis/ccp-contrail-pipeline
- trigger:
- gerrit:
- project:
- contrail/contrail-pipeline:
- branches:
- - "{{branch}}"
- contrail/contrail-build:
- branches:
- - "{{branch}}"
- contrail/contrail-controller:
- branches:
- - "{{branch}}"
- contrail/contrail-vrouter:
- branches:
- - "{{branch}}"
- contrail/contrail-third-party:
- branches:
- - "{{branch}}"
- contrail/contrail-generateDS:
- branches:
- - "{{branch}}"
- contrail/contrail-sandesh:
- branches:
- - "{{branch}}"
- contrail/contrail-packages:
- branches:
- - "{{branch}}"
- contrail/contrail-nova-vif-driver:
- branches:
- - "{{branch}}"
- contrail/contrail-neutron-plugin:
- branches:
- - "{{branch}}"
- contrail/contrail-nova-extensions:
- branches:
- - "{{branch}}"
- contrail/contrail-heat:
- branches:
- - "{{branch}}"
- contrail/contrail-web-storage:
- branches:
- - "{{branch}}"
- contrail/contrail-web-server-manager:
- branches:
- - "{{branch}}"
- contrail/contrail-web-controller:
- branches:
- - "{{branch}}"
- contrail/contrail-web-core:
- branches:
- - "{{branch}}"
- contrail/contrail-webui-third-party:
- branches:
- - "{{branch}}"
- message:
- build_successful: "Build successful"
- build_unstable: "Build unstable"
- build_failure: "Build failed"
- event:
- ref:
- - updated
param:
APTLY_URL:
type: string
diff --git a/jenkins/client/job/opencontrail/build/test.yml b/jenkins/client/job/opencontrail/build/test.yml
index 7b39b97..8183c3d 100644
--- a/jenkins/client/job/opencontrail/build/test.yml
+++ b/jenkins/client/job/opencontrail/build/test.yml
@@ -41,67 +41,6 @@
scm:
type: git
url: "https://github.com/chnyda/contrail-unittest"
- trigger:
- gerrit:
- project:
- contrail/contrail-pipeline:
- branches:
- - "{{branch}}"
- contrail/contrail-build:
- branches:
- - "{{branch}}"
- contrail/contrail-controller:
- branches:
- - "{{branch}}"
- contrail/contrail-vrouter:
- branches:
- - "{{branch}}"
- contrail/contrail-third-party:
- branches:
- - "{{branch}}"
- contrail/contrail-generateDS:
- branches:
- - "{{branch}}"
- contrail/contrail-sandesh:
- branches:
- - "{{branch}}"
- contrail/contrail-packages:
- branches:
- - "{{branch}}"
- contrail/contrail-nova-vif-driver:
- branches:
- - "{{branch}}"
- contrail/contrail-neutron-plugin:
- branches:
- - "{{branch}}"
- contrail/contrail-nova-extensions:
- branches:
- - "{{branch}}"
- contrail/contrail-heat:
- branches:
- - "{{branch}}"
- contrail/contrail-web-storage:
- branches:
- - "{{branch}}"
- contrail/contrail-web-server-manager:
- branches:
- - "{{branch}}"
- contrail/contrail-web-controller:
- branches:
- - "{{branch}}"
- contrail/contrail-web-core:
- branches:
- - "{{branch}}"
- contrail/contrail-webui-third-party:
- branches:
- - "{{branch}}"
- message:
- build_successful: "Build successful"
- build_unstable: "Build unstable"
- build_failure: "Build failed"
- event:
- ref:
- - updated
param:
SOURCE_URL:
type: string
diff --git a/jenkins/client/job/salt-formulas/git-mirrors/2way.yml b/jenkins/client/job/salt-formulas/git-mirrors/2way.yml
index 207ae6b..88a8ef9 100644
--- a/jenkins/client/job/salt-formulas/git-mirrors/2way.yml
+++ b/jenkins/client/job/salt-formulas/git-mirrors/2way.yml
@@ -9,6 +9,7 @@
jobs:
- name: aodh
- name: apache
+ - name: aptcacher
- name: aptly
- name: artifactory
- name: backupninja
@@ -26,6 +27,7 @@
- name: cinder
- name: collectd
- name: dekapod
+ - name: devops-portal
- name: docker
- name: dovecot
- name: elasticsearch
diff --git a/jenkins/client/job/salt-formulas/tests.yml b/jenkins/client/job/salt-formulas/tests.yml
index 6988392..27932bc 100644
--- a/jenkins/client/job/salt-formulas/tests.yml
+++ b/jenkins/client/job/salt-formulas/tests.yml
@@ -7,6 +7,7 @@
jobs:
- name: aodh
- name: apache
+ - name: aptcacher
- name: aptly
- name: artifactory
- name: backupninja
@@ -24,6 +25,7 @@
- name: cinder
- name: collectd
- name: dekapod
+ - name: devops-portal
- name: docker
- name: dovecot
- name: elasticsearch
diff --git a/jenkins/client/job/salt-models/generate.yml b/jenkins/client/job/salt-models/generate.yml
new file mode 100644
index 0000000..dc539e8
--- /dev/null
+++ b/jenkins/client/job/salt-models/generate.yml
@@ -0,0 +1,58 @@
+parameters:
+ jenkins:
+ client:
+ job_template:
+ generate_reclass_clusters:
+ name: generate_reclass_cluster_{{cookiecutter_template}}
+ param:
+ cookiecutter_template:
+ - separated_products
+ template:
+ type: workflow-scm
+ concurrent: true
+ display_name: "[MCP] Generate reclass cluster {{cookiecutter_template}}"
+ scm:
+ type: git
+ url: ${_param:jenkins_job_repository}
+ credentials: "gitlab"
+ script: metadata/cookiecutter_generate.groovy
+ param:
+ COOKIECUTTER_TEMPLATE_URL:
+ type: string
+ default: "git@github.com:Mirantis/mk2x-cookiecutter-reclass-model.git"
+ COOKIECUTTER_TEMPLATE_CREDENTIALS:
+ type: string
+ default: jenkins
+ COOKIECUTTER_TEMPLATE_BRANCH:
+ type: string
+ default: master
+# COOKIECUTTER_TEMPLATE_PATH:
+# type: string
+# default: 'cluster/{{cookiecutter_template}}'
+ COOKIECUTTER_INSTALL_CICD:
+ type: boolean
+ default: false
+ COOKIECUTTER_INSTALL_CONTRAIL:
+ type: boolean
+ default: false
+ COOKIECUTTER_INSTALL_KUBERNETES:
+ type: boolean
+ default: false
+ COOKIECUTTER_INSTALL_OPENSTACK:
+ type: boolean
+ default: false
+ COOKIECUTTER_INSTALL_STACKLIGHT:
+ type: boolean
+ default: false
+ COOKIECUTTER_TEMPLATE_CONTEXT:
+ type: string
+ RECLASS_MODEL_URL:
+ type: string
+ default: "
+ ssh://jenkins@gerrit.mcp.mirantis.net:29418/salt-models/training"
+ RECLASS_MODEL_CREDENTIALS:
+ type: string
+ default: jenkins_slave
+ RECLASS_MODEL_BRANCH:
+ type: string
+ default: master
diff --git a/linux/system/repo/mcp/openstack.yml b/linux/system/repo/mcp/openstack.yml
index 372caf0..67c9cad 100644
--- a/linux/system/repo/mcp/openstack.yml
+++ b/linux/system/repo/mcp/openstack.yml
@@ -1,6 +1,7 @@
parameters:
_param:
mcp_repo_version: 1.0
+ apt_mk_version: stable
linux:
system:
repo:
@@ -24,3 +25,8 @@
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"
+ 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"
+
diff --git a/linux/system/repo/mos9.yml b/linux/system/repo/mos9.yml
index 9bc7c8c..3a3abe1 100644
--- a/linux/system/repo/mos9.yml
+++ b/linux/system/repo/mos9.yml
@@ -6,15 +6,27 @@
source: "deb http://mirror.fuel-infra.org/mos-repos/ubuntu/9.0/ mos9.0 main restricted"
architectures: amd64
key_url: "http://mirror.fuel-infra.org/mos-repos/ubuntu/9.0/archive-mos9.0.key"
+# - pin: 'release a=mos9.0'
+# priority: 1100
+# package: '*'
mirantis_openstack_hotfix:
source: "deb http://mirror.fuel-infra.org/mos-repos/ubuntu/9.0/ mos9.0-hotfix main restricted"
architectures: amd64
key_url: "http://mirror.fuel-infra.org/mos-repos/ubuntu/9.0/archive-mos9.0.key"
+# - pin: 'release a=mos9.0-hotfix'
+# priority: 1100
+# package: '*'
mirantis_openstack_security:
source: "deb http://mirror.fuel-infra.org/mos-repos/ubuntu/9.0/ mos9.0-security main restricted"
architectures: amd64
key_url: "http://mirror.fuel-infra.org/mos-repos/ubuntu/9.0/archive-mos9.0.key"
+# - pin: 'release a=mos9.0-security'
+# priority: 1100
+# package: '*'
mirantis_openstack_updates:
source: "deb http://mirror.fuel-infra.org/mos-repos/ubuntu/9.0/ mos9.0-updates main restricted"
architectures: amd64
key_url: "http://mirror.fuel-infra.org/mos-repos/ubuntu/9.0/archive-mos9.0.key"
+# - pin: 'release a=mos9.0-updates'
+# priority: 1100
+# package: '*'
diff --git a/linux/system/repo_local/contrail.yml b/linux/system/repo_local/contrail.yml
index c78e68c..902c4d5 100644
--- a/linux/system/repo_local/contrail.yml
+++ b/linux/system/repo_local/contrail.yml
@@ -8,6 +8,6 @@
refresh_db: ${_param:linux_repo_refresh_db}
source: "deb [arch=amd64] http://${_param:local_repo_url}/contrail trusty main"
pin:
- - pin: 'release l=Local Contrail APT repository'
+ - pin: 'release l=contrail ubuntu-trusty'
priority: ${_param:contrail_repo_pin_priority}
package: '*'
diff --git a/linux/system/repo_local/mcp/contrail.yml b/linux/system/repo_local/mcp/contrail.yml
new file mode 100644
index 0000000..158fda5
--- /dev/null
+++ b/linux/system/repo_local/mcp/contrail.yml
@@ -0,0 +1,13 @@
+parameters:
+ _param:
+ linux_repo_contrail_component: oc311
+ contrail_repo_pin_priority: 200
+ apt_mk_version: stable
+ linux:
+ system:
+ repo:
+ mcp_opencontrail_${_param:linux_repo_contrail_component}:
+ 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} ${_param:linux_repo_contrail_component}"
+ architectures: amd64
+ key_url: "http://${_param:local_repo_url}/public.gpg"
diff --git a/linux/system/repo_local/mcp/extra.yml b/linux/system/repo_local/mcp/extra.yml
new file mode 100644
index 0000000..67d85a5
--- /dev/null
+++ b/linux/system/repo_local/mcp/extra.yml
@@ -0,0 +1,12 @@
+parameters:
+ _param:
+ apt_mk_version: stable
+ linux:
+ system:
+ repo:
+ mcp_extra:
+ default: true
+ 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} extra"
+ architectures: amd64
+ key_url: "http://${_param:local_repo_url}/public.gpg"
\ No newline at end of file
diff --git a/linux/system/repo_local/mcp/openstack.yml b/linux/system/repo_local/mcp/openstack.yml
new file mode 100644
index 0000000..29329d1
--- /dev/null
+++ b/linux/system/repo_local/mcp/openstack.yml
@@ -0,0 +1,45 @@
+parameters:
+ linux:
+ system:
+ repo:
+ mirantis_openstack:
+ source: "deb [arch=amd64] http://${_param:local_repo_url}/ubuntu-${_param:linux_system_codename}/ ${_param:openstack_version} main"
+ architectures: amd64
+ key_url: "http://${_param:local_repo_url}/public.gpg"
+ pin:
+ - pin: 'release a=${_param:openstack_version}'
+ priority: 1100
+ package: '*'
+ mirantis_openstack_hotfix:
+ source: "deb [arch=amd64] http://${_param:local_repo_url}/ubuntu-${_param:linux_system_codename}/ ${_param:openstack_version}-hotfix main"
+ architectures: amd64
+ key_url: "http://${_param:local_repo_url}/public.gpg"
+ pin:
+ - pin: 'release a=m${_param:openstack_version}-hotfix'
+ priority: 1100
+ package: '*'
+ mirantis_openstack_security:
+ source: "deb [arch=amd64] http://${_param:local_repo_url}/ubuntu-${_param:linux_system_codename}/ ${_param:openstack_version}-security main"
+ architectures: amd64
+ key_url: "http://${_param:local_repo_url}/public.gpg"
+ pin:
+ - pin: 'release a=${_param:openstack_version}-security'
+ priority: 1100
+ package: '*'
+ mirantis_openstack_updates:
+ source: "deb [arch=amd64] http://${_param:local_repo_url}/ubuntu-${_param:linux_system_codename}/ ${_param:openstack_version}-updates main"
+ architectures: amd64
+ key_url: "http://${_param:local_repo_url}/public.gpg"
+ pin:
+ - pin: 'release a=${_param:openstack_version}-updates'
+ priority: 1100
+ package: '*'
+ mirantis_openstack_holdback:
+ refresh_db: ${_param:linux_repo_refresh_db}
+ source: "deb [arch=amd64] http://${_param:local_repo_url}/ubuntu-${_param:linux_system_codename}/ ${_param:openstack_version}-holdback main"
+ architectures: amd64
+ key_url: "http://${_param:local_repo_url}/public.gpg"
+ pin:
+ - pin: 'release a=${_param:openstack_version}-holdback'
+ priority: 1100
+ package: '*'
diff --git a/linux/system/repo_local/mcp/salt.yml b/linux/system/repo_local/mcp/salt.yml
new file mode 100644
index 0000000..3abbf92
--- /dev/null
+++ b/linux/system/repo_local/mcp/salt.yml
@@ -0,0 +1,11 @@
+parameters:
+ _param:
+ apt_mk_version: stable
+ linux:
+ system:
+ repo:
+ mcp_salt:
+ 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} salt"
+ architectures: amd64
+ key_url: "http://${_param:local_repo_url}/public.gpg"
\ No newline at end of file
diff --git a/linux/system/repo_local/mos8.yml b/linux/system/repo_local/mos8.yml
index 29c6636..ddefdb7 100644
--- a/linux/system/repo_local/mos8.yml
+++ b/linux/system/repo_local/mos8.yml
@@ -7,7 +7,7 @@
architectures: amd64
key_url: "http://${_param:local_repo_url}/public.gpg"
pin:
- - pin: 'release s=mos8.0'
+ - pin: 'release a=mos8.0'
priority: 1100
package: '*'
#mos8_openstack_hotfix:
@@ -15,7 +15,7 @@
# architectures: amd64
# key_url: "http://${_param:local_repo_url}/public.gpg"
# pin:
- # - pin: 'release s=mos8.0-hotfix'
+ # - pin: 'release a=mos8.0-hotfix'
# priority: 1100
# package: '*'
mos8_openstack_proposed:
@@ -23,7 +23,7 @@
architectures: amd64
key_url: "http://${_param:local_repo_url}/public.gpg"
pin:
- - pin: 'release s=mos8.0-proposed'
+ - pin: 'release a=mos8.0-proposed'
priority: 1100
package: '*'
#mos8_openstack_security:
@@ -31,7 +31,7 @@
# architectures: amd64
# key_url: "http://${_param:local_repo_url}/public.gpg"
# pin:
- # - pin: 'release s=mos8.0-security'
+ # - pin: 'release a=mos8.0-security'
# priority: 1100
# package: '*'
mos8_openstack_updates:
@@ -39,7 +39,7 @@
architectures: amd64
key_url: "http://${_param:local_repo_url}/public.gpg"
pin:
- - pin: 'release s=mos8.0-updates'
+ - pin: 'release a=mos8.0-updates'
priority: 1100
package: '*'
#mos8_murano:
@@ -48,6 +48,6 @@
# architectures: amd64
# key_url: "http://${_param:local_repo_url}/public.gpg"
# pin:
- # - pin: 'release s=mos8.0-proposed'
+ # - pin: 'release a=mos8.0-proposed'
# priority: 1100
- # package: '*'
\ No newline at end of file
+ # package: '*'
diff --git a/linux/system/repo_local/mos9.yml b/linux/system/repo_local/mos9.yml
index 6886185..5b6cdac 100644
--- a/linux/system/repo_local/mos9.yml
+++ b/linux/system/repo_local/mos9.yml
@@ -7,7 +7,7 @@
architectures: amd64
key_url: "http://${_param:local_repo_url}/public.gpg"
pin:
- - pin: 'release s=mos9.0'
+ - pin: 'release a=mos9.0'
priority: 1100
package: '*'
mos9_openstack_hotfix:
@@ -15,7 +15,7 @@
architectures: amd64
key_url: "http://${_param:local_repo_url}/public.gpg"
pin:
- - pin: 'release s=mos9.0-hotfix'
+ - pin: 'release a=mos9.0-hotfix'
priority: 1100
package: '*'
mos9_openstack_proposed:
@@ -23,7 +23,7 @@
architectures: amd64
key_url: "http://${_param:local_repo_url}/public.gpg"
pin:
- - pin: 'release s=mos9.0-proposed'
+ - pin: 'release a=mos9.0-proposed'
priority: 1100
package: '*'
mos9_openstack_security:
@@ -31,7 +31,7 @@
architectures: amd64
key_url: "http://${_param:local_repo_url}/public.gpg"
pin:
- - pin: 'release s=mos9.0-security'
+ - pin: 'release a=mos9.0-security'
priority: 1100
package: '*'
mos9_openstack_updates:
@@ -39,7 +39,7 @@
architectures: amd64
key_url: "http://${_param:local_repo_url}/public.gpg"
pin:
- - pin: 'release s=mos9.0-updates'
+ - pin: 'release a=mos9.0-updates'
priority: 1100
package: '*'
mos9_murano:
@@ -48,6 +48,6 @@
architectures: amd64
key_url: "http://${_param:local_repo_url}/public.gpg"
pin:
- - pin: 'release s=mos8.0-proposed'
+ - pin: 'release a=mos8.0-proposed'
priority: 1100
package: '*'
diff --git a/linux/system/repo_local/openstack.yml b/linux/system/repo_local/openstack.yml
index 4754d12..a873afb 100644
--- a/linux/system/repo_local/openstack.yml
+++ b/linux/system/repo_local/openstack.yml
@@ -10,7 +10,7 @@
architectures: amd64
key_url: "http://${_param:local_repo_url}/public.gpg"
pin:
- - pin: 'release s=mos8.0'
+ - pin: 'release a=mos8.0'
priority: 1000
package: '*'
mirantis_openstack_hotfix:
@@ -19,7 +19,7 @@
architectures: amd64
key_url: "http://${_param:local_repo_url}/public.gpg"
pin:
- - pin: 'release s=mos8.0-hotfix'
+ - pin: 'release a=mos8.0-hotfix'
priority: 1000
package: '*'
mirantis_openstack_proposed:
@@ -28,7 +28,7 @@
architectures: amd64
key_url: "http://${_param:local_repo_url}/public.gpg"
pin:
- - pin: 'release s=mos8.0-proposed'
+ - pin: 'release a=mos8.0-proposed'
priority: 1000
package: '*'
mirantis_openstack_security:
@@ -37,7 +37,7 @@
architectures: amd64
key_url: "http://${_param:local_repo_url}/public.gpg"
pin:
- - pin: 'release s=mos8.0-security'
+ - pin: 'release a=mos8.0-security'
priority: 1000
package: '*'
mirantis_openstack_updates:
@@ -46,6 +46,6 @@
architectures: amd64
key_url: "http://${_param:local_repo_url}/public.gpg"
pin:
- - pin: 'release s=mos8.0-updates'
+ - pin: 'release a=mos8.0-updates'
priority: 1000
package: '*'
diff --git a/murano/server/cluster.yml b/murano/server/cluster.yml
new file mode 100644
index 0000000..d698e7c
--- /dev/null
+++ b/murano/server/cluster.yml
@@ -0,0 +1,46 @@
+classes:
+- service.murano.server.cluster
+- service.keepalived.cluster.single
+- system.haproxy.proxy.listen.openstack.murano
+- service.rabbitmq.server.single
+parameters:
+ murano:
+ server:
+ enabled: true
+ version: ${_param:murano_version}
+ bind:
+ address: ${_param:single_address}
+ port: 8082
+ network:
+ external: ${_param:murano_external_network}
+ database:
+ engine: mysql
+ host: ${_param:openstack_database_address}
+ port: 3306
+ name: murano
+ user: murano
+ password: ${_param:mysql_murano_password}
+ identity:
+ engine: keystone
+ host: ${_param:openstack_control_address}
+ port: 35357
+ tenant: service
+ user: murano
+ password: ${_param:keystone_murano_password}
+ message_queue:
+ engine: rabbitmq
+ port: 5672
+ members:
+ - host: ${_param:openstack_messaging_queue_node01_address}
+ - host: ${_param:openstack_messaging_queue_node02_address}
+ - host: ${_param:openstack_messaging_queue_node03_address}
+ user: openstack
+ password: ${_param:rabbitmq_openstack_password}
+ virtual_host: '/openstack'
+ murano_agent_queue:
+ engine: rabbitmq
+ host: ${_param:openstack_proxy_address}
+ port: 5673
+ user: openstack
+ password: ${_param:rabbitmq_murano_agent_password}
+ virtual_host: '/catalog'
diff --git a/murano/server/single.yml b/murano/server/single.yml
new file mode 100644
index 0000000..c3da9f8
--- /dev/null
+++ b/murano/server/single.yml
@@ -0,0 +1,41 @@
+classes:
+- service.murano.server.single
+- service.rabbitmq.server.single
+parameters:
+ murano:
+ server:
+ enabled: true
+ version: ${_param:murano_version}
+ bind:
+ address: ${_param:single_address}
+ port: 8082
+ network:
+ external: ${_param:murano_external_network}
+ database:
+ engine: mysql
+ host: ${_param:openstack_database_address}
+ port: 3306
+ name: murano
+ user: murano
+ password: ${_param:mysql_murano_password}
+ identity:
+ engine: keystone
+ host: ${_param:openstack_control_address}
+ port: 35357
+ tenant: service
+ user: murano
+ password: ${_param:keystone_murano_password}
+ message_queue:
+ engine: rabbitmq
+ port: 5672
+ host: ${_param:cluster_vip_address}
+ user: openstack
+ password: ${_param:rabbitmq_openstack_password}
+ virtual_host: '/openstack'
+ murano_agent_queue:
+ engine: rabbitmq
+ host: ${_param:openstack_proxy_address}
+ port: 5673
+ user: openstack
+ password: ${_param:rabbitmq_murano_agent_password}
+ virtual_host: '/catalog'
diff --git a/mysql/client/database/murano.yml b/mysql/client/database/murano.yml
new file mode 100644
index 0000000..561ea3d
--- /dev/null
+++ b/mysql/client/database/murano.yml
@@ -0,0 +1,17 @@
+parameters:
+ mysql:
+ client:
+ server:
+ database:
+ database:
+ murano:
+ encoding: utf8
+ users:
+ - name: murano
+ password: ${_param:mysql_murano_password}
+ host: '%'
+ rights: all
+ - name: murano
+ password: ${_param:mysql_murano_password}
+ host: ${_param:single_address}
+ rights: all
\ No newline at end of file
diff --git a/mysql/client/database/sahara.yml b/mysql/client/database/sahara.yml
new file mode 100644
index 0000000..86497d8
--- /dev/null
+++ b/mysql/client/database/sahara.yml
@@ -0,0 +1,17 @@
+parameters:
+ mysql:
+ client:
+ server:
+ database:
+ database:
+ sahara:
+ encoding: utf8
+ users:
+ - name: sahara
+ password: ${_param:mysql_sahara_password}
+ host: '%'
+ rights: all
+ - name: sahara
+ password: ${_param:mysql_sahara_password}
+ host: ${_param:single_address}
+ rights: all
diff --git a/nginx/server/proxy/grafana_web.yml b/nginx/server/proxy/grafana_web.yml
index a1c7c49..66fa46b 100644
--- a/nginx/server/proxy/grafana_web.yml
+++ b/nginx/server/proxy/grafana_web.yml
@@ -1,18 +1,2 @@
-parameters:
- nginx:
- server:
- enabled: true
- site:
- nginx_proxy_grafana:
- enabled: true
- type: nginx_proxy
- name: grafana
- proxy:
- host: ${_param:stacklight_monitor_address}
- port: 3000
- protocol: http
- host:
- name: ${_param:cluster_public_host}
- port: 8084
- protocol: https
- ssl: ${_param:nginx_proxy_ssl}
+classes:
+- system.nginx.server.proxy.stacklight.grafana
diff --git a/nginx/server/proxy/kibana_web.yml b/nginx/server/proxy/kibana_web.yml
index 1120c9c..0f3f41e 100644
--- a/nginx/server/proxy/kibana_web.yml
+++ b/nginx/server/proxy/kibana_web.yml
@@ -1,18 +1,2 @@
-parameters:
- nginx:
- server:
- enabled: true
- site:
- nginx_proxy_kibana:
- enabled: true
- type: nginx_proxy
- name: kibana
- proxy:
- host: ${_param:stacklight_monitor_address}
- port: 5601
- protocol: http
- host:
- name: ${_param:cluster_public_host}
- port: 5601
- protocol: https
- ssl: ${_param:nginx_proxy_ssl}
+classes:
+- system.nginx.server.proxy.stacklight.kibana
diff --git a/nginx/server/proxy/nagios_web.yml b/nginx/server/proxy/nagios_web.yml
index 8b57929..919c74a 100644
--- a/nginx/server/proxy/nagios_web.yml
+++ b/nginx/server/proxy/nagios_web.yml
@@ -1,18 +1,2 @@
-parameters:
- nginx:
- server:
- enabled: true
- site:
- nginx_proxy_nagios:
- enabled: true
- type: nginx_proxy
- name: nagios
- proxy:
- host: ${_param:stacklight_monitor_address}
- port: 80
- protocol: http
- host:
- name: ${_param:cluster_public_host}
- port: 8001
- protocol: https
- ssl: ${_param:nginx_proxy_ssl}
+classes:
+- system.nginx.server.proxy.stacklight.nagios
diff --git a/nginx/server/proxy/openstack/murano.yml b/nginx/server/proxy/openstack/murano.yml
new file mode 100644
index 0000000..a93b07e
--- /dev/null
+++ b/nginx/server/proxy/openstack/murano.yml
@@ -0,0 +1,19 @@
+ parameters:
+ _param:
+ nginx_proxy_openstack_api_host: ${_param:cluster_public_host}
+ nginx:
+ server:
+ enabled: true
+ site:
+ nginx_proxy_openstack_api_murano:
+ enabled: true
+ type: nginx_proxy
+ name: openstack_api_murano
+ proxy:
+ host: ${_param:nginx_proxy_openstack_api_proxy_host}
+ port: 8082
+ protocol: http
+ host:
+ name: ${_param:nginx_proxy_openstack_api_host}
+ port: 8082
+ ssl: ${_param:nginx_proxy_ssl}
diff --git a/nginx/server/proxy/openstack/sahara.yml b/nginx/server/proxy/openstack/sahara.yml
new file mode 100644
index 0000000..17ae236
--- /dev/null
+++ b/nginx/server/proxy/openstack/sahara.yml
@@ -0,0 +1,17 @@
+parameters:
+ nginx:
+ server:
+ enabled: true
+ site:
+ nginx_proxy_openstack_api_sahara:
+ enabled: true
+ type: nginx_proxy
+ name: openstack_api_sahara
+ proxy:
+ host: ${_param:nginx_proxy_openstack_api_proxy_host}
+ port: 8386
+ protocol: http
+ host:
+ name: ${_param:nginx_proxy_openstack_api_host}
+ port: 8386
+ ssl: ${_param:nginx_proxy_ssl}
diff --git a/nova/compute/cluster.yml b/nova/compute/cluster.yml
index 7cb866b..f7b2ee5 100644
--- a/nova/compute/cluster.yml
+++ b/nova/compute/cluster.yml
@@ -2,7 +2,7 @@
- service.nova.compute.kvm
parameters:
_param:
- nova_vncproxy_url: http://${_param:cluster_vip_address}:6080
+ nova_vncproxy_url: https://${_param:cluster_public_host}:6080
nova_compute_virtualization: kvm
nova_compute_avail_zone:
nova_compute_ssh_public: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCltIn93BcTMzNK/n2eBze6PyTkmIgdDkeXNR9X4DqE48Va80ojv2pq8xuaBxiNITJzyl+4p4UvTTXo+HmuX8qbHvqgMGXvuPUCpndEfb2r67f6vpMqPwMgBrUg2ZKgN4OsSDHU+H0dia0cEaTjz5pvbUy9lIsSyhrqOUVF9reJq+boAvVEedm8fUqiZuiejAw2D27+rRtdEPgsKMnh3626YEsr963q4rjU/JssV/iKMNu7mk2a+koOrJ+aHvcVU8zJjfA0YghoeVT/I3GLU/MB/4tD/RyR8GM+UYbI4sgAC7ZOCdQyHdJgnEzx3SJIwcS65U0T2XYvn2qXHXqJ9iGZ root@mirantis.com
diff --git a/nova/compute/single.yml b/nova/compute/single.yml
index 130f2e4..f50b937 100644
--- a/nova/compute/single.yml
+++ b/nova/compute/single.yml
@@ -4,6 +4,7 @@
- service.nova.compute.kvm
parameters:
_param:
+ nova_vncproxy_url: https://${_param:cluster_public_host}:6080
nova_compute_ssh_public: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCltIn93BcTMzNK/n2eBze6PyTkmIgdDkeXNR9X4DqE48Va80ojv2pq8xuaBxiNITJzyl+4p4UvTTXo+HmuX8qbHvqgMGXvuPUCpndEfb2r67f6vpMqPwMgBrUg2ZKgN4OsSDHU+H0dia0cEaTjz5pvbUy9lIsSyhrqOUVF9reJq+boAvVEedm8fUqiZuiejAw2D27+rRtdEPgsKMnh3626YEsr963q4rjU/JssV/iKMNu7mk2a+koOrJ+aHvcVU8zJjfA0YghoeVT/I3GLU/MB/4tD/RyR8GM+UYbI4sgAC7ZOCdQyHdJgnEzx3SJIwcS65U0T2XYvn2qXHXqJ9iGZ root@mirantis.com
nova_compute_avail_zone:
nova_compute_ssh_private: |
@@ -46,7 +47,7 @@
enabled: true
virtualization: kvm
availability_zone: ${_param:nova_compute_avail_zone}
- vncproxy_url: http://${_param:control_address}:6080
+ vncproxy_url: ${_param:nova_vncproxy_url}
bind:
vnc_address: ${_param:control_address}
vnc_port: 6080
diff --git a/nova/compute/storage/ceph.yml b/nova/compute/storage/ceph.yml
index c271952..7cb24cb 100644
--- a/nova/compute/storage/ceph.yml
+++ b/nova/compute/storage/ceph.yml
@@ -6,5 +6,5 @@
ephemeral: yes
rbd_pool: ${_param:nova_storage_pool}
secret_uuid: ${_param:nova_storage_secret_uuid}
- client_cinder_key: ${_param:nova_storage_secret_uuid}
+ client_cinder_key: ${_param:nova_storage_client_key}
rbd_user: ${_param:nova_storage_user}
\ No newline at end of file
diff --git a/opencontrail/control/cluster.yml b/opencontrail/control/cluster.yml
index a7015d5..4ffe081 100644
--- a/opencontrail/control/cluster.yml
+++ b/opencontrail/control/cluster.yml
@@ -3,6 +3,7 @@
- service.keepalived.cluster.single
- service.opencontrail.control.cluster
- system.haproxy.proxy.listen.opencontrail.control
+- system.haproxy.proxy.listen.opencontrail.analytics
parameters:
# Temprorary fix for MOS9 packages to pin old version of kafka
linux:
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/openssh/server/team/tcpcloud.yml b/openssh/server/team/tcpcloud.yml
index 8b7073d..bdf29be 100644
--- a/openssh/server/team/tcpcloud.yml
+++ b/openssh/server/team/tcpcloud.yml
@@ -141,6 +141,12 @@
sudo: true
full_name: Sergey Matov
home: /home/smatov
+ dcech:
+ enabled: true
+ name: dcech
+ sudo: true
+ full_name: Daniel Cech
+ home: /home/dcech
group:
libvirtd:
enabled: true
@@ -259,6 +265,11 @@
public_keys:
- ${public_keys:smatov}
user: ${linux:system:user:smatov}
+ dcech:
+ enabled: true
+ public_keys:
+ - ${public_keys:dcech}
+ user: ${linux:system:user:dcech}
public_keys:
askotnicky:
key: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDO6EnDYaGdF/Nn6lntxDNnKanCsheZRdh8kA/6ImyeRSjT2cgepm1Fsgv7wXBYoy0OxhB5wgCp5Az/Pj4oLkG3g+G05sUPUxxGCGRiwjcnyQ/FTz4TzHglAVqgbdgWoQYf9Hg6EKZovvPcH3STbEwcl+MhLqvxz0wm5+StE+wvp6I9dEfRV+2/e1uepauOTZ1+Ui1DMNXiMefTlbiIBHzUk7RiwJWgqzQXBndgunmbJWSed8zC0Ug97waDOFIX/oKZmAmsv0NLJ2e/kC3oUTuziGT74F9sh7Pqiw/9HZxvP45hJwEvytfUjfuiikIBbmYdF7Je93czaG/qjXGN8YvP== a.skotnicky@tcpisek.cz
@@ -304,3 +315,5 @@
key: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQCy6mFrr4oNdLjT5wBZj1+KXNpdawnGGWEevDBQ2SWFjxBFujkWVLiW1kxLTpLVSnuoE5FB7doRIsT/CDe9IU5OhsJ+z6TT56R/pfVKrVnSB1rgrwqdezjgmYEM6kTWiH2GKJE0yiQEPgagK8Rz5Zl420JkhbFWnL7EGPhxNtmYMGDTZwUTzP0KYmytyeH15OqNIiBGTrp1t2bTrVB8HRnUp0uDpfoWAUnsijVGNe1j1bNKtDO0Z9LAWx3eUyxIk4cdpX/EeWJg8jNrSMxtAZZ7Hhm/WInNSNqcHcZ1rEYCAjENxo1WVOuA/aqUqc5xaAipWNon4Rk0e0IUAaFOfLvN2lIuilUZ5XKHDe7a2crkGPnotheT9FgaEHOeFtpuhSaygeZHTMR197jeocgjWIkPqHjVAGSQqQf0TAdNuN73QPTigbbfHWWc1d8KlCM5BqJUXMHPG6BasE1sI/4ykYbxN/DAEvVJ4+rdIlqSdedd73ZAseVQjDtpzD8diScGrpdOhZnTm43q89F8dIFv7tt1TjIwvfcDQNSBjyyKcYpj+NTyW2Zk7qWDVz+lzH0ToYk/rOKkGlrsRy7OwOnmyKR8IcIOL7Bowj895ThCX8tBrdLu/m55ojBOcZiCpawCm7K55ri1Ar6i8cO+bHDh11kKRa/utRRSQTpsW0sbCsamzQ== lubos@lubos-ThinkPad-X1
smatov:
key: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDgBHACRnY/VEEDFE63xDp4bx0zgWY4h1aB9/c2f962HtTNaQ6R/Cz6DLISaB5th8qzrzbvjn9WcpHdxyTm9BqkLLzB4qe7fnebPtn6zGczZ9Btrjk9R8Fuw6DZhSucSk572r/gVIY0O3Z1LajHkNr0ZTQS8AY3fgn8rXMD2vMOruOzyTOmfWKmEw7e+JYUqoFXHhE3Dd7hGQ99d6kH2N3zXfM2rzfjshGAq0kOi5dN4Hx6QIXZapt0t9TzpYTkK5SaVzuEVyVaKRLYSa/rdPjHkKqDFa99RcQ+OI93uvT9CFNWDFIC/TDJ2M+7PQbm836EICXXVWKjQ2NUnQJeOU5v smatov@ubuntu
+ dcech:
+ key: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQC8A26XMLUnXkxv4e/vByD4W4PQ0ZdgGZz5Tg6G/fQKuSa+9zRucG6IlOchJPikwrDyTrojHTGAClHPuyr2bPIRrjFy4oUTZNdjiDptV99Zv/kHRStYzPyZ4KabnFLJVKNtyKKagk6Z3wpzEjFjRHWJK7A5bIzHfd7Amx/frdLKRo9YZjGbLnZRw6mWGqZYyp2/5a/5rKqH1BhMQggDGkAwFGWYQByZzk2F81nDnkt3CY3bi24gX90w4mgFjP8B0m0QCEhcGqpfOKsQTnIyBCtztEHBiUplzBN+RHS4dDOIEs9SWrXLiMFakWu1Vr6bUa7v5xGaNN8XAWjd3xdsy4hvJjJHU5HPaMY9MGH+N6W0UUZxIF0MuxDNP03MDM1uA5mRWTdwffARaDySYaEUrUEYJmzFAtk700Jv/Aav7QixLoIeKU9SAKYvVb7XNlMWgiswQdRPoiMpXPXPw+bMhjpimHJa4n0KFGAUO/cRD1dpJKybqxDe2ip57JzpFkm5PxuNht5qmEreKcS5dWQqm0fDE9wv8cCUMnWQv36f0IDeVpftmeDREatqXSeUjES7NFQOgIQW5C5Pl+8ZHTXw46c/uh89gUILJT2tS/mOXaU4mELox1Qv8vc/laoGAec+TGD0flf75LfiuLOK6JOYX0QVW13ko1wc3CyJzHOi1sFEAw== daniel.cech@tcpcloud.eu
\ No newline at end of file
diff --git a/rabbitmq/server/vhost/catalog.yml b/rabbitmq/server/vhost/catalog.yml
new file mode 100644
index 0000000..23cb0f2
--- /dev/null
+++ b/rabbitmq/server/vhost/catalog.yml
@@ -0,0 +1,20 @@
+parameters:
+ rabbitmq:
+ server:
+ host:
+ '/murano':
+ enabled: true
+ user: openstack
+ password: ${_param:rabbitmq_murano_agent_password}
+ policies:
+ - name: HA
+ pattern: '^(?!amq\.).*'
+ definition: '{"ha-mode": "all", "message-ttl": 120000}'
+ admin:
+ name: admin
+ password: zeQuooQu47eed8esahpie2Lai8En9ohp
+ bind:
+ address: ${_param:single_address}
+ management:
+ bind:
+ address: ${_param:single_address}
diff --git a/reclass/storage/system/openstack_catalog_cluster.yml b/reclass/storage/system/openstack_catalog_cluster.yml
new file mode 100644
index 0000000..332e5d6
--- /dev/null
+++ b/reclass/storage/system/openstack_catalog_cluster.yml
@@ -0,0 +1,27 @@
+parameters:
+ _param:
+ openstack_catalog_node01_hostname: asc01
+ openstack_catalog_node02_hostname: asc02
+ reclass:
+ storage:
+ node:
+ openstack_catalog_node01:
+ name: ${_param:openstack_catalog_node01_hostname}
+ domain: ${_param:cluster_domain}
+ classes:
+ - cluster.${_param:cluster_name}.openstack.catalog
+ params:
+ salt_master_host: ${_param:reclass_config_master}
+ linux_system_codename: ${_param:linux_system_codename}
+ single_address: ${_param:openstack_catalog_node01_address}
+ keepalived_vip_priority: 102
+ openstack_catalog_node02:
+ name: ${_param:openstack_catalog_node02_hostname}
+ domain: ${_param:cluster_domain}
+ classes:
+ - cluster.${_param:cluster_name}.openstack.catalog
+ params:
+ salt_master_host: ${_param:reclass_config_master}
+ linux_system_codename: ${_param:linux_system_codename}
+ single_address: ${_param:openstack_catalog_node02_address}
+ keepalived_vip_priority: 101
diff --git a/reclass/storage/system/openstack_catalog_single.yml b/reclass/storage/system/openstack_catalog_single.yml
new file mode 100644
index 0000000..b48ab27
--- /dev/null
+++ b/reclass/storage/system/openstack_catalog_single.yml
@@ -0,0 +1,15 @@
+parameters:
+ _param:
+ openstack_catalog_node01_hostname: asc01
+ reclass:
+ storage:
+ node:
+ openstack_catalog_node01:
+ name: ${_param:openstack_catalog_node01_hostname}
+ domain: ${_param:cluster_domain}
+ classes:
+ - cluster.${_param:cluster_name}.openstack.catalog
+ params:
+ salt_master_host: ${_param:reclass_config_master}
+ linux_system_codename: ${_param:linux_system_codename}
+ single_address: ${_param:openstack_catalog_node01_address}
diff --git a/sahara/server/cluster.yml b/sahara/server/cluster.yml
new file mode 100644
index 0000000..cdb7b04
--- /dev/null
+++ b/sahara/server/cluster.yml
@@ -0,0 +1,39 @@
+classes:
+- service.sahara.server.cluster
+- service.keepalived.cluster.single
+- system.haproxy.proxy.listen.openstack.sahara
+- service.haproxy.proxy.single
+parameters:
+ sahara:
+ server:
+ enabled: true
+ version: ${_param:sahara_version}
+ notification: false
+ bind:
+ address: ${_param:single_address}
+ port: 8386
+ database:
+ engine: mysql
+ host: ${_param:openstack_database_address}
+ port: 3306
+ name: sahara
+ user: sahara
+ password: ${_param:mysql_sahara_password}
+ identity:
+ engine: keystone
+ protocol: http
+ host: ${_param:openstack_control_address}
+ port: 35357
+ tenant: service
+ user: sahara
+ password: ${_param:keystone_sahara_password}
+ message_queue:
+ engine: rabbitmq
+ port: 5672
+ members:
+ - host: ${_param:openstack_message_queue_node01_address}
+ - host: ${_param:openstack_message_queue_node02_address}
+ - host: ${_param:openstack_message_queue_node03_address}
+ user: openstack
+ password: ${_param:rabbitmq_openstack_password}
+ virtual_host: '/openstack'
diff --git a/sahara/server/single.yml b/sahara/server/single.yml
new file mode 100644
index 0000000..01e7b38
--- /dev/null
+++ b/sahara/server/single.yml
@@ -0,0 +1,31 @@
+classes:
+- service.sahara.server.single
+parameters:
+ sahara:
+ server:
+ enabled: true
+ version: ${_param:sahara_version}
+ bind:
+ host: ${_param:single_address}
+ port: 8386
+ database:
+ engine: mysql
+ host: ${_param:openstack_database_address}
+ port: 3306
+ name: sahara
+ user: sahara
+ password: ${_param:mysql_sahara_password}
+ identity:
+ engine: keystone
+ host: ${_param:openstack_control_address}
+ port: 35357
+ user: sahara
+ password: ${_param:keystone_sahara_password}
+ tenant: service
+ message_queue:
+ engine: rabbitmq
+ host: ${_param:cluster_vip_address}
+ port: 5672
+ user: openstack
+ password: ${_param:rabbitmq_openstack_password}
+ virtual_host: '/openstack'
diff --git a/salt/master/formula/git/openstack.yml b/salt/master/formula/git/openstack.yml
index 86e23b2..36ddfc2 100644
--- a/salt/master/formula/git/openstack.yml
+++ b/salt/master/formula/git/openstack.yml
@@ -104,6 +104,10 @@
source: git
address: '${_param:salt_master_environment_repository}/salt-formula-rabbitmq.git'
revision: ${_param:salt_master_environment_revision}
+ sahara:
+ source: git
+ address: '${_param:salt_master_environment_repository}/salt-formula-sahara.git'
+ revision: ${_param:salt_master_environment_revision}
statsd:
source: git
address: '${_param:salt_master_environment_repository}/salt-formula-statsd.git'
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}
diff --git a/salt/master/formula/pkg/openstack.yml b/salt/master/formula/pkg/openstack.yml
index 1269bd1..b1222d1 100644
--- a/salt/master/formula/pkg/openstack.yml
+++ b/salt/master/formula/pkg/openstack.yml
@@ -58,6 +58,9 @@
mysql:
source: pkg
name: salt-formula-mysql
+ murano:
+ source: pkg
+ name: salt-formula-murano
neutron:
source: pkg
name: salt-formula-neutron
@@ -76,6 +79,9 @@
rabbitmq:
source: pkg
name: salt-formula-rabbitmq
+ sahara:
+ source: pkg
+ name: salt-formula-sahara
statsd:
source: pkg
name: salt-formula-statsd