Merge pull request #283 from erickcantwell/MMO-197
[MMO-197] Add larger disk profile, since we often have to +200GB
diff --git a/.releasenotes/config.yaml b/.releasenotes/config.yaml
index 28db76e..bf103f9 100644
--- a/.releasenotes/config.yaml
+++ b/.releasenotes/config.yaml
@@ -9,10 +9,11 @@
prelude_section_name: summary
show_source: False
sections:
- - [features, New Features]
- - [upgrade, Upgrade Notes]
- - [fixes, Bug Fixes]
- - [other, Other Notes]
+ - [features, New features]
+ - [upgrades, Upgrade notes]
+ - [deprecations, Deprecation notes]
+ - [fixes, Bug fixes]
+ - [others, Other notes]
template: |
---
# Author the following sections or remove the section if it is not related.
@@ -21,38 +22,66 @@
# If you miss a section from the list below, please first submit a review
# adding it to .releasenotes/config.yaml.
#
+ # Format content with reStructuredText (RST).
+ # **Formatting examples:**
+ # - |
+ # This is a brief description of the feature. It may include a
+ # number of components:
+ #
+ # * List item 1
+ # * List item 2.
+ # This code block below will appear as part of the list item 2:
+ #
+ # .. code-block:: yaml
+ #
+ # classes:
+ # - system.class.to.load
+ #
+ # The code block below will appear on the same level as the feature
+ # description:
+ #
+ # .. code-block:: text
+ #
+ # provide model/formula pillar snippets
+
+
summary: >
This section is not mandatory. Use it to highlight the change.
features:
- - Use list to record summary of features.
- - |
- Provide detailed description with examples.
- Format with reStructuredText.
+ - Use the list to record summary of **NEW** features
+ - Provide detailed description of the feature indicating the use cases
+ when users benefit from using it
+ - Explain how the feature integrates into the overall reference
+ architecture of a deployment.
+ - Provide steps to deploy the feature (if the procedure is complicated
+ indicate during what stage of the deployment workflow it should be
+ deployed).
+ - Indicate limitations or incompatibility with other versions, if applicable.
+ - Provide a brief overview of how to use the feature after installation
+ (Day2 operations).
+ - Provide troubleshooting information, if any.
+ - Provide disaster recovery information (in case of hardware or software
+ failure.)
- .. code-block:: text
+ upgrades:
+ - Use the list to record summary of an **improvement** to an existing
+ functionality/feature
+ - Document how to use a feature.
+ - Document the related upgrade instructions.
+ - Indicate limitations, if applicable.
- provide model/formula pillar snippets
-
- upgrade:
- - |
- Document how to use a feature and related upgrade instructions.
+ deprecations:
+ - Use the list to record deprecated features.
+ - Explain the reason of deprecation.
+ - Point to the functionality that can be used instead.
fixes:
- - Use list to record summary of fixes.
- Quick and dirty `git log --oneline`.
+ - Use the list to record summary of a bug fix for blocker, critical,
+ and/or customer-found issues.
+ - Provide a brief summary of what has been fixed.
- other:
- - Author additional notes for the release.
- - Format with reStructuredText.
- - |
- Use this section if note is not related to one of the common sections:
- features, issues, upgrade, deprecations, security, fixes, api, cli
+ others:
+ - Author any additional notes. Use this section if note is not related to
+ any of the common sections above.
- * list item 1
- * list item 2
-
- .. code-block:: yaml
-
- classes:
- - system.class.to.load
diff --git a/.releasenotes/notes/add-fwaas-d4dea7f376eb3f83.yaml b/.releasenotes/notes/add-fwaas-d4dea7f376eb3f83.yaml
new file mode 100644
index 0000000..69c6ad2
--- /dev/null
+++ b/.releasenotes/notes/add-fwaas-d4dea7f376eb3f83.yaml
@@ -0,0 +1,19 @@
+---
+features:
+ - |
+ Add system level metadata class required to enable FWaaS in Neutron.
+
+ The Firewall-as-a-Service (FWaaS) plug-in applies firewalls to OpenStack
+ objects such as projects, routers, router ports, as well as to VM ports
+ and SFC ports in FWaaS V2.
+
+ To enable FWaaS add the ``system.neutron.fwaas`` class to nodes with
+ control, gateway and, if the Neutron DVR feature is enabled, compute roles.
+
+ By default the FWaaS V1 is installed. To install FWaaS V2 redefine the
+ ``fwaas_version`` parameter on the cluster level:
+
+ .. code-block:: yaml
+
+ fwaas_version: v2
+
diff --git a/.releasenotes/notes/add-influxdb-relay-dc8bd245bebec442.yaml b/.releasenotes/notes/add-influxdb-relay-dc8bd245bebec442.yaml
new file mode 100644
index 0000000..2ccc60c
--- /dev/null
+++ b/.releasenotes/notes/add-influxdb-relay-dc8bd245bebec442.yaml
@@ -0,0 +1,15 @@
+---
+features:
+ - |
+ Added system metadata classes to deploy the InfluxDB relay service.
+
+ The InfluxDB relay service replicates the InfluxDB data to a cluster of
+ InfluxDB servers for HA.
+
+ For more details about the service, see the `GitHub project
+ <https://github.com/influxdata/influxdb-relay>`_ page.
+
+ To enable it, add the ``system.influxdb.relay.cluster`` class to the
+ Telemetry nodes and change
+ ``system.haproxy.proxy.listen.stacklight.influxdb`` to
+ ``system.haproxy.proxy.listen.stacklight.influxdb_relay``.
diff --git a/.releasenotes/notes/add-prometheus-relay-df282e14ed88da8c.yaml b/.releasenotes/notes/add-prometheus-relay-df282e14ed88da8c.yaml
new file mode 100644
index 0000000..e9db668
--- /dev/null
+++ b/.releasenotes/notes/add-prometheus-relay-df282e14ed88da8c.yaml
@@ -0,0 +1,10 @@
+---
+summary: >
+ Added the Prometheus Relay service
+
+features:
+ - Added the Prometheus Relay service. The Prometheus Relay service is
+ responsible for getting PromQL queries from external components,
+ such as Grafana, passing them to all discovered Prometheus servers,
+ merging the results and returning the data. Prometheus Relay can be
+ used to handle Prometheus high availability or sharding.
diff --git a/.releasenotes/notes/add-releasenotes-20cce0cea873f011.yaml b/.releasenotes/notes/add-releasenotes-20cce0cea873f011.yaml
index 733776f..45b6749 100644
--- a/.releasenotes/notes/add-releasenotes-20cce0cea873f011.yaml
+++ b/.releasenotes/notes/add-releasenotes-20cce0cea873f011.yaml
@@ -1,18 +1,20 @@
---
summary: >
- Use "reno", an releasenotes configuration tool to record release notes.
- Documentation: https://docs.openstack.org/reno/latest
+ This is the test release of MCP Feature Update notes.
+ These notes are intended to detail the new functionality and
+ bug fixes released for Reclass model on a sprint basis.
- Example usage:
-
- .. code-block:: shell
-
- # to list/create/show release notes, run following commands
- reno -qd .releasenotes list
- reno -qd .releasenotes new releasenote-slug-title --edit
- reno -qd .releasenotes report --no-show-source
-
-other:
+others:
- |
- Added `reno <https://docs.openstack.org/reno/latest>_` configuration to track release notes
- within the reclass-system git repository.
+ Added `Reno <https://docs.openstack.org/reno/latest>_`, a release notes
+ configuration tool, to track release notes within the ``reclass-system``
+ Git repository.
+
+ To list/create/show release notes:
+
+ .. code-block:: shell
+
+ reno -qd .releasenotes list
+ reno -qd .releasenotes new releasenote-slug-title --edit
+ reno -qd .releasenotes report --no-show-source
+
diff --git a/.releasenotes/notes/add_ssl_support_oss-ea1eb1e086d08e3c.yaml b/.releasenotes/notes/add_ssl_support_oss-ea1eb1e086d08e3c.yaml
new file mode 100644
index 0000000..b74bc21
--- /dev/null
+++ b/.releasenotes/notes/add_ssl_support_oss-ea1eb1e086d08e3c.yaml
@@ -0,0 +1,66 @@
+---
+summary: >
+ Added SSL support for cloud-monitoring services
+
+upgrades:
+ - |
+ Added SSL support for the following cloud-monitoring services:
+
+ * Rundeck CIS Collectors
+
+ To provide ssl support for CIS, set up ``cert`` and ``ssl_cert_file``
+ on a cluster level metadata:
+
+ .. code-block:: yaml
+
+ rundeck_cis_openstack:
+ auth_url: ${_param:oss_openstack_auth_url}/auth/tokens
+ username: ${_param:oss_openstack_username}
+ password: ${_param:oss_openstack_password}
+ cert: |
+ -----BEGIN CERTIFICATE-----
+ MIIE0DCCA7igAwIBAgIBBzANBgkqhkiG9w0BAQsFADCBgzELMAkGA1UEBhMCVVMx
+ -----END CERTIFICATE-----
+ ssl_cert_file: cert.pem
+
+ If all parameters are defined properly, Rundeck enables the ssl support
+ automatically.
+
+ * Cleanup Service
+
+ To provide ssl support for Cleanup Service, specify the cert path
+ and set the ``ssl_verify`` variable to ``True`` on a cluster level
+ metadata:
+
+ .. code-block:: yaml
+
+ janitor_monkey_openstack:
+ username: ${_param:oss_openstack_username}
+ password: ${_param:oss_openstack_password}
+ auth_url: ${_param:oss_openstack_auth_url}
+ ssl_verify: True
+ cacert_path: ${_param:oss_openstack_cert_path}
+
+ * Security Audit Service
+
+ To provide ssl support for Security audit Service, provide cert path,
+ set the ``ssl_verify`` variable to ``True``, and select the endpoint
+ type for cloud connections on a cluster level metadata:
+
+ .. code-block:: yaml
+
+ security_monkey_openstack:
+ username: ${_param:oss_openstack_username}
+ password: ${_param:oss_openstack_password}
+ auth_url: ${_param:oss_openstack_auth_url}
+ ssl_verify: True
+ endpoint_type: public
+ cacert_path: ${_param:oss_openstack_cert_path}
+
+ .. note:: By default, the ``cacert_path`` variable is defined as
+ follows:
+
+ .. code-block:: yaml
+
+ oss_openstack_cert_path: /srv/volumes/rundeck/storage/content/keys/cis/openstack/cert.pem
+
diff --git a/.releasenotes/notes/remove-glusterfs-prometheus-4206900d4ccfb601.yaml b/.releasenotes/notes/remove-glusterfs-prometheus-4206900d4ccfb601.yaml
new file mode 100644
index 0000000..6d6a426
--- /dev/null
+++ b/.releasenotes/notes/remove-glusterfs-prometheus-4206900d4ccfb601.yaml
@@ -0,0 +1,9 @@
+---
+summary: >
+ Removed GlusterFS requirements for Prometheus
+
+deprecations:
+ - Removed GlusterFS from Prometheus requirements.
+ Prometheus/alertmanager do not require shared storage.
+ Now, the configurations for Prometheus and Alertmanager
+ will be generated on every Docker Swarm node.
diff --git a/.releasenotes/notes/rename-options-5db6ad4bb2ff80f5.yaml b/.releasenotes/notes/rename-options-5db6ad4bb2ff80f5.yaml
new file mode 100644
index 0000000..c318d41
--- /dev/null
+++ b/.releasenotes/notes/rename-options-5db6ad4bb2ff80f5.yaml
@@ -0,0 +1,37 @@
+---
+summary: >
+ change OS-cloud credentials defining process
+
+upgrades:
+ * 'cacert_path' and 'cafile' variables for Security Audit and Cleanup services were changed to:
+
+ .. code-block:: yaml
+ security_monkey_openstack:
+ source_credentials: source/path/for/os/credentials/on/env
+ service_credentials: path/to/os/credentials/in/service/container
+
+ janitor_monkey_openstack:
+ source_credentials: source/path/for/os/credentials/on/env
+ service_credentials: path/to/os/credentials/in/service/container
+
+ Now you do not need to specify cert-file properly, need to define directory only.
+ Cert-file named 'cert.pem' by default for all services.
+ 'source_credentials' equal to 'oss_openstack_credentials_path'.
+
+ * 'oss_openstack_cert_path' was changed to:
+
+ .. code-block:: yaml
+
+ oss_openstack_credentials_path: source/path/for/os/credentials/on/env
+
+ .. code-block:: text
+
+ Changes affect cluster and system levels.
+
+fixes:
+ - https://mirantis.jira.com/browse/PROD-14863
+ - https://mirantis.jira.com/browse/PROD-14870
+
+other:
+ * full change-list:
+ https://gerrit.mcp.mirantis.net/#/q/topic:os-creds+(status:open+OR+status:merged)
diff --git a/.releasenotes/notes/spawn-multiple-replicas-prometheus-b80eaede9c19b8cd.yaml b/.releasenotes/notes/spawn-multiple-replicas-prometheus-b80eaede9c19b8cd.yaml
new file mode 100644
index 0000000..df15d71
--- /dev/null
+++ b/.releasenotes/notes/spawn-multiple-replicas-prometheus-b80eaede9c19b8cd.yaml
@@ -0,0 +1,15 @@
+---
+summary: >
+ Spawned two replicas of Prometheus to provide HA
+
+features:
+ - Spawned two replicas of Prometheus inside Docker Swarm.
+ These two instances have the same configuration file
+ and scrape the same endpoints. Therefore, they can be
+ treated as one-to-one copies.
+ Due to a limitation, when connecting to the Prometheus
+ web UI it is not possible to choose to which of the
+ existing Prometheus servers to connect and those
+ servers may contain slightly different results for the
+ same queries. Therefore, we suggest that you use Grafana
+ to visualize the data.
diff --git a/aptly/server/docker.yml b/aptly/server/docker.yml
index 3fa0a8e1..4e70a92 100644
--- a/aptly/server/docker.yml
+++ b/aptly/server/docker.yml
@@ -6,6 +6,8 @@
aptly_gpg_keypair_id: none
aptly_gpg_public_key: none
aptly_gpg_private_key: none
+ aptly_server_mirror_sources: false
+ aptly_server_mirror_ubuntu_sources: ${_param:aptly_server_mirror_sources}
aptly:
server:
enabled: true
diff --git a/aptly/server/mirror/ubuntu/trusty/docker.yml b/aptly/server/mirror/ubuntu/trusty/docker.yml
index 217d405..db97d14 100644
--- a/aptly/server/mirror/ubuntu/trusty/docker.yml
+++ b/aptly/server/mirror/ubuntu/trusty/docker.yml
@@ -3,12 +3,12 @@
server:
mirror:
docker-trusty:
- source: https://apt.dockerproject.org/repo
- distribution: ubuntu-trusty
- components: main
+ source: 'https://download.docker.com/linux/ubuntu'
+ distribution: trusty
+ components: stable
architectures: amd64
gpgkeys:
- - 58118E89F3A912897C070ADBF76221572C52609D
+ - 9DC858229FC7DD38854AE2D88D81803C0EBFCD88
publisher:
component: docker
distributions:
diff --git a/aptly/server/mirror/ubuntu/trusty/ubuntu.yml b/aptly/server/mirror/ubuntu/trusty/ubuntu.yml
index 3cd7c7b..3495967 100644
--- a/aptly/server/mirror/ubuntu/trusty/ubuntu.yml
+++ b/aptly/server/mirror/ubuntu/trusty/ubuntu.yml
@@ -1,6 +1,7 @@
parameters:
_param:
linux_system_country_code: cz
+ aptly_server_mirror_ubuntu_trusty_sources: ${_param:aptly_server_mirror_ubuntu_sources}
aptly:
server:
mirror:
@@ -8,6 +9,7 @@
trusty-main:
source: http://${_param:linux_system_country_code}.archive.ubuntu.com/ubuntu/
distribution: trusty
+ sources: ${_param:aptly_server_mirror_ubuntu_trusty_sources}
components: main
architectures: amd64
gpgkeys:
@@ -21,6 +23,7 @@
trusty-multiverse:
source: http://${_param:linux_system_country_code}.archive.ubuntu.com/ubuntu/
distribution: trusty
+ sources: ${_param:aptly_server_mirror_ubuntu_trusty_sources}
components: multiverse
architectures: amd64
gpgkeys:
@@ -33,6 +36,7 @@
- ubuntu/trusty
trusty-restricted:
source: http://${_param:linux_system_country_code}.archive.ubuntu.com/ubuntu/
+ sources: ${_param:aptly_server_mirror_ubuntu_trusty_sources}
distribution: trusty
components: restricted
architectures: amd64
@@ -46,6 +50,7 @@
- ubuntu/trusty
trusty-universe:
source: http://${_param:linux_system_country_code}.archive.ubuntu.com/ubuntu/
+ sources: ${_param:aptly_server_mirror_ubuntu_trusty_sources}
distribution: trusty
components: universe
architectures: amd64
@@ -61,6 +66,7 @@
# trusty-updates
trusty-updates-main:
source: http://${_param:linux_system_country_code}.archive.ubuntu.com/ubuntu/
+ sources: ${_param:aptly_server_mirror_ubuntu_trusty_sources}
distribution: trusty-updates
components: main
architectures: amd64
@@ -74,6 +80,7 @@
- ubuntu/trusty-updates
trusty-updates-multiverse:
source: http://${_param:linux_system_country_code}.archive.ubuntu.com/ubuntu/
+ sources: ${_param:aptly_server_mirror_ubuntu_trusty_sources}
distribution: trusty-updates
components: multiverse
architectures: amd64
@@ -87,6 +94,7 @@
- ubuntu/trusty-updates
trusty-updates-restricted:
source: http://${_param:linux_system_country_code}.archive.ubuntu.com/ubuntu/
+ sources: ${_param:aptly_server_mirror_ubuntu_trusty_sources}
distribution: trusty-updates
components: restricted
architectures: amd64
@@ -100,6 +108,7 @@
- ubuntu/trusty-updates
trusty-updates-universe:
source: http://${_param:linux_system_country_code}.archive.ubuntu.com/ubuntu/
+ sources: ${_param:aptly_server_mirror_ubuntu_trusty_sources}
distribution: trusty-updates
components: universe
architectures: amd64
@@ -115,6 +124,7 @@
#trusty-security:
trusty-security-main:
source: http://${_param:linux_system_country_code}.archive.ubuntu.com/ubuntu/
+ sources: ${_param:aptly_server_mirror_ubuntu_trusty_sources}
distribution: trusty-security
components: main
architectures: amd64
@@ -128,6 +138,7 @@
- ubuntu/trusty-security
trusty-security-multiverse:
source: http://${_param:linux_system_country_code}.archive.ubuntu.com/ubuntu/
+ sources: ${_param:aptly_server_mirror_ubuntu_trusty_sources}
distribution: trusty-security
components: multiverse
architectures: amd64
@@ -141,6 +152,7 @@
- ubuntu/trusty-security
trusty-security-restricted:
source: http://${_param:linux_system_country_code}.archive.ubuntu.com/ubuntu/
+ sources: ${_param:aptly_server_mirror_ubuntu_trusty_sources}
distribution: trusty-security
components: restricted
architectures: amd64
@@ -154,6 +166,7 @@
- ubuntu/trusty-security
trusty-security-universe:
source: http://${_param:linux_system_country_code}.archive.ubuntu.com/ubuntu/
+ sources: ${_param:aptly_server_mirror_ubuntu_trusty_sources}
distribution: trusty-security
components: universe
architectures: amd64
@@ -169,6 +182,7 @@
#trusty-proposed:
trusty-proposed-main:
source: http://${_param:linux_system_country_code}.archive.ubuntu.com/ubuntu/
+ sources: ${_param:aptly_server_mirror_ubuntu_trusty_sources}
distribution: trusty-proposed
components: main
architectures: amd64
@@ -182,6 +196,7 @@
- ubuntu/trusty-proposed
trusty-proposed-multiverse:
source: http://${_param:linux_system_country_code}.archive.ubuntu.com/ubuntu/
+ sources: ${_param:aptly_server_mirror_ubuntu_trusty_sources}
distribution: trusty-proposed
components: multiverse
architectures: amd64
@@ -195,6 +210,7 @@
- ubuntu/trusty-proposed
trusty-proposed-restricted:
source: http://${_param:linux_system_country_code}.archive.ubuntu.com/ubuntu/
+ sources: ${_param:aptly_server_mirror_ubuntu_trusty_sources}
distribution: trusty-proposed
components: restricted
architectures: amd64
@@ -208,6 +224,7 @@
- ubuntu/trusty-proposed
trusty-proposed-universe:
source: http://${_param:linux_system_country_code}.archive.ubuntu.com/ubuntu/
+ sources: ${_param:aptly_server_mirror_ubuntu_trusty_sources}
distribution: trusty-proposed
components: universe
architectures: amd64
@@ -223,6 +240,7 @@
#trusty-backports:
trusty-backports-main:
source: http://${_param:linux_system_country_code}.archive.ubuntu.com/ubuntu/
+ sources: ${_param:aptly_server_mirror_ubuntu_trusty_sources}
distribution: trusty-backports
components: main
architectures: amd64
@@ -236,6 +254,7 @@
- ubuntu/trusty-backports
trusty-backports-multiverse:
source: http://${_param:linux_system_country_code}.archive.ubuntu.com/ubuntu/
+ sources: ${_param:aptly_server_mirror_ubuntu_trusty_sources}
distribution: trusty-backports
components: multiverse
architectures: amd64
@@ -249,6 +268,7 @@
- ubuntu/trusty-backports
trusty-backports-restricted:
source: http://${_param:linux_system_country_code}.archive.ubuntu.com/ubuntu/
+ sources: ${_param:aptly_server_mirror_ubuntu_trusty_sources}
distribution: trusty-backports
components: restricted
architectures: amd64
@@ -262,6 +282,7 @@
- ubuntu/trusty-backports
trusty-backports-universe:
source: http://${_param:linux_system_country_code}.archive.ubuntu.com/ubuntu/
+ sources: ${_param:aptly_server_mirror_ubuntu_trusty_sources}
distribution: trusty-backports
components: universe
architectures: amd64
diff --git a/aptly/server/mirror/ubuntu/xenial/docker.yml b/aptly/server/mirror/ubuntu/xenial/docker.yml
index 4334374..b5d98c5 100644
--- a/aptly/server/mirror/ubuntu/xenial/docker.yml
+++ b/aptly/server/mirror/ubuntu/xenial/docker.yml
@@ -1,16 +1,14 @@
parameters:
- _param:
- apt_mk_version: stable
aptly:
server:
mirror:
docker-xenial:
- source: https://apt.dockerproject.org/repo
- distribution: ubuntu-xenial
- components: main
+ source: 'https://download.docker.com/linux/ubuntu'
+ distribution: xenial
+ components: stable
architectures: amd64
gpgkeys:
- - 58118E89F3A912897C070ADBF76221572C52609D
+ - 9DC858229FC7DD38854AE2D88D81803C0EBFCD88
publisher:
component: docker
distributions:
diff --git a/aptly/server/mirror/ubuntu/xenial/ubuntu.yml b/aptly/server/mirror/ubuntu/xenial/ubuntu.yml
index 4675063..6b41aee 100644
--- a/aptly/server/mirror/ubuntu/xenial/ubuntu.yml
+++ b/aptly/server/mirror/ubuntu/xenial/ubuntu.yml
@@ -2,12 +2,13 @@
_param:
linux_system_country_code_default: cz
linux_system_country_code: ${_param:linux_system_country_code_default}
+ aptly_server_mirror_ubuntu_xenial_sources: ${_param:aptly_server_mirror_ubuntu_sources}
aptly:
server:
mirror:
# xenial
xenial-main:
- sources: true
+ sources: ${_param:aptly_server_mirror_ubuntu_xenial_sources}
source: http://${_param:linux_system_country_code}.archive.ubuntu.com/ubuntu/
distribution: xenial
components: main
@@ -21,7 +22,7 @@
distributions:
- ubuntu/xenial
xenial-multiverse:
- sources: true
+ sources: ${_param:aptly_server_mirror_ubuntu_xenial_sources}
source: http://${_param:linux_system_country_code}.archive.ubuntu.com/ubuntu/
distribution: xenial
components: multiverse
@@ -35,7 +36,7 @@
distributions:
- ubuntu/xenial
xenial-restricted:
- sources: true
+ sources: ${_param:aptly_server_mirror_ubuntu_xenial_sources}
source: http://${_param:linux_system_country_code}.archive.ubuntu.com/ubuntu/
distribution: xenial
components: restricted
@@ -49,7 +50,7 @@
distributions:
- ubuntu/xenial
xenial-universe:
- sources: true
+ sources: ${_param:aptly_server_mirror_ubuntu_xenial_sources}
source: http://${_param:linux_system_country_code}.archive.ubuntu.com/ubuntu/
distribution: xenial
components: universe
@@ -65,7 +66,7 @@
# xenial-updates
xenial-updates-main:
- sources: true
+ sources: ${_param:aptly_server_mirror_ubuntu_xenial_sources}
source: http://${_param:linux_system_country_code}.archive.ubuntu.com/ubuntu/
distribution: xenial-updates
components: main
@@ -79,7 +80,7 @@
distributions:
- ubuntu/xenial-updates
xenial-updates-multiverse:
- sources: true
+ sources: ${_param:aptly_server_mirror_ubuntu_xenial_sources}
source: http://${_param:linux_system_country_code}.archive.ubuntu.com/ubuntu/
distribution: xenial-updates
components: multiverse
@@ -93,7 +94,7 @@
distributions:
- ubuntu/xenial-updates
xenial-updates-restricted:
- sources: true
+ sources: ${_param:aptly_server_mirror_ubuntu_xenial_sources}
source: http://${_param:linux_system_country_code}.archive.ubuntu.com/ubuntu/
distribution: xenial-updates
components: restricted
@@ -107,7 +108,7 @@
distributions:
- ubuntu/xenial-updates
xenial-updates-universe:
- sources: true
+ sources: ${_param:aptly_server_mirror_ubuntu_xenial_sources}
source: http://${_param:linux_system_country_code}.archive.ubuntu.com/ubuntu/
distribution: xenial-updates
components: universe
@@ -123,7 +124,7 @@
#xenial-security:
xenial-security-main:
- sources: true
+ sources: ${_param:aptly_server_mirror_ubuntu_xenial_sources}
source: http://${_param:linux_system_country_code}.archive.ubuntu.com/ubuntu/
distribution: xenial-security
components: main
@@ -137,7 +138,7 @@
distributions:
- ubuntu/xenial-security
xenial-security-multiverse:
- sources: true
+ sources: ${_param:aptly_server_mirror_ubuntu_xenial_sources}
source: http://${_param:linux_system_country_code}.archive.ubuntu.com/ubuntu/
distribution: xenial-security
components: multiverse
@@ -151,7 +152,7 @@
distributions:
- ubuntu/xenial-security
xenial-security-restricted:
- sources: true
+ sources: ${_param:aptly_server_mirror_ubuntu_xenial_sources}
source: http://${_param:linux_system_country_code}.archive.ubuntu.com/ubuntu/
distribution: xenial-security
components: restricted
@@ -165,7 +166,7 @@
distributions:
- ubuntu/xenial-security
xenial-security-universe:
- sources: true
+ sources: ${_param:aptly_server_mirror_ubuntu_xenial_sources}
source: http://${_param:linux_system_country_code}.archive.ubuntu.com/ubuntu/
distribution: xenial-security
components: universe
@@ -181,7 +182,7 @@
#xenial-proposed:
xenial-proposed-main:
- sources: true
+ sources: ${_param:aptly_server_mirror_ubuntu_xenial_sources}
source: http://${_param:linux_system_country_code}.archive.ubuntu.com/ubuntu/
distribution: xenial-proposed
components: main
@@ -195,7 +196,7 @@
distributions:
- ubuntu/xenial-proposed
xenial-proposed-multiverse:
- sources: true
+ sources: ${_param:aptly_server_mirror_ubuntu_xenial_sources}
source: http://${_param:linux_system_country_code}.archive.ubuntu.com/ubuntu/
distribution: xenial-proposed
components: multiverse
@@ -263,7 +264,7 @@
distributions:
- ubuntu/xenial-backports
xenial-backports-restricted:
- sources: true
+ sources: ${_param:aptly_server_mirror_ubuntu_xenial_sources}
source: http://${_param:linux_system_country_code}.archive.ubuntu.com/ubuntu/
distribution: xenial-backports
components: restricted
@@ -277,7 +278,7 @@
distributions:
- ubuntu/xenial-backports
xenial-backports-universe:
- sources: true
+ sources: ${_param:aptly_server_mirror_ubuntu_xenial_sources}
source: http://${_param:linux_system_country_code}.archive.ubuntu.com/ubuntu/
distribution: xenial-backports
components: universe
diff --git a/aptly/server/single.yml b/aptly/server/single.yml
index 8b71974..e8da341 100644
--- a/aptly/server/single.yml
+++ b/aptly/server/single.yml
@@ -6,6 +6,8 @@
_param:
nginx_aptly_server_host: ${linux:network:fqdn}
aptly_server_secure: true
+ aptly_server_mirror_sources: false
+ aptly_server_mirror_ubuntu_sources: ${_param:aptly_server_mirror_sources}
iptables:
service:
enabled: true
diff --git a/artifactory/client/init.yml b/artifactory/client/init.yml
index 0148879..05c05be 100644
--- a/artifactory/client/init.yml
+++ b/artifactory/client/init.yml
@@ -7,20 +7,130 @@
server:
host: ${_param:artifactory_server_host}
port: ${_param:artifactory_server_port}
+ proto: ${_param:artifactory_server_proto}
+ ssl_verify: ${_param:artifactory_server_verify_ssl}
user: ${_param:artifactory_client_user}
password: ${_param:artifactory_client_password}
license_key: ${_param:artifactory_license_key}
ldap_server: ${_param:artifactory_security_ldap_server}
ldap_account_base: ${_param:artifactory_security_ldap_root_dn}
ldap_searchFilter: ${_param:artifactory_security_ldap_searchFilter}
- ssl_verify: False
repo:
- local_artifactory_repo:
- name: local_artifactory_repo
- package_type: generic
+ _genericRepository-local:
+ description: "Used by Jimbo"
repo_type: local
- remote_artifactory_repo:
- name: remote_artifactory_repo
package_type: generic
+ binary-dev-local:
+ description: "None"
+ repo_type: local
+ package_type: generic
+ binary-prod-local:
+ repo_type: local
+ package_type: generic
+ docker-dev-local:
+ repo_type: local
+ package_type: docker
+ docker-prod-local:
+ repo_type: local
+ package_type: docker
+ k8s-tests-images:
+ repo_type: local
+ package_type: docker
+ maven-local:
+ description: "Hosts Java libraries needed to build Docker images"
+ repo_type: local
+ package_type: maven
+ mcp-ci-images:
+ repo_type: local
+ package_type: docker
+ vm-images:
+ repo_type: local
+ package_type: generic
+ _genericRepository-remote:
+ description: "Used by Jimbo"
repo_type: remote
- url: "http://artifactory.mcp.mirantis.net/"
+ package_type: generic
+ url: http://localhost
+ apk-remote:
+ repo_type: remote
+ package_type: generic
+ url: http://dl-cdn.alpinelinux.org/alpine/
+ apt-docker-project:
+ repo_type: remote
+ package_type: debian
+ url: https://apt.dockerproject.org/repo
+ artifactory-pro-debian:
+ repo_type: remote
+ package_type: debian
+ url: https://jfrog.bintray.com/artifactory-pro-debs
+ debian-mariadb-remote:
+ repo_type: remote
+ package_type: debian
+ url: http://sfo1.mirrors.digitalocean.com/mariadb/repo/10.1/debian/
+ debian-nginx:
+ repo_type: remote
+ package_type: debian
+ url: http://nginx.org/packages/debian/
+ debian-percona-remote:
+ repo_type: remote
+ package_type: debian
+ url: http://repo.percona.com/apt
+ debian-rabbitmq-remote:
+ repo_type: remote
+ package_type: debian
+ url: http://www.rabbitmq.com/debian/
+ debian-remote:
+ repo_type: remote
+ package_type: debian
+ url: http://ftp.us.debian.org/debian
+ debian-security-remote:
+ repo_type: remote
+ package_type: debian
+ url: http://security.debian.org/
+ docker-remote:
+ description: "Remote repository for DockerHub"
+ repo_type: remote
+ package_type: docker
+ url: https://registry-1.docker.io/
+ gcs-remote:
+ description: "Has zero downloads. Can be removed."
+ repo_type: remote
+ package_type: generic
+ url: https://storage.googleapis.com
+ gerrit-plugins:
+ description: "Overlaps with maven-local. We should resolve overlap and remove this repo."
+ repo_type: remote
+ package_type: generic
+ url: http://builds.quelltextlich.at/gerrit/nightly
+ jcenter:
+ repo_type: remote
+ package_type: maven
+ url: https://jcenter.bintray.com
+ jenkins-deb-pkgs:
+ repo_type: remote
+ package_type: generic
+ url: https://pkg.jenkins.io/debian-stable/binary
+ jenkins-plugins:
+ repo_type: remote
+ package_type: generic
+ url: http://mirrors.jenkins-ci.org/plugins
+ jenkins-plugins-jars:
+ repo_type: remote
+ package_type: maven
+ url: https://repo.jenkins-ci.org/releases/org/jenkins-ci/plugins/
+ jenkins-updates:
+ repo_type: remote
+ package_type: generic
+ url: https://updates.jenkins.io/
+ mysql-connector-java:
+ repo_type: remote
+ package_type: maven
+ url: http://repo.jfrog.org/artifactory/remote-repos/mysql/mysql-connector-java/
+ pypi-remote:
+ repo_type: remote
+ package_type: pypi
+ url: https://pypi.python.org
+ ubuntu-remote:
+ repo_type: remote
+ package_type: debian
+ url: http://us.archive.ubuntu.com/ubuntu/
diff --git a/barbican/server/cluster.yml b/barbican/server/cluster.yml
new file mode 100644
index 0000000..5b5bc5e
--- /dev/null
+++ b/barbican/server/cluster.yml
@@ -0,0 +1,3 @@
+classes:
+- service.barbican.server.cluster
+- system.haproxy.proxy.listen.openstack.barbican
\ No newline at end of file
diff --git a/barbican/server/single.yml b/barbican/server/single.yml
new file mode 100644
index 0000000..eb2b30b
--- /dev/null
+++ b/barbican/server/single.yml
@@ -0,0 +1,2 @@
+classes:
+- service.barbican.server.single
diff --git a/ceph/mon/cluster.yml b/ceph/mon/cluster.yml
new file mode 100644
index 0000000..35d5596
--- /dev/null
+++ b/ceph/mon/cluster.yml
@@ -0,0 +1,2 @@
+classes:
+- service.ceph.mon.cluster
diff --git a/ceph/osd/cluster.yml b/ceph/osd/cluster.yml
new file mode 100644
index 0000000..9e98f91
--- /dev/null
+++ b/ceph/osd/cluster.yml
@@ -0,0 +1,2 @@
+classes:
+- service.ceph.osd.cluster
diff --git a/cinder/control/cluster.yml b/cinder/control/cluster.yml
index 868b71e..c130e97 100644
--- a/cinder/control/cluster.yml
+++ b/cinder/control/cluster.yml
@@ -4,6 +4,12 @@
- service.keepalived.cluster.single
- system.haproxy.proxy.listen.openstack.cinder
parameters:
+ linux:
+ system:
+ package:
+ python-pymysql:
+ fromrepo: ${_param:openstack_version}
+ version: latest
cinder:
volume:
enabled: false
diff --git a/cinder/control/single.yml b/cinder/control/single.yml
index 58156cb..2d7f179 100644
--- a/cinder/control/single.yml
+++ b/cinder/control/single.yml
@@ -1,6 +1,12 @@
classes:
- service.cinder.control.single
parameters:
+ linux:
+ system:
+ package:
+ python-pymysql:
+ fromrepo: ${_param:openstack_version}
+ version: latest
cinder:
volume:
enabled: false
diff --git a/cinder/volume/single.yml b/cinder/volume/single.yml
index 9c8f7c2..de468ba 100644
--- a/cinder/volume/single.yml
+++ b/cinder/volume/single.yml
@@ -1,6 +1,12 @@
classes:
- service.cinder.volume.single
parameters:
+ linux:
+ system:
+ package:
+ python-pymysql:
+ fromrepo: ${_param:openstack_version}
+ version: latest
cinder:
volume:
enabled: True
diff --git a/designate/server/backend/bind.yml b/designate/server/backend/bind.yml
index 4201f60..823d52d 100644
--- a/designate/server/backend/bind.yml
+++ b/designate/server/backend/bind.yml
@@ -21,7 +21,7 @@
local:
enabled: true
bind:
- address: ${_param:single_address}
+ address: 127.0.0.1
port: 953
allow:
- 127.0.0.1
diff --git a/designate/server/cluster.yml b/designate/server/cluster.yml
index 33eb632..eb6a5b6 100644
--- a/designate/server/cluster.yml
+++ b/designate/server/cluster.yml
@@ -4,6 +4,12 @@
- system.haproxy.proxy.listen.openstack.designate
- service.haproxy.proxy.single
parameters:
+ linux:
+ system:
+ package:
+ python-pymysql:
+ fromrepo: ${_param:openstack_version}
+ version: latest
designate:
_support:
sensu:
diff --git a/designate/server/single.yml b/designate/server/single.yml
index 623c357..b658f8b 100644
--- a/designate/server/single.yml
+++ b/designate/server/single.yml
@@ -1,6 +1,12 @@
classes:
- service.designate.server.single
parameters:
+ linux:
+ system:
+ package:
+ python-pymysql:
+ fromrepo: ${_param:openstack_version}
+ version: latest
designate:
server:
enabled: true
diff --git a/devops_portal/service/elasticsearch.yml b/devops_portal/service/elasticsearch.yml
index 647c4ef..6fd9afa 100644
--- a/devops_portal/service/elasticsearch.yml
+++ b/devops_portal/service/elasticsearch.yml
@@ -4,7 +4,8 @@
service:
elasticsearch:
configure_proxy: true
+ resolve_hostname: true
endpoint:
- address: ${_param:haproxy_elasticsearch_bind_host}
- port: ${_param:haproxy_elasticsearch_http_bind_port}
- https: ${_param:haproxy_elasticsearch_ssl:enabled}
+ address: ${_param:elasticsearch_bind_host}
+ port: ${_param:elasticsearch_http_bind_port}
+ https: ${_param:elasticsearch_ssl:enabled}
diff --git a/devops_portal/service/janitor_monkey.yml b/devops_portal/service/janitor_monkey.yml
index 73f2e7c..f16ae7c 100644
--- a/devops_portal/service/janitor_monkey.yml
+++ b/devops_portal/service/janitor_monkey.yml
@@ -4,7 +4,8 @@
service:
janitormonkey:
configure_proxy: true
+ resolve_hostname: true
endpoint:
- address: ${_param:haproxy_janitor_monkey_bind_host}
- port: ${_param:haproxy_janitor_monkey_bind_port}
- https: ${_param:haproxy_janitor_monkey_ssl:enabled}
+ address: ${_param:janitor_monkey_bind_host}
+ port: ${_param:janitor_monkey_bind_port}
+ https: ${_param:janitor_monkey_ssl:enabled}
diff --git a/devops_portal/service/jenkins.yml b/devops_portal/service/jenkins.yml
index 349a707..83d9d05 100644
--- a/devops_portal/service/jenkins.yml
+++ b/devops_portal/service/jenkins.yml
@@ -3,6 +3,7 @@
config:
service:
jenkins:
+ configure_proxy: true
endpoint:
address: ${_param:haproxy_jenkins_bind_host}
port: ${_param:haproxy_jenkins_bind_port}
diff --git a/devops_portal/service/pushkin.yml b/devops_portal/service/pushkin.yml
index 82a073c..5cd172a 100644
--- a/devops_portal/service/pushkin.yml
+++ b/devops_portal/service/pushkin.yml
@@ -4,7 +4,8 @@
service:
pushkin:
configure_proxy: true
+ resolve_hostname: true
endpoint:
- address: ${_param:haproxy_pushkin_bind_host}
- port: ${_param:haproxy_pushkin_bind_port}
- https: ${_param:haproxy_pushkin_ssl:enabled}
+ address: ${_param:pushkin_bind_host}
+ port: ${_param:pushkin_bind_port}
+ https: ${_param:pushkin_ssl:enabled}
diff --git a/devops_portal/service/rundeck.yml b/devops_portal/service/rundeck.yml
index 82fd764..ad743cf 100644
--- a/devops_portal/service/rundeck.yml
+++ b/devops_portal/service/rundeck.yml
@@ -4,6 +4,7 @@
service:
rundeck:
configure_proxy: true
+ resolve_hostname: false
credentials:
username: ${_param:rundeck_admin_username}
password: ${_param:rundeck_admin_password}
diff --git a/devops_portal/service/security_monkey.yml b/devops_portal/service/security_monkey.yml
index ba5fe81..da896a8 100644
--- a/devops_portal/service/security_monkey.yml
+++ b/devops_portal/service/security_monkey.yml
@@ -4,10 +4,11 @@
service:
securitymonkey:
configure_proxy: true
+ resolve_hostname: true
endpoint:
- address: ${_param:haproxy_security_monkey_bind_host}
- port: ${_param:haproxy_security_monkey_bind_port}
- https: ${_param:haproxy_security_monkey_ssl:enabled}
+ address: ${_param:security_monkey_bind_host}
+ port: ${_param:security_monkey_bind_port}
+ https: ${_param:security_monkey_ssl:enabled}
credentials:
username: ${_param:security_monkey_user}
password: ${_param:security_monkey_password}
diff --git a/docker/host.yml b/docker/host.yml
index f7649b5..853a5d2 100644
--- a/docker/host.yml
+++ b/docker/host.yml
@@ -4,6 +4,9 @@
parameters:
docker:
host:
+ pkgs:
+ - docker-ce
+ - python-docker
experimental: true
insecure_registries:
- ${_param:cluster_vip_address}:5000
diff --git a/docker/init.yml b/docker/init.yml
new file mode 100644
index 0000000..8ef5e2c
--- /dev/null
+++ b/docker/init.yml
@@ -0,0 +1,6 @@
+parameters:
+ _param:
+ http_proxy: ""
+ docker_http_proxy: ${_param:http_proxy}
+ docker_https_proxy: ${_param:docker_http_proxy}
+ docker_no_proxy: ""
diff --git a/docker/swarm/manager.yml b/docker/swarm/manager.yml
index 4bbc22b..12bfc0c 100644
--- a/docker/swarm/manager.yml
+++ b/docker/swarm/manager.yml
@@ -3,10 +3,11 @@
parameters:
_param:
docker_gwbridge_subnet: 10.20.0.0/16
+ docker_swarm_master_port: 2377
docker:
swarm:
role: manager
advertise_addr: ${_param:single_address}
master:
host: ${_param:cluster_node01_address}
- port: 2377
+ port: ${_param:docker_swarm_master_port}
diff --git a/docker/swarm/network/oss_backend.yml b/docker/swarm/network/oss_backend.yml
new file mode 100644
index 0000000..daa628e
--- /dev/null
+++ b/docker/swarm/network/oss_backend.yml
@@ -0,0 +1,10 @@
+parameters:
+ _param:
+ docker_oss_network_subnet: 10.50.0.0/24
+ docker:
+ client:
+ network:
+ oss_backend:
+ subnet: ${_param:docker_oss_network_subnet}
+ driver: overlay
+ attachable: true
\ No newline at end of file
diff --git a/docker/swarm/service/artifactory.yml b/docker/swarm/service/artifactory.yml
index d7f8626..36d9577 100644
--- a/docker/swarm/service/artifactory.yml
+++ b/docker/swarm/service/artifactory.yml
@@ -30,3 +30,7 @@
type: bind
source: /srv/volumes/artifactory/logs
destination: /var/opt/jfrog/artifactory/logs
+ keys:
+ type: bind
+ source: /srv/volumes/artifactory/keys
+ destination: /var/opt/jfrog/artifactory/access/etc/keys
diff --git a/docker/swarm/stack/aptly.yml b/docker/swarm/stack/aptly.yml
index 5570c40..36c719b 100644
--- a/docker/swarm/stack/aptly.yml
+++ b/docker/swarm/stack/aptly.yml
@@ -1,3 +1,5 @@
+classes:
+- system.docker
parameters:
_param:
docker_image_aptly:
@@ -9,6 +11,8 @@
aptly:
environment:
EMAIL_ADDRESS: ${_param:admin_email}
+ https_proxy: ${_param:docker_https_proxy}
+ http_proxy: ${_param:docker_http_proxy}
service:
api:
deploy:
diff --git a/docker/swarm/stack/artifactory.yml b/docker/swarm/stack/artifactory.yml
index 411b22e..caab0ee 100644
--- a/docker/swarm/stack/artifactory.yml
+++ b/docker/swarm/stack/artifactory.yml
@@ -21,3 +21,4 @@
- /srv/volumes/artifactory/backup:/var/opt/jfrog/artifactory/backup
- /srv/volumes/artifactory/etc:/var/opt/jfrog/artifactory/etc
- /srv/volumes/artifactory/logs:/var/opt/jfrog/artifactory/logs
+ - /srv/volumes/artifactory/keys:/var/opt/jfrog/artifactory/access/etc/keys
diff --git a/docker/swarm/stack/devops_portal.yml b/docker/swarm/stack/devops_portal.yml
index f553114..f8f89f9 100644
--- a/docker/swarm/stack/devops_portal.yml
+++ b/docker/swarm/stack/devops_portal.yml
@@ -18,3 +18,9 @@
volumes:
- /srv/volumes/devops_portal/nginx:/etc/nginx/config
- /srv/volumes/devops_portal/config:/opt/devops-portal/config
+ network:
+ default:
+ external:
+ name: oss_backend
+ frontend:
+ driver: overlay
\ No newline at end of file
diff --git a/docker/swarm/stack/elasticsearch.yml b/docker/swarm/stack/elasticsearch.yml
index 5ee295c..fe7c35e 100644
--- a/docker/swarm/stack/elasticsearch.yml
+++ b/docker/swarm/stack/elasticsearch.yml
@@ -2,8 +2,14 @@
_param:
elasticsearch_replicas: 1
docker_image_elasticsearch: docker.elastic.co/elasticsearch/elasticsearch:5.4.1
+ elasticsearch_bind_host: elasticsearch-cluster
+ elasticsearch_http_bind_port: ${_param:haproxy_elasticsearch_http_bind_port}
+ elasticsearch_binary_bind_port: ${_param:haproxy_elasticsearch_binary_bind_port}
+ elasticsearch_ssl:
+ enabled: false
elasticsearch_cluster_name: oss-cluster
elasticsearch_xpack_security_enabled: 'false'
+ elasticsearch_xpack_monitoring_enabled: 'false'
elasticsearch_discovery_zen_minimum_master_nodes: 1
elasticsearch_discovery_type: single-node
docker:
@@ -13,17 +19,22 @@
environment:
cluster.name: ${_param:elasticsearch_cluster_name}
xpack.security.enabled: ${_param:elasticsearch_xpack_security_enabled}
+ xpack.monitoring.enabled: ${_param:elasticsearch_xpack_monitoring_enabled}
discovery.zen.minimum_master_nodes: ${_param:elasticsearch_discovery_zen_minimum_master_nodes}
discovery.type: ${_param:elasticsearch_discovery_type}
service:
- cluster:
+ elasticsearch-cluster:
image: ${_param:docker_image_elasticsearch}
deploy:
replicas: ${_param:elasticsearch_replicas}
restart_policy:
condition: any
+ volumes:
+ - /srv/volumes/elasticsearch:/usr/share/elasticsearch/data
ports:
- ${_param:haproxy_elasticsearch_http_exposed_port}:${_param:haproxy_elasticsearch_http_bind_port}
- ${_param:haproxy_elasticsearch_binary_exposed_port}:${_param:haproxy_elasticsearch_binary_bind_port}
- volumes:
- - /srv/volumes/elasticsearch:/usr/share/elasticsearch/data
+ network:
+ default:
+ external:
+ name: oss_backend
diff --git a/docker/swarm/stack/gerrit.yml b/docker/swarm/stack/gerrit.yml
index b59172a..49d0a11 100644
--- a/docker/swarm/stack/gerrit.yml
+++ b/docker/swarm/stack/gerrit.yml
@@ -1,3 +1,5 @@
+classes:
+- system.docker
parameters:
_param:
docker_image_gerrit: tcpcloud/gerrit:2.13.6
@@ -7,7 +9,8 @@
gerrit_ldap_bind_password: ""
gerrit_ldap_account_base: ""
gerrit_ldap_group_base: ""
-
+ gerrit_http_listen_url: http://*:8080/
+ gerrit_extra_opts: ""
docker:
client:
stack:
@@ -40,10 +43,15 @@
LDAP_USERNAME: ${_param:gerrit_ldap_bind_user}
LDAP_PASSWORD: ${_param:gerrit_ldap_bind_password}
WEBURL: ${_param:gerrit_public_host}
+ HTTPD_LISTENURL: ${_param:gerrit_http_listen_url}
GERRIT_ADMIN_SSH_PUBLIC: ${_param:gerrit_admin_public_key}
GERRIT_ADMIN_PWD: ${_param:gerrit_admin_password}
GERRIT_ADMIN_EMAIL: ${_param:gerrit_admin_email}
CANLOADINIFRAME: "true"
+ JAVA_OPTIONS: ${_param:gerrit_extra_opts}
+ https_proxy: ${_param:docker_https_proxy}
+ http_proxy: ${_param:docker_http_proxy}
+ no_proxy: ${_param:docker_no_proxy}
db:
environment:
MYSQL_USER: gerrit
diff --git a/docker/swarm/stack/janitor_monkey.yml b/docker/swarm/stack/janitor_monkey.yml
index 95095e4..2e5698a 100644
--- a/docker/swarm/stack/janitor_monkey.yml
+++ b/docker/swarm/stack/janitor_monkey.yml
@@ -4,24 +4,37 @@
docker_image_mongodb: library/mongo:3.4
docker_mongodb_admin_username: admin
docker_mongodb_admin_password: password
- docker_image_janitor_monkey: docker-sandbox.sandbox.mirantis.net/vstoiko/oss/janitor_monkey:6040
+ docker_image_janitor_monkey: docker-prod-local.artifactory.mirantis.com/mirantis/oss/janitor-monkey
+ janitor_monkey_bind_host: cleanup-service-api
+ janitor_monkey_bind_port: 8080
+ janitor_monkey_ssl:
+ enabled: false
janitor_monkey_enabled: true
janitor_monkey_dryrun_mode: false
- janitor_monkey_base_url: http://${_param:haproxy_janitor_monkey_bind_host}:${_param:haproxy_janitor_monkey_bind_port}
- janitor_monkey_mongodb_host: ${_param:haproxy_mongodb_bind_host}
+ janitor_monkey_mongodb_host: cleanup-service-mongodb
janitor_monkey_mongodb_port: ${_param:haproxy_mongodb_bind_port}
+ mongodb_ssl:
+ enabled: false
+ janitor_monkey_base_url: http://${_param:janitor_monkey_mongodb_host}:${_param:janitor_monkey_mongodb_port}
janitor_monkey_mongodb_db: mcp_cloud
janitor_monkey_mongodb_username: janitor
janitor_monkey_mongodb_password: password
- janitor_monkey_elasticsearch: ${_param:haproxy_elasticsearch_bind_host}:${_param:haproxy_elasticsearch_binary_bind_port}
+ janitor_monkey_elasticsearch: ${_param:elasticsearch_bind_host}:${_param:elasticsearch_binary_bind_port}
janitor_monkey_cloudfire_region: RegionOne
janitor_monkey_cis_clustername: ${_param:elasticsearch_cluster_name}
+ janitor_monkey_instance_age_threshold: 15
+ janitor_monkey_notification_oss_url: http://${_param:haproxy_pushkin_bind_host}:${_param:haproxy_pushkin_bind_port}/post_notification_json
+ janitor_monkey_notification_oss_login_id: 12
+ janitor_monkey_notification_oss_application_id: 2
janitor_monkey_openstack:
project_domain_name: default
project_name: admin
- username: ""
- password: ""
- auth_url: ""
+ auth_url: http://yourcloud.com:5000/v3/auth/tokens
+ username: admin
+ password: password
+ ssl_verify: False
+ source_credentials: /srv/volumes/rundeck/storage/content/cis/openstack
+ service_credentials: /opt/os_creds
docker:
client:
stack:
@@ -47,8 +60,14 @@
simianarmy.client.cloudfire.secretKey: ${_param:janitor_monkey_openstack:password}
simianarmy.client.cloudfire.domain: ${_param:janitor_monkey_openstack:project_domain_name}
simianarmy.client.cloudfire.project: ${_param:janitor_monkey_openstack:project_name}
+ simianarmy.client.cloudfire.SSLVerify: ${_param:janitor_monkey_openstack:ssl_verify}
+ simianarmy.client.cloudfire.cafile: ${_param:janitor_monkey_openstack:service_credentials}/cert.pem
+ simianarmy.janitor.rule.stoppedInstanceRule.instanceAgeThreshold: ${_param:janitor_monkey_instance_age_threshold}
+ simianarmy.janitor.notification.oss.url: ${_param:janitor_monkey_notification_oss_url}
+ simianarmy.janitor.notification.oss.login_id: ${_param:janitor_monkey_notification_oss_login_id}
+ simianarmy.janitor.notification.oss.application_id: ${_param:janitor_monkey_notification_oss_application_id}
service:
- mongodb:
+ cleanup-service-mongodb:
image: ${_param:docker_image_mongodb}
deploy:
replicas: ${_param:docker_janitor_monkey_replicas}
@@ -58,11 +77,17 @@
- ${_param:haproxy_mongodb_exposed_port}:${_param:haproxy_mongodb_bind_port}
volumes:
- /srv/volumes/mongodb:/data/db
- api:
+ cleanup-service-api:
image: ${_param:docker_image_janitor_monkey}
deploy:
replicas: ${_param:docker_janitor_monkey_replicas}
restart_policy:
condition: any
ports:
- - ${_param:haproxy_janitor_monkey_exposed_port}:8080
+ - ${_param:haproxy_janitor_monkey_exposed_port}:${_param:janitor_monkey_bind_port}
+ volumes:
+ - ${_param:janitor_monkey_openstack:source_credentials}:${_param:janitor_monkey_openstack:service_credentials}:ro
+ network:
+ default:
+ external:
+ name: oss_backend
diff --git a/docker/swarm/stack/jenkins/master.yml b/docker/swarm/stack/jenkins/master.yml
index bc01e92..5f8de05 100644
--- a/docker/swarm/stack/jenkins/master.yml
+++ b/docker/swarm/stack/jenkins/master.yml
@@ -1,8 +1,11 @@
+classes:
+- system.docker
parameters:
_param:
- docker_image_jenkins: tcpcloud/jenkins:2.71
+ docker_image_jenkins: tcpcloud/jenkins:2.73
jenkins_master_extra_opts: ""
jenkins_master_executors_num: 4
+ jenkins_master_max_concurent_requests: 40
docker:
client:
stack:
@@ -10,8 +13,13 @@
service:
master:
environment:
+ JENKINS_HOME: /var/jenkins_home
JAVA_OPTS: " -server -XX:+AlwaysPreTouch -Xloggc:$JENKINS_HOME/gc-%t.log -XX:NumberOfGCLogFiles=5 -XX:+UseGCLogFileRotation -XX:GCLogFileSize=20m -XX:+PrintGC -XX:+PrintGCDateStamps -XX:+PrintGCDetails -XX:+PrintHeapAtGC -XX:+PrintGCCause -XX:+PrintTenuringDistribution -XX:+PrintReferenceGC -XX:+PrintAdaptiveSizePolicy -XX:+UseG1GC -XX:+ExplicitGCInvokesConcurrent -XX:+ParallelRefProcEnabled -XX:+UseStringDeduplication -XX:+UnlockExperimentalVMOptions -XX:G1NewSizePercent=20 -XX:+UnlockDiagnosticVMOptions -XX:G1SummarizeRSetStatsPeriod=1 -Djenkins.install.runSetupWizard=false -Dhudson.DNSMultiCast.disabled=true -Dhudson.udp=-1 -Dhudson.footerURL=https://www.mirantis.com ${_param:jenkins_master_extra_opts}"
JENKINS_NUM_EXECUTORS: ${_param:jenkins_master_executors_num}
+ JENKINS_OPTS: " --handlerCountMax=${_param:jenkins_master_max_concurent_requests}"
+ https_proxy: ${_param:docker_https_proxy}
+ http_proxy: ${_param:docker_http_proxy}
+ no_proxy: ${_param:docker_no_proxy}
deploy:
restart_policy:
condition: any
diff --git a/docker/swarm/stack/jenkins/slave.yml b/docker/swarm/stack/jenkins/slave.yml
index fc281b7..12a14d4 100644
--- a/docker/swarm/stack/jenkins/slave.yml
+++ b/docker/swarm/stack/jenkins/slave.yml
@@ -1,3 +1,5 @@
+classes:
+- system.docker
parameters:
_param:
docker_image_jenkins_slave: tcpcloud/jnlp-slave
@@ -7,6 +9,7 @@
jenkins_master_url: http://${_param:jenkins_master_host}:${_param:jenkins_master_port}
jenkins_slave_user: ${_param:jenkins_client_user}
jenkins_slave_password: ${_param:jenkins_client_password}
+ jenkins_slave_extra_opts: ""
docker:
client:
stack:
@@ -19,6 +22,10 @@
JENKINS_UPDATE_SLAVE: 'true'
JENKINS_LOGIN: ${_param:jenkins_slave_user}
JENKINS_PASSWORD: ${_param:jenkins_slave_password}
+ JAVA_OPTS: ${_param:jenkins_slave_extra_opts}
+ https_proxy: ${_param:docker_https_proxy}
+ http_proxy: ${_param:docker_http_proxy}
+ no_proxy: ${_param:docker_no_proxy}
deploy:
restart_policy:
condition: any
@@ -39,6 +46,10 @@
JENKINS_UPDATE_SLAVE: 'true'
JENKINS_LOGIN: ${_param:jenkins_slave_user}
JENKINS_PASSWORD: ${_param:jenkins_slave_password}
+ JAVA_OPTS: ${_param:jenkins_slave_extra_opts}
+ https_proxy: ${_param:docker_https_proxy}
+ http_proxy: ${_param:docker_http_proxy}
+ no_proxy: ${_param:docker_no_proxy}
deploy:
restart_policy:
condition: any
@@ -59,6 +70,10 @@
JENKINS_UPDATE_SLAVE: 'true'
JENKINS_LOGIN: ${_param:jenkins_slave_user}
JENKINS_PASSWORD: ${_param:jenkins_slave_password}
+ JAVA_OPTS: ${_param:jenkins_slave_extra_opts}
+ https_proxy: ${_param:docker_https_proxy}
+ http_proxy: ${_param:docker_http_proxy}
+ no_proxy: ${_param:docker_no_proxy}
deploy:
restart_policy:
condition: any
diff --git a/docker/swarm/stack/monitoring/init.yml b/docker/swarm/stack/monitoring/init.yml
index 97b9ac3..e274426 100644
--- a/docker/swarm/stack/monitoring/init.yml
+++ b/docker/swarm/stack/monitoring/init.yml
@@ -15,6 +15,22 @@
driver_opts:
encrypted: 1
service:
+ relay:
+ networks:
+ - monitoring
+ deploy:
+ replicas: 2
+ labels:
+ com.mirantis.monitoring: "relay"
+ restart_policy:
+ condition: any
+ labels:
+ com.mirantis.monitoring: "relay"
+ image: ${_param:docker_image_prometheus_relay}
+ ports:
+ - 15016:8080
+ environment:
+ PROMETHEUS_RELAY_DNS: 'tasks.monitoring_server'
remote_storage_adapter:
networks:
- monitoring
@@ -30,12 +46,13 @@
ports:
- 15015:${prometheus:remote_storage_adapter:bind:port}
environment:
- bind_port: ${prometheus:remote_storage_adapter:bind:port}
- bind_address: ${prometheus:remote_storage_adapter:bind:address}
- influxdb_url: ${_param:prometheus_influxdb_url}
- influxdb_db: ${_param:prometheus_influxdb_db}
- influxdb_username: ${_param:prometheus_influxdb_username}
- influxdb_password: ${_param:prometheus_influxdb_password}
+ RSA_BIND_PORT: ${prometheus:remote_storage_adapter:bind:port}
+ RSA_BIND_ADDRESS: ${prometheus:remote_storage_adapter:bind:address}
+ RSA_INFLUXDB_RETENTION_POLICY: 'lma'
+ RSA_INFLUXDB_URL: ${_param:prometheus_influxdb_url}
+ RSA_INFLUXDB_DB: ${_param:prometheus_influxdb_db}
+ RSA_INFLUXDB_USERNAME: ${_param:prometheus_influxdb_username}
+ RSA_INFLUXDB_PASSWORD: ${_param:prometheus_influxdb_password}
alertmanager:
networks:
- monitoring
@@ -54,11 +71,11 @@
- ${prometheus:alertmanager:dir:config}:${_param:prometheus_alertmanager_config_directory}
- ${prometheus:alertmanager:dir:data}:${_param:prometheus_alertmanager_data_directory}
environment:
- config_dir: ${_param:prometheus_alertmanager_config_directory}
- data_dir: ${_param:prometheus_alertmanager_data_directory}
- bind_port: ${prometheus:alertmanager:bind:port}
- bind_address: ${prometheus:alertmanager:bind:address}
- discovery_domain: 'monitoring_alertmanager'
+ ALERTMANAGER_CONFIG_DIR: ${_param:prometheus_alertmanager_config_directory}
+ ALERTMANAGER_DATA_DIR: ${_param:prometheus_alertmanager_data_directory}
+ ALERTMANAGER_BIND_PORT: ${prometheus:alertmanager:bind:port}
+ ALERTMANAGER_BIND_ADDRESS: ${prometheus:alertmanager:bind:address}
+ ALERTMANAGER_DISCOVERY_DOMAIN: 'monitoring_alertmanager'
pushgateway:
networks:
- monitoring
@@ -69,8 +86,8 @@
restart_policy:
condition: any
environment:
- bind_port: ${prometheus:pushgateway:bind:port}
- bind_address: ${prometheus:pushgateway:bind:address}
+ PUSHGATEWAY_BIND_PORT: ${prometheus:pushgateway:bind:port}
+ PUSHGATEWAY_BIND_ADDRESS: ${prometheus:pushgateway:bind:address}
labels:
com.mirantis.monitoring: "pushgateway"
image: ${_param:docker_image_pushgateway}
@@ -80,7 +97,7 @@
networks:
- monitoring
deploy:
- replicas: 1
+ replicas: 2
labels:
com.mirantis.monitoring: "prometheus"
restart_policy:
@@ -94,11 +111,11 @@
- ${prometheus:server:dir:config}:${_param:prometheus_server_config_directory}
- ${prometheus:server:dir:data}:${_param:prometheus_server_data_directory}
environment:
- config_dir: ${_param:prometheus_server_config_directory}
- data_dir: ${_param:prometheus_server_data_directory}
- bind_port: ${prometheus:server:bind:port}
- bind_address: ${prometheus:server:bind:address}
- storage_local_engine: ${prometheus:server:storage:local:engine}
- storage_local_retention: ${prometheus:server:storage:local:retention}
- storage_local_target_heap_size: ${prometheus:server:storage:local:target_heap_size}
- storage_local_num_fingerprint_mutexes: ${prometheus:server:storage:local:num_fingerprint_mutexes}
+ PROMETHEUS_CONFIG_DIR: ${_param:prometheus_server_config_directory}
+ PROMETHEUS_DATA_DIR: ${_param:prometheus_server_data_directory}
+ PROMETHEUS_BIND_PORT: ${prometheus:server:bind:port}
+ PROMETHEUS_BIND_ADDRESS: ${prometheus:server:bind:address}
+ PROMETHEUS_STORAGE_LOCAL_ENGINE: ${prometheus:server:storage:local:engine}
+ PROMETHEUS_STORAGE_LOCAL_RETENTION: ${prometheus:server:storage:local:retention}
+ PROMETHEUS_STORAGE_LOCAL_TARGET_HEAP_SIZE: ${prometheus:server:storage:local:target_heap_size}
+ PROMETHEUS_STORAGE_LOCAL_NUM_FINGERPRINT_MUTEXES: ${prometheus:server:storage:local:num_fingerprint_mutexes}
diff --git a/docker/swarm/stack/postgresql.yml b/docker/swarm/stack/postgresql.yml
index 7ae4052..42ebf8f 100644
--- a/docker/swarm/stack/postgresql.yml
+++ b/docker/swarm/stack/postgresql.yml
@@ -2,6 +2,10 @@
_param:
docker_postgresql_replicas: 1
docker_image_postgresql: library/postgres:9.6
+ postgresql_bind_host: postgresql-db
+ postgresql_bind_port: ${_param:haproxy_postgresql_bind_port}
+ postgresql_ssl:
+ enabled: false
postgresql_admin_user: postgres
postgresql_admin_user_password: postgrespassword
docker:
@@ -12,13 +16,17 @@
POSTGRES_USER: ${_param:postgresql_admin_user}
POSTGRES_PASSWORD: ${_param:postgresql_admin_user_password}
service:
- db:
+ postgresql-db:
image: ${_param:docker_image_postgresql}
deploy:
replicas: ${_param:docker_postgresql_replicas}
restart_policy:
condition: any
- ports:
- - ${_param:haproxy_postgresql_exposed_port}:${_param:haproxy_postgresql_bind_port}
volumes:
- /srv/volumes/postgresql/data:/var/lib/postgresql/data
+ ports:
+ - ${_param:haproxy_postgresql_exposed_port}:${_param:haproxy_postgresql_bind_port}
+ network:
+ default:
+ external:
+ name: oss_backend
\ No newline at end of file
diff --git a/docker/swarm/stack/pushkin.yml b/docker/swarm/stack/pushkin.yml
index dde8541..892b4f9 100644
--- a/docker/swarm/stack/pushkin.yml
+++ b/docker/swarm/stack/pushkin.yml
@@ -1,8 +1,20 @@
parameters:
_param:
docker_pushkin_replicas: 1
- docker_image_pushkin: docker-sandbox.sandbox.mirantis.net/vstoiko/oss/pushkin:latest
+ docker_image_pushkin: docker-prod-local.artifactory.mirantis.com/mirantis/oss/pushkin
+ pushkin_bind_host: pushkin-api
+ pushkin_bind_port: ${_param:haproxy_pushkin_bind_port}
+ pushkin_ssl:
+ enabled: false
pushkin_db: pushkin
+ pushkin_smtp_host: smtp.gmail.com
+ pushkin_smtp_port: 587
+ webhook_from: your_sender@mail.com
+ pushkin_email_sender_password: your_sender_password
+ webhook_recipients: "recepient1@mail.com,recepient2@mail.com"
+ webhook_login_id: 13
+ webhook_application_id: 24
+ webhook_sfdc_username: your_sfdc_username
docker:
client:
stack:
@@ -11,15 +23,18 @@
POSTGRES_USER: ${_param:pushkin_db_user}
POSTGRES_PASSWORD: ${_param:pushkin_db_user_password}
POSTGRES_DB: ${_param:pushkin_db}
- PUSHKINDBHOST: ${_param:pushkin_db_host}
- PUSHKINELASTICHOST: ${_param:haproxy_elasticsearch_bind_host}
+ PUSHKINDBHOST: ${_param:postgresql_bind_host}
+ PUSHKINELASTICHOST: ${_param:elasticsearch_bind_host}
WEBHOOK_FROM: ${_param:webhook_from}
+ EMAIL_SENDER_PASSWORD: ${_param:pushkin_email_sender_password}
+ SMTP_HOST: ${_param:pushkin_smtp_host}
+ SMTP_PORT: ${_param:pushkin_smtp_port}
WEBHOOK_RECIPIENTS: ${_param:webhook_recipients}
WEBHOOK_LOGIN_ID: ${_param:webhook_login_id}
WEBHOOK_APPLICATION_ID: ${_param:webhook_application_id}
WEBHOOK_SFDC_USERNAME: ${_param:webhook_sfdc_username}
service:
- api:
+ pushkin-api:
image: ${_param:docker_image_pushkin}
deploy:
replicas: ${_param:docker_pushkin_replicas}
@@ -28,4 +43,8 @@
ports:
- ${_param:haproxy_pushkin_exposed_port}:${_param:haproxy_pushkin_bind_port}
volumes:
- - /srv/volumes/pushkin/api:/var/log/pushkin
\ No newline at end of file
+ - /srv/volumes/pushkin/api:/var/log/pushkin
+ network:
+ default:
+ external:
+ name: oss_backend
diff --git a/docker/swarm/stack/rundeck.yml b/docker/swarm/stack/rundeck.yml
index 216415c..8ab0554 100644
--- a/docker/swarm/stack/rundeck.yml
+++ b/docker/swarm/stack/rundeck.yml
@@ -2,19 +2,23 @@
_param:
docker_rundeck_replicas: 1
docker_image_rundeck: docker-prod-local.artifactory.mirantis.com/mirantis/oss/rundeck:latest
+ rundeck_bind_host: rundeck-api
+ rundeck_bind_port: ${_param:haproxy_rundeck_bind_port}
+ rundeck_ssl:
+ enabled: false
docker:
client:
stack:
rundeck:
service:
- rundeck:
+ rundeck-api:
image: ${_param:docker_image_rundeck}
deploy:
replicas: ${_param:docker_rundeck_replicas}
restart_policy:
condition: any
ports:
- - 14440:4440
+ - ${_param:haproxy_rundeck_exposed_port}:${_param:haproxy_rundeck_bind_port}
volumes:
- /srv/volumes/rundeck/etc/framework.properties:/etc/rundeck/framework.properties
- /srv/volumes/rundeck/etc/tokens.properties:/etc/rundeck/tokens.properties
@@ -25,3 +29,7 @@
- /srv/volumes/rundeck/logs:/var/lib/rundeck/logs
- /srv/volumes/rundeck/plugins:/opt/rundeck-plugins
- /srv/volumes/rundeck/storage:/var/lib/rundeck/var/storage
+ network:
+ default:
+ external:
+ name: oss_backend
diff --git a/docker/swarm/stack/security_monkey.yml b/docker/swarm/stack/security_monkey.yml
index a2249c6..b5a1100 100644
--- a/docker/swarm/stack/security_monkey.yml
+++ b/docker/swarm/stack/security_monkey.yml
@@ -2,28 +2,36 @@
_param:
docker_security_monkey_api_replicas: 1
docker_security_monkey_scheduler_replicas: 1
- docker_image_security_monkey_api: docker-sandbox.sandbox.mirantis.net/vstoiko/oss/security-monkey-api:6700
- docker_image_security_monkey_scheduler: docker-sandbox.sandbox.mirantis.net/vstoiko/oss/security-monkey-scheduler:6700
+ docker_image_security_monkey_api: docker-prod-local.artifactory.mirantis.com/mirantis/oss/security-monkey-api
+ docker_image_security_monkey_scheduler: docker-prod-local.artifactory.mirantis.com/mirantis/oss/security-monkey-scheduler
+ security_monkey_bind_host: security-audit-api
+ security_monkey_bind_port: ${_param:haproxy_security_monkey_bind_port}
+ security_monkey_ssl:
+ enabled: false
security_monkey_db: secmonkey
- notification_service_url: http://${_param:haproxy_pushkin_bind_host}:${_param:haproxy_pushkin_bind_port}/post_notification_json
+ notification_service_url: http://${_param:pushkin_bind_host}:${_param:haproxy_pushkin_bind_port}/post_notification_json
security_monkey_user: devopsportal@devopsportal.local
security_monkey_password: devopsportal
security_monkey_role: Justify
- security_monkey_fqdn: ${_param:haproxy_security_monkey_bind_host}
- security_monkey_web_port: ${_param:haproxy_security_monkey_bind_port}
- security_monkey_api_port: ${_param:haproxy_security_monkey_bind_port}
- security_monkey_nginx_port: ${_param:haproxy_security_monkey_bind_port}
+ security_monkey_fqdn: ${_param:security_monkey_bind_host}
+ security_monkey_web_port: ${_param:security_monkey_bind_port}
+ security_monkey_api_port: ${_param:security_monkey_bind_port}
+ security_monkey_nginx_port: ${_param:security_monkey_bind_port}
devops_portal_sm_wtf_csrf_enabled: False
security_monkey_sync_interval: 15
security_monkey_openstack:
os_account_id: mcp_cloud
os_account_name: mcp_cloud
- username: ""
- password: ""
- auth_url: ""
+ auth_url: http://yourcloud.com:5000/v3/auth/tokens
+ username: admin
+ password: password
project_domain_name: Default
project_name: admin
user_domain_name: Default
+ source_credentials: /srv/volumes/rundeck/storage/content/cis/openstack
+ service_credentials: /opt/os_creds
+ endpoint_type: public
+ ssl_verify: False
docker:
client:
stack:
@@ -32,7 +40,7 @@
SECURITY_MONKEY_POSTGRES_USER: ${_param:secmonkey_db_user}
SECURITY_MONKEY_POSTGRES_PASSWORD: ${_param:secmonkey_db_user_password}
SECURITY_MONKEY_POSTGRES_HOST: ${_param:secmonkey_db_host}
- SECURITY_MONKEY_POSTGRES_PORT: ${_param:haproxy_postgresql_bind_port}
+ SECURITY_MONKEY_POSTGRES_PORT: ${_param:postgresql_bind_port}
SECURITY_MONKEY_FQDN: ${_param:security_monkey_fqdn}
WEB_PORT: ${_param:security_monkey_web_port}
API_PORT: ${_param:security_monkey_api_port}
@@ -48,13 +56,16 @@
OS_AUTH_URL: ${_param:security_monkey_openstack:auth_url}
OS_PROJECT_DOMAIN_NAME: ${_param:security_monkey_openstack:project_domain_name}
OS_PROJECT_NAME: ${_param:security_monkey_openstack:project_name}
+ OS_SSL_VERIFY: ${_param:security_monkey_openstack:ssl_verify}
+ OS_ENDPOINT_TYPE: ${_param:security_monkey_openstack:endpoint_type}
+ CACERT_PATH: ${_param:security_monkey_openstack:service_credentials}/cert.pem
USER_DOMAIN_NAME: ${_param:security_monkey_openstack:user_domain_name}
SM_WTF_CSRF_ENABLED: ${_param:devops_portal_sm_wtf_csrf_enabled}
SECURITY_MONKEY_SYNC_INTERVAL: ${_param:security_monkey_sync_interval}
SQLALCHEMY_DATABASE_URI: postgresql://${_param:secmonkey_db_user}:${_param:secmonkey_db_user_password}@${_param:secmonkey_db_host}:${_param:haproxy_postgresql_bind_port}/${_param:security_monkey_db}
SQLALCHEMY_POOL_RECYCLE: 14400
service:
- api:
+ security-audit-api:
image: ${_param:docker_image_security_monkey_api}
deploy:
replicas: ${_param:docker_security_monkey_api_replicas}
@@ -64,7 +75,8 @@
- ${_param:haproxy_security_monkey_exposed_port}:${_param:haproxy_security_monkey_bind_port}
volumes:
- /srv/volumes/security_monkey/logs:/var/log/security_monkey/logs
- scheduler:
+ - ${_param:security_monkey_openstack:source_credentials}:${_param:security_monkey_openstack:service_credentials}:ro
+ security-audit-scheduler:
image: ${_param:docker_image_security_monkey_scheduler}
deploy:
replicas: ${_param:docker_security_monkey_scheduler_replicas}
@@ -72,3 +84,8 @@
condition: any
volumes:
- /srv/volumes/security_monkey/logs:/var/log/security_monkey/logs
+ - ${_param:security_monkey_openstack:source_credentials}:${_param:security_monkey_openstack:service_credentials}:ro
+ network:
+ default:
+ external:
+ name: oss_backend
diff --git a/docker/swarm/worker.yml b/docker/swarm/worker.yml
index 643b207..4bed790 100644
--- a/docker/swarm/worker.yml
+++ b/docker/swarm/worker.yml
@@ -3,9 +3,11 @@
parameters:
_param:
docker_gwbridge_subnet: 10.20.0.0/16
+ docker_swarm_master_port: 2377
docker:
swarm:
role: worker
advertise_addr: ${_param:single_address}
master:
host: ${_param:cluster_node01_address}
+ port: ${_param:docker_swarm_master_port}
diff --git a/galera/server/database/barbican.yml b/galera/server/database/barbican.yml
new file mode 100644
index 0000000..4759439
--- /dev/null
+++ b/galera/server/database/barbican.yml
@@ -0,0 +1,15 @@
+parameters:
+ mysql:
+ server:
+ database:
+ barbican:
+ encoding: utf8
+ users:
+ - name: barbican
+ password: ${_param:mysql_barbican_password}
+ host: '%'
+ rights: all
+ - name: barbican
+ password: ${_param:mysql_barbican_password}
+ host: ${_param:cluster_vip_address}
+ rights: all
diff --git a/gerrit/client/project/ci.yml b/gerrit/client/project/ci.yml
index 86ff699..3e36556 100644
--- a/gerrit/client/project/ci.yml
+++ b/gerrit/client/project/ci.yml
@@ -1,11 +1,15 @@
parameters:
+ _param:
+ gerrit_pipeline_library_repo: https://github.com/Mirantis/pipeline-library
+ gerrit_mk_pipelines_repo: https://github.com/Mirantis/mk-pipelines
+ gerrit_decapod_pipelines_repo: https://github.com/mateuszlos/decapod-pipelines
gerrit:
client:
project:
mcp-ci/pipeline-library:
enabled: true
description: Jenkins pipeline libraries
- upstream: https://github.com/Mirantis/pipeline-library
+ upstream: ${_param:gerrit_pipeline_library_repo}
access: ${gerrit:client:default_access}
require_change_id: true
require_agreement: false
@@ -13,7 +17,7 @@
mk/mk-pipelines:
enabled: true
description: Jenkins pipelines
- upstream: https://github.com/Mirantis/mk-pipelines
+ upstream: ${_param:gerrit_mk_pipelines_repo}
access: ${gerrit:client:default_access}
require_change_id: true
require_agreement: false
@@ -21,7 +25,7 @@
mk/decapod-pipelines:
enabled: true
description: Decapod jenkins pipelines
- upstream: https://github.com/mateuszlos/decapod-pipelines
+ upstream: ${_param:gerrit_decapod_pipelines_repo}
access: ${gerrit:client:default_access}
require_change_id: true
require_agreement: false
diff --git a/glance/client/image/cirros.yml b/glance/client/image/cirros.yml
new file mode 100644
index 0000000..d9f3f33
--- /dev/null
+++ b/glance/client/image/cirros.yml
@@ -0,0 +1,22 @@
+classes:
+- system.glance.client
+parameters:
+ _param:
+ cirros_image_url: "http://apt.mirantis.com/images/cirros-x64-20170828.qcow2"
+ cirros_image_name: "cirros-0.3.0-x86_64"
+ glance:
+ client:
+ identity:
+ admin_identity:
+ endpoint_type: internalURL
+ image:
+ cirros:
+ name: ${_param:cirros_image_name}
+ location: ${_param:cirros_image_url}
+ import_from_format: 'qcow2'
+ container_format: 'bare'
+ disk_format: 'qcow2'
+ tags:
+ - 'cirros'
+ visibility: public
+ wait_timeout: 1000
diff --git a/glance/client/image/ubuntu_trusty.yml b/glance/client/image/ubuntu_trusty.yml
new file mode 100644
index 0000000..be9effc
--- /dev/null
+++ b/glance/client/image/ubuntu_trusty.yml
@@ -0,0 +1,23 @@
+classes:
+- system.glance.client
+parameters:
+ _param:
+ ubuntu_trusty_image_url: "http://apt.mirantis.com/images/ubuntu-14-04-x64-mcp1.1.qcow2"
+ ubuntu_trusty_image_name: "ubuntu-14-04-x64-mcp1.1"
+ glance:
+ client:
+ identity:
+ admin_identity:
+ endpoint_type: internalURL
+ image:
+ ubuntu_14_04_x64_mcp1.1:
+ name: ${_param:ubuntu_trusty_image_name}
+ location: ${_param:ubuntu_trusty_image_url}
+ import_from_format: 'qcow2'
+ container_format: 'bare'
+ disk_format: 'qcow2'
+ tags:
+ - 'ubuntu'
+ - 'trusty'
+ visibility: public
+ wait_timeout: 1000
diff --git a/glance/client/image/ubuntu_xenial.yml b/glance/client/image/ubuntu_xenial.yml
new file mode 100644
index 0000000..4206584
--- /dev/null
+++ b/glance/client/image/ubuntu_xenial.yml
@@ -0,0 +1,23 @@
+classes:
+- system.glance.client
+parameters:
+ _param:
+ ubuntu_xenial_image_url: "http://apt.mirantis.com/images/ubuntu-16-04-x64-mcp1.1.qcow2"
+ ubuntu_xenial_image_name: "ubuntu-16-04-amd64-cloudimg"
+ glance:
+ client:
+ identity:
+ admin_identity:
+ endpoint_type: internalURL
+ image:
+ ubuntu_16_04_amd64_cloudimg:
+ name: ${_param:ubuntu_xenial_image_name}
+ location: ${_param:ubuntu_xenial_image_url}
+ import_from_format: 'qcow2'
+ container_format: 'bare'
+ disk_format: 'qcow2'
+ tags:
+ - 'ubuntu'
+ - 'xenial'
+ visibility: public
+ wait_timeout: 1000
diff --git a/glance/control/cluster.yml b/glance/control/cluster.yml
index 6402721..bb87f16 100644
--- a/glance/control/cluster.yml
+++ b/glance/control/cluster.yml
@@ -4,6 +4,12 @@
- service.haproxy.proxy.single
- system.haproxy.proxy.listen.openstack.glance
parameters:
+ linux:
+ system:
+ package:
+ python-pymysql:
+ fromrepo: ${_param:openstack_version}
+ version: latest
glance:
server:
enabled: true
diff --git a/glance/control/single.yml b/glance/control/single.yml
index 458cd37..b285d38 100644
--- a/glance/control/single.yml
+++ b/glance/control/single.yml
@@ -1,6 +1,12 @@
classes:
- service.glance.control.single
parameters:
+ linux:
+ system:
+ package:
+ python-pymysql:
+ fromrepo: ${_param:openstack_version}
+ version: latest
glance:
server:
database:
diff --git a/glusterfs/client/volume/glance.yml b/glusterfs/client/volume/glance.yml
index ec593b9..e84ff06 100644
--- a/glusterfs/client/volume/glance.yml
+++ b/glusterfs/client/volume/glance.yml
@@ -13,3 +13,20 @@
user: glance
group: glance
opts: "defaults,backup-volfile-servers=${_param:glusterfs_node01_address}:${_param:glusterfs_node02_address}:${_param:glusterfs_node03_address}"
+ linux:
+ system:
+ user:
+ glance:
+ enabled: true
+ name: glance
+ uid: 302
+ gid: 302
+ home: /var/lib/glance
+ shell: /bin/false
+ system: True
+ group:
+ glance:
+ enabled: true
+ name: glance
+ gid: 302
+ system: True
diff --git a/glusterfs/client/volume/keystone.yml b/glusterfs/client/volume/keystone.yml
index 822b61f..39c5619 100644
--- a/glusterfs/client/volume/keystone.yml
+++ b/glusterfs/client/volume/keystone.yml
@@ -19,3 +19,20 @@
user: keystone
group: keystone
opts: "defaults,backup-volfile-servers=${_param:glusterfs_node01_address}:${_param:glusterfs_node02_address}:${_param:glusterfs_node03_address}"
+ linux:
+ system:
+ user:
+ keystone:
+ enabled: true
+ name: keystone
+ home: /var/lib/keystone
+ uid: 301
+ gid: 301
+ shell: /bin/false
+ system: True
+ group:
+ keystone:
+ enabled: true
+ name: keystone
+ gid: 301
+ system: True
diff --git a/glusterfs/client/volume/prometheus.yml b/glusterfs/client/volume/prometheus.yml
deleted file mode 100644
index 3fae59b..0000000
--- a/glusterfs/client/volume/prometheus.yml
+++ /dev/null
@@ -1,13 +0,0 @@
-parameters:
- _param:
- prometheus_glusterfs_service_host: ${_param:glusterfs_service_host}
- glusterfs_node01_address: ${_param:cluster_node01_address}
- glusterfs_node02_address: ${_param:cluster_node02_address}
- glusterfs_node03_address: ${_param:cluster_node03_address}
- glusterfs:
- client:
- volumes:
- prometheus:
- path: /srv/volumes/prometheus
- server: ${_param:prometheus_glusterfs_service_host}
- opts: "defaults,backup-volfile-servers=${_param:glusterfs_node01_address}:${_param:glusterfs_node02_address}:${_param:glusterfs_node03_address}"
diff --git a/glusterfs/server/volume/glance.yml b/glusterfs/server/volume/glance.yml
index 8276a44..0f54219 100644
--- a/glusterfs/server/volume/glance.yml
+++ b/glusterfs/server/volume/glance.yml
@@ -14,4 +14,4 @@
nfs.disable: On
network.remote-dio: On
diagnostics.client-log-level: WARNING
- diagnostics.brick-log-level: WARNING
\ No newline at end of file
+ diagnostics.brick-log-level: WARNING
diff --git a/glusterfs/server/volume/prometheus.yml b/glusterfs/server/volume/prometheus.yml
deleted file mode 100644
index 144847a..0000000
--- a/glusterfs/server/volume/prometheus.yml
+++ /dev/null
@@ -1,17 +0,0 @@
-parameters:
- glusterfs:
- server:
- volumes:
- prometheus:
- storage: /srv/glusterfs/prometheus
- replica: 3
- bricks:
- - ${_param:cluster_node01_address}:/srv/glusterfs/prometheus
- - ${_param:cluster_node02_address}:/srv/glusterfs/prometheus
- - ${_param:cluster_node03_address}:/srv/glusterfs/prometheus
- options:
- cluster.readdir-optimize: On
- nfs.disable: On
- network.remote-dio: On
- diagnostics.client-log-level: WARNING
- diagnostics.brick-log-level: WARNING
diff --git a/haproxy/proxy/listen/cicd/aptly.yml b/haproxy/proxy/listen/cicd/aptly.yml
index fb24c1f..35ae3d6 100644
--- a/haproxy/proxy/listen/cicd/aptly.yml
+++ b/haproxy/proxy/listen/cicd/aptly.yml
@@ -14,6 +14,9 @@
- httpclose
- httplog
balance: source
+ timeout:
+ server: 10m
+ client: 10m
binds:
- address: ${_param:haproxy_aptly_api_bind_host}
port: ${_param:haproxy_aptly_api_bind_port}
diff --git a/haproxy/proxy/listen/cicd/artifactory.yml b/haproxy/proxy/listen/cicd/artifactory.yml
index 5bf9bda..349d998 100644
--- a/haproxy/proxy/listen/cicd/artifactory.yml
+++ b/haproxy/proxy/listen/cicd/artifactory.yml
@@ -12,7 +12,7 @@
mode: http
options:
- forwardfor
- - httpchk
+# - httpchk
- httpclose
- httplog
balance: source
diff --git a/haproxy/proxy/listen/cicd/gerrit.yml b/haproxy/proxy/listen/cicd/gerrit.yml
index 51d494b..3ee21b1 100644
--- a/haproxy/proxy/listen/cicd/gerrit.yml
+++ b/haproxy/proxy/listen/cicd/gerrit.yml
@@ -13,7 +13,7 @@
mode: http
options:
- forwardfor
- - httpchk
+# - httpchk
- httpclose
- httplog
balance: source
diff --git a/haproxy/proxy/listen/docker/visualizer.yml b/haproxy/proxy/listen/docker/visualizer.yml
index 409815c..6fec3ba 100644
--- a/haproxy/proxy/listen/docker/visualizer.yml
+++ b/haproxy/proxy/listen/docker/visualizer.yml
@@ -8,7 +8,7 @@
mode: http
options:
- forwardfor
- - httpchk
+# - httpchk
- httpclose
- httplog
balance: source
diff --git a/haproxy/proxy/listen/opencontrail/tor.yml b/haproxy/proxy/listen/opencontrail/tor.yml
new file mode 100644
index 0000000..0595ccd
--- /dev/null
+++ b/haproxy/proxy/listen/opencontrail/tor.yml
@@ -0,0 +1,19 @@
+parameters:
+ haproxy:
+ proxy:
+ listen:
+ contrail_tor01:
+ type: contrail-tor
+ service_name: contrail
+ binds:
+ - address: ${_param:cluster_vip_address}
+ port: 6631
+ servers:
+ - name: sw01
+ host: ${_param:cluster_node01_address}
+ port: 6632
+ params: check
+ - name: sw02
+ host: ${_param:cluster_node02_address}
+ port: 6632
+ params: check backup
diff --git a/haproxy/proxy/listen/openstack/barbican.yml b/haproxy/proxy/listen/openstack/barbican.yml
new file mode 100644
index 0000000..04251d9
--- /dev/null
+++ b/haproxy/proxy/listen/openstack/barbican.yml
@@ -0,0 +1,42 @@
+parameters:
+ haproxy:
+ proxy:
+ listen:
+ barbican-api:
+ type: openstack-service
+ service_name: barbican
+ binds:
+ - address: ${_param:cluster_vip_address}
+ port: 9311
+ servers:
+ - name: ctl01
+ host: ${_param:cluster_node01_address}
+ port: 9311
+ params: check inter 10s fastinter 2s downinter 3s rise 3 fall 3
+ - name: ctl02
+ host: ${_param:cluster_node02_address}
+ port: 9311
+ params: check inter 10s fastinter 2s downinter 3s rise 3 fall 3
+ - name: ctl03
+ host: ${_param:cluster_node03_address}
+ port: 9311
+ params: check inter 10s fastinter 2s downinter 3s rise 3 fall 3
+ barbican-admin-api:
+ type: openstack-service
+ service_name: barbican
+ binds:
+ - address: ${_param:cluster_vip_address}
+ port: 9312
+ servers:
+ - name: ctl01
+ host: ${_param:cluster_node01_address}
+ port: 9312
+ params: check inter 10s fastinter 2s downinter 3s rise 3 fall 3
+ - name: ctl02
+ host: ${_param:cluster_node02_address}
+ port: 9312
+ params: check inter 10s fastinter 2s downinter 3s rise 3 fall 3
+ - name: ctl03
+ host: ${_param:cluster_node03_address}
+ port: 9312
+ params: check inter 10s fastinter 2s downinter 3s rise 3 fall 3
\ No newline at end of file
diff --git a/haproxy/proxy/listen/openstack/nova.yml b/haproxy/proxy/listen/openstack/nova.yml
index 3865a82..efffee0 100644
--- a/haproxy/proxy/listen/openstack/nova.yml
+++ b/haproxy/proxy/listen/openstack/nova.yml
@@ -2,26 +2,6 @@
haproxy:
proxy:
listen:
- nova_ec2_api:
- type: general-service
- service_name: nova
- check: false
- binds:
- - address: ${_param:cluster_vip_address}
- port: 8773
- servers:
- - name: ctl01
- host: ${_param:cluster_node01_address}
- port: 8773
- params: check
- - name: ctl02
- host: ${_param:cluster_node02_address}
- port: 8773
- params: check
- - name: ctl03
- host: ${_param:cluster_node03_address}
- port: 8773
- params: check
nova_api:
type: openstack-service
service_name: nova
diff --git a/haproxy/proxy/listen/oss/rundeck.yml b/haproxy/proxy/listen/oss/rundeck.yml
index fbabb38..120a9ea 100644
--- a/haproxy/proxy/listen/oss/rundeck.yml
+++ b/haproxy/proxy/listen/oss/rundeck.yml
@@ -2,6 +2,7 @@
_param:
haproxy_rundeck_bind_host: ${_param:haproxy_bind_address}
haproxy_rundeck_bind_port: 4440
+ haproxy_rundeck_exposed_port: 14440
haproxy_rundeck_ssl:
enabled: false
haproxy:
@@ -25,13 +26,13 @@
servers:
- name: ${_param:cluster_node01_name}
host: ${_param:cluster_node01_address}
- port: 14440
+ port: ${_param:haproxy_rundeck_exposed_port}
params: check
- name: ${_param:cluster_node02_name}
host: ${_param:cluster_node02_address}
- port: 14440
+ port: ${_param:haproxy_rundeck_exposed_port}
params: backup check
- name: ${_param:cluster_node03_name}
host: ${_param:cluster_node03_address}
- port: 14440
+ port: ${_param:haproxy_rundeck_exposed_port}
params: backup check
diff --git a/haproxy/proxy/listen/radosgw.yml b/haproxy/proxy/listen/radosgw.yml
index 369306b..ecdeb6b 100644
--- a/haproxy/proxy/listen/radosgw.yml
+++ b/haproxy/proxy/listen/radosgw.yml
@@ -19,8 +19,8 @@
- name: ${_param:cluster_node02_hostname}
host: ${_param:cluster_node02_address}
port: ${_param:haproxy_radosgw_source_port}
- params: backup check
+ params: check
- name: ${_param:cluster_node03_hostname}
host: ${_param:cluster_node03_address}
port: ${_param:haproxy_radosgw_source_port}
- params: backup check
+ params: check
diff --git a/haproxy/proxy/listen/stacklight/influxdb_relay.yml b/haproxy/proxy/listen/stacklight/influxdb_relay.yml
new file mode 100644
index 0000000..bb3dd81
--- /dev/null
+++ b/haproxy/proxy/listen/stacklight/influxdb_relay.yml
@@ -0,0 +1,53 @@
+parameters:
+ _param:
+ cluster_influxdb_port: 8086
+ haproxy:
+ proxy:
+ listen:
+ influxdb_relay:
+ mode: http
+ format: end
+ binds:
+ - address: ${_param:cluster_vip_address}
+ port: ${_param:cluster_influxdb_port}
+ acls:
+ - name: influxdb
+ conditions:
+ - type: path_beg
+ condition: /query
+ # InfluxDB backends for read requests
+ options:
+ - "httpchk GET /ping"
+ - httplog
+ - dontlog-normal
+ servers:
+ - name: ${_param:cluster_node01_hostname}
+ host: ${_param:cluster_node01_address}
+ port: 8086
+ params: 'check'
+ - name: ${_param:cluster_node02_hostname}
+ host: ${_param:cluster_node02_address}
+ port: 8086
+ params: 'check'
+ - name: ${_param:cluster_node03_hostname}
+ host: ${_param:cluster_node03_address}
+ port: 8086
+ params: 'check'
+ options:
+ - "httpchk GET /ping"
+ - httplog
+ - dontlog-normal
+ # InfluxDB relay backends for write requests
+ servers:
+ - name: ${_param:cluster_node01_hostname}
+ host: ${_param:cluster_node01_address}
+ port: 9096
+ params: 'check'
+ - name: ${_param:cluster_node02_hostname}
+ host: ${_param:cluster_node02_address}
+ port: 9096
+ params: 'check'
+ - name: ${_param:cluster_node03_hostname}
+ host: ${_param:cluster_node03_address}
+ port: 9096
+ params: 'check'
diff --git a/heat/server/cluster.yml b/heat/server/cluster.yml
index ee5df33..8e38f4f 100644
--- a/heat/server/cluster.yml
+++ b/heat/server/cluster.yml
@@ -6,6 +6,12 @@
parameters:
_param:
cluster_public_protocol: https
+ linux:
+ system:
+ package:
+ python-pymysql:
+ fromrepo: ${_param:openstack_version}
+ version: latest
heat:
server:
stack_domain_admin:
diff --git a/heat/server/single.yml b/heat/server/single.yml
index d097605..cd548bf 100644
--- a/heat/server/single.yml
+++ b/heat/server/single.yml
@@ -1,6 +1,12 @@
classes:
- service.heat.server.single
parameters:
+ linux:
+ system:
+ package:
+ python-pymysql:
+ fromrepo: ${_param:openstack_version}
+ version: latest
heat:
server:
stack_domain_admin:
diff --git a/helm/analytics_pipeline/hdfs.yml b/helm/analytics_pipeline/hdfs.yml
new file mode 100644
index 0000000..64e0cef
--- /dev/null
+++ b/helm/analytics_pipeline/hdfs.yml
@@ -0,0 +1,15 @@
+parameters:
+ _param:
+ analytics_hdfs_release: ${_param:analytics_release_prefix}hdfs
+ analytics_hdfs_address: hdfs-namenode-${_param:analytics_hdfs_release}-0.hdfs-namenode-${_param:analytics_hdfs_release}
+ helm:
+ client:
+ releases:
+ analytics-pipeline-hdfs:
+ enabled: ${_param:analytics_enabled}
+ name: ${_param:analytics_hdfs_release}
+ chart: ${_param:analytics_repo}/hdfs
+ values:
+ datanode:
+ replicas: 3
+ antiAffinity: soft
diff --git a/helm/analytics_pipeline/init.yml b/helm/analytics_pipeline/init.yml
new file mode 100644
index 0000000..f994efa
--- /dev/null
+++ b/helm/analytics_pipeline/init.yml
@@ -0,0 +1,19 @@
+classes:
+- system.helm.analytics_pipeline.zookeeper
+- system.helm.analytics_pipeline.kafka
+- system.helm.analytics_pipeline.spark
+- system.helm.analytics_pipeline.hdfs
+- system.helm.analytics_pipeline.tweepub
+- system.helm.analytics_pipeline.tweetics
+- system.helm.analytics_pipeline.tweeviz
+- service.helm.client
+parameters:
+ _param:
+ analytics_enabled: true
+ analytics_repo: mirantisworkloads
+ analytics_release_prefix: analytics-pipeline-
+ analytics_kafka_replicas: 3
+ helm:
+ client:
+ repos:
+ mirantisworkloads: https://mirantisworkloads.storage.googleapis.com/
diff --git a/helm/analytics_pipeline/kafka.yml b/helm/analytics_pipeline/kafka.yml
new file mode 100644
index 0000000..3c88299
--- /dev/null
+++ b/helm/analytics_pipeline/kafka.yml
@@ -0,0 +1,17 @@
+parameters:
+ _param:
+ analytics_kafka_release: ${_param:analytics_release_prefix}kafka
+ analytics_kafka_address: kafka-${_param:analytics_kafka_release}-0.kafka-${_param:analytics_kafka_release}:9092,kafka-${_param:analytics_kafka_release}-1.kafka-${_param:analytics_kafka_release}:9092,kafka-${_param:analytics_kafka_release}-2.kafka-${_param:analytics_kafka_release}:9092
+ helm:
+ client:
+ releases:
+ analytics-pipeline-kafka:
+ enabled: ${_param:analytics_enabled}
+ name: ${_param:analytics_kafka_release}
+ chart: ${_param:analytics_repo}/kafka
+ values:
+ replicas: ${_param:analytics_kafka_replicas}
+ antiAffinity: soft
+ zookeeper:
+ deployChart: false
+ externalAddress: ${_param:analytics_zookeeper_address}
diff --git a/helm/analytics_pipeline/spark.yml b/helm/analytics_pipeline/spark.yml
new file mode 100644
index 0000000..aeb2856
--- /dev/null
+++ b/helm/analytics_pipeline/spark.yml
@@ -0,0 +1,20 @@
+parameters:
+ _param:
+ analytics_spark_release: ${_param:analytics_release_prefix}spark
+ analytics_spark_address: spark-master-${_param:analytics_spark_release}-0.spark-master-${_param:analytics_spark_release}:7077,spark-master-${_param:analytics_spark_release}-1.spark-master-${_param:analytics_spark_release}:7077
+ helm:
+ client:
+ releases:
+ analytics-pipeline-spark:
+ enabled: ${_param:analytics_enabled}
+ name: ${_param:analytics_spark_release}
+ chart: ${_param:analytics_repo}/spark
+ values:
+ spark:
+ master:
+ replicas: 1
+ worker:
+ replicas: 3
+ zookeeper:
+ deployChart: false
+ externalAddress: ${_param:analytics_zookeeper_address}
diff --git a/helm/analytics_pipeline/tweepub.yml b/helm/analytics_pipeline/tweepub.yml
new file mode 100644
index 0000000..42678a3
--- /dev/null
+++ b/helm/analytics_pipeline/tweepub.yml
@@ -0,0 +1,23 @@
+parameters:
+ _param:
+ analytics_tweepub_release: ${_param:analytics_release_prefix}tweepub
+ helm:
+ client:
+ releases:
+ analytics-pipeline-tweepub:
+ enabled: ${_param:analytics_enabled}
+ name: ${_param:analytics_tweepub_release}
+ chart: ${_param:analytics_repo}/tweepub
+ values:
+ twitter:
+ appKey: ${_param:analytics_twitter_app_key}
+ appSecret: ${_param:analytics_twitter_app_secret}
+ tokenKey: ${_param:analytics_twitter_token_key}
+ tokenSecret: ${_param:analytics_twitter_token_secret}
+
+ # San Francisco, Boston, New York
+ locations: -71.4415,41.9860,-70.4747,42.9041,-122.75,36.8,-121.75,37.8,-74,40,-73,41
+ kafka:
+ deployChart: false
+ externalAddress: ${_param:analytics_kafka_address}
+ topic: twitter-stream
diff --git a/helm/analytics_pipeline/tweetics.yml b/helm/analytics_pipeline/tweetics.yml
new file mode 100644
index 0000000..de438bf
--- /dev/null
+++ b/helm/analytics_pipeline/tweetics.yml
@@ -0,0 +1,27 @@
+parameters:
+ _param:
+ analytics_tweetics_release: ${_param:analytics_release_prefix}tweetics
+ helm:
+ client:
+ releases:
+ analytics-pipeline-tweetics:
+ enabled: ${_param:analytics_enabled}
+ name: ${_param:analytics_tweetics_release}
+ chart: ${_param:analytics_repo}/tweetics
+ values:
+ minHashtagCounts: 0
+ zookeeper:
+ deployChart: false
+ externalAddress: ${_param:analytics_zookeeper_address}
+ kafka:
+ deployChart: false
+ externalAddress: ${_param:analytics_kafka_address}
+ topic: twitter-stream
+ spark:
+ deployChart: false
+ externalAddress: ${_param:analytics_spark_address}
+ storage: hdfs
+ hdfs:
+ deployChart: false
+ externalAddress: ${_param:analytics_hdfs_address}
+ path: /twitter
diff --git a/helm/analytics_pipeline/tweeviz.yml b/helm/analytics_pipeline/tweeviz.yml
new file mode 100644
index 0000000..d8f7aef
--- /dev/null
+++ b/helm/analytics_pipeline/tweeviz.yml
@@ -0,0 +1,19 @@
+parameters:
+ _param:
+ analytics_tweeviz_release: ${_param:analytics_release_prefix}tweeviz
+ helm:
+ client:
+ releases:
+ analytics-pipeline-tweeviz:
+ enabled: ${_param:analytics_enabled}
+ name: ${_param:analytics_tweeviz_release}
+ chart: ${_param:analytics_repo}/tweeviz
+ values:
+ minPopularity: 1
+ topListSize: 25
+ storage: hdfs
+ hdfs:
+ deployChart: false
+ externalAddress: ${_param:analytics_hdfs_address}
+ path: /
+ externalPort: 8020
diff --git a/helm/analytics_pipeline/zookeeper.yml b/helm/analytics_pipeline/zookeeper.yml
new file mode 100644
index 0000000..698510d
--- /dev/null
+++ b/helm/analytics_pipeline/zookeeper.yml
@@ -0,0 +1,14 @@
+parameters:
+ _param:
+ analytics_zookeeper_release: ${_param:analytics_release_prefix}zookeeper
+ analytics_zookeeper_address: zk-${_param:analytics_zookeeper_release}-0.zk-${_param:analytics_zookeeper_release}:2181,zk-${_param:analytics_zookeeper_release}-1.zk-${_param:analytics_zookeeper_release}:2181,zk-${_param:analytics_zookeeper_release}-2.zk-${_param:analytics_zookeeper_release}:2181
+ helm:
+ client:
+ releases:
+ analytics-pipeline-zookeeper:
+ enabled: ${_param:analytics_enabled}
+ name: ${_param:analytics_zookeeper_release}
+ chart: ${_param:analytics_repo}/zookeeper
+ values:
+ replicas: 3
+ antiAffinity: soft
diff --git a/influxdb/client/database/ceilometer.yml b/influxdb/client/database/ceilometer.yml
index 52aebae..88d6a07 100644
--- a/influxdb/client/database/ceilometer.yml
+++ b/influxdb/client/database/ceilometer.yml
@@ -8,7 +8,7 @@
enabled: true
name: ceilometer
retention_policy:
- - name: ceilometer_default
+ - name: ceilometer
is_default: true
duration: ${_param:influxdb_ceilometer_rp_duration}
replication: 1
diff --git a/influxdb/client/database/prometheus.yml b/influxdb/client/database/prometheus.yml
new file mode 100644
index 0000000..991fbd2
--- /dev/null
+++ b/influxdb/client/database/prometheus.yml
@@ -0,0 +1,25 @@
+parameters:
+ _param:
+ influxdb_prometheus_rp_duration: 30d
+ influxdb:
+ client:
+ database:
+ prometheus:
+ enabled: true
+ name: prometheus
+ retention_policy:
+ - name: lma
+ is_default: true
+ duration: ${_param:influxdb_prometheus_rp_duration}
+ replication: 1
+ user:
+ lma:
+ enabled: true
+ name: lma
+ password: ${_param:influxdb_stacklight_password}
+ grant:
+ lma_all_on_prometheus:
+ enabled: true
+ user: lma
+ database: prometheus
+ privilege: all
diff --git a/influxdb/client/database/stacklight.yml b/influxdb/client/database/stacklight.yml
index d07d0b8..76b8e60 100644
--- a/influxdb/client/database/stacklight.yml
+++ b/influxdb/client/database/stacklight.yml
@@ -8,9 +8,9 @@
enabled: true
name: lma
retention_policy:
- - name: lma_default
+ - name: lma
is_default: true
- duration: ${_param:influxdb_stacklight_password}
+ duration: ${_param:influxdb_stacklight_rp_duration}
replication: 1
user:
lma:
@@ -18,7 +18,7 @@
name: lma
password: ${_param:influxdb_stacklight_password}
grant:
- lma_all:
+ lma_all_on_lma:
enabled: true
user: lma
database: lma
diff --git a/influxdb/database/prometheus.yml b/influxdb/database/prometheus.yml
new file mode 100644
index 0000000..3e3d63b
--- /dev/null
+++ b/influxdb/database/prometheus.yml
@@ -0,0 +1,25 @@
+parameters:
+ _param:
+ influxdb_prometheus_database_retention: 30d
+ influxdb:
+ server:
+ database:
+ prometheus:
+ enabled: true
+ name: prometheus
+ retention_policy:
+ - name: lma
+ is_default: true
+ duration: ${_param:influxdb_prometheus_database_retention}
+ replication: 1
+ user:
+ lma:
+ enabled: true
+ name: lma
+ password: ${_param:influxdb_stacklight_password}
+ grant:
+ grant_lma_all_on_prometheus:
+ enabled: true
+ user: lma
+ database: prometheus
+ privilege: all
diff --git a/influxdb/database/stacklight.yml b/influxdb/database/stacklight.yml
index d741380..9eb2eb0 100644
--- a/influxdb/database/stacklight.yml
+++ b/influxdb/database/stacklight.yml
@@ -1,4 +1,6 @@
parameters:
+ _param:
+ influxdb_lma_database_retention: 30d
influxdb:
server:
database:
@@ -8,7 +10,7 @@
retention_policy:
- name: lma
is_default: true
- duration: 30d
+ duration: ${_param:influxdb_lma_database_retention}
replication: 1
user:
lma:
@@ -16,7 +18,7 @@
name: lma
password: ${_param:influxdb_stacklight_password}
grant:
- grant_lma_all:
+ grant_lma_all_on_lma:
enabled: true
user: lma
database: lma
diff --git a/influxdb/relay/cluster.yml b/influxdb/relay/cluster.yml
new file mode 100644
index 0000000..03639e1
--- /dev/null
+++ b/influxdb/relay/cluster.yml
@@ -0,0 +1,2 @@
+classes:
+- service.influxdb.relay.cluster
diff --git a/ironic/api/cluster.yml b/ironic/api/cluster.yml
index c3a7901..5522f3f 100644
--- a/ironic/api/cluster.yml
+++ b/ironic/api/cluster.yml
@@ -1,6 +1,12 @@
classes:
- service.ironic.api.cluster
parameters:
+ linux:
+ system:
+ package:
+ python-pymysql:
+ fromrepo: ${_param:openstack_version}
+ version: latest
ironic:
api:
enabled: true
diff --git a/ironic/api/single.yml b/ironic/api/single.yml
index 0800579..ed73e90 100644
--- a/ironic/api/single.yml
+++ b/ironic/api/single.yml
@@ -1,6 +1,12 @@
classes:
- service.ironic.api.single
parameters:
+ linux:
+ system:
+ package:
+ python-pymysql:
+ fromrepo: ${_param:openstack_version}
+ version: latest
ironic:
api:
bind:
diff --git a/ironic/conductor/cluster.yml b/ironic/conductor/cluster.yml
index ba0c538..063719c 100644
--- a/ironic/conductor/cluster.yml
+++ b/ironic/conductor/cluster.yml
@@ -1,6 +1,12 @@
classes:
- service.ironic.conductor.cluster
parameters:
+ linux:
+ system:
+ package:
+ python-pymysql:
+ fromrepo: ${_param:openstack_version}
+ version: latest
ironic:
conductor:
api_url: 'http://${_param:cluster_baremetal_vip_address}:6385'
diff --git a/ironic/conductor/single.yml b/ironic/conductor/single.yml
index 69e6c20..d827129 100644
--- a/ironic/conductor/single.yml
+++ b/ironic/conductor/single.yml
@@ -1,6 +1,12 @@
classes:
- service.ironic.conductor.single
parameters:
+ linux:
+ system:
+ package:
+ python-pymysql:
+ fromrepo: ${_param:openstack_version}
+ version: latest
ironic:
conductor:
enabled: true
diff --git a/jenkins/client/approved_scripts.yml b/jenkins/client/approved_scripts.yml
index 5d9a140..4e3d1d1 100644
--- a/jenkins/client/approved_scripts.yml
+++ b/jenkins/client/approved_scripts.yml
@@ -12,6 +12,8 @@
- method groovy.json.JsonSlurperClassic parseText java.lang.String
- method groovy.lang.GString getBytes
- method groovy.lang.GroovyObject getProperty java.lang.String
+ - method groovy.util.Node attributes
+ - method groovy.util.XmlParser parse java.io.File
- method hudson.PluginManager getPlugins
- method hudson.PluginWrapper getShortName
- method hudson.model.Item getName
@@ -68,6 +70,7 @@
- new groovy.json.JsonBuilder
- new groovy.json.JsonBuilder java.lang.Object
- new groovy.json.JsonSlurperClassic
+ - new groovy.util.XmlParser
- new java.io.File java.lang.String
- new java.io.IOException java.lang.String
- new java.io.OutputStreamWriter java.io.OutputStream
@@ -82,6 +85,7 @@
- new java.util.HashMap
- staticField groovy.io.FileType FILES
- staticMethod com.cloudbees.plugins.credentials.CredentialsProvider lookupCredentials java.lang.Class hudson.model.ItemGroup
+ - staticMethod java.lang.Double parseDouble java.lang.String
- staticMethod java.lang.Integer valueOf int
- staticMethod java.lang.Integer valueOf java.lang.String
- staticMethod java.lang.Math min int int
@@ -122,3 +126,8 @@
- staticMethod org.codehaus.groovy.runtime.DefaultGroovyMethods getAt java.lang.Object java.lang.String
- method java.io.File listFiles
- method java.lang.String concat java.lang.String
+ - method org.jenkinsci.plugins.workflow.steps.FlowInterruptedException getCauses
+ - method org.jenkinsci.plugins.workflow.support.steps.build.RunWrapper getRawBuild
+ - method hudson.model.Actionable getAction java.lang.Class
+ - staticMethod org.codehaus.groovy.runtime.DefaultGroovyMethods toSorted java.lang.Iterable
+ - staticMethod org.codehaus.groovy.runtime.DefaultGroovyMethods intersect java.util.List java.lang.Iterable
diff --git a/jenkins/client/init.yml b/jenkins/client/init.yml
index b37c48f..7d87ffe 100644
--- a/jenkins/client/init.yml
+++ b/jenkins/client/init.yml
@@ -16,7 +16,6 @@
username: ${_param:jenkins_client_user}
password: ${_param:jenkins_client_password}
plugin:
- ansicolor: {}
artifactory: {}
build-blocker-plugin: {}
build-monitor-plugin: {}
@@ -39,7 +38,6 @@
simple-theme-plugin: {}
slack: {}
test-stability: {}
- timestamper: {}
workflow-cps: {}
workflow-remote-loader: {}
workflow-scm-step:
diff --git a/jenkins/client/job/aptly.yml b/jenkins/client/job/aptly.yml
index c6a5755..256c04a 100644
--- a/jenkins/client/job/aptly.yml
+++ b/jenkins/client/job/aptly.yml
@@ -75,6 +75,9 @@
RECREATE:
type: boolean
default: 'false'
+ DUMP_PUBLISH:
+ type: boolean
+ default: 'true'
DIFF_ONLY:
type: boolean
default: '{{diff_only}}'
diff --git a/jenkins/client/job/ceph/init.yml b/jenkins/client/job/ceph/init.yml
new file mode 100644
index 0000000..06dc5eb
--- /dev/null
+++ b/jenkins/client/job/ceph/init.yml
@@ -0,0 +1,3 @@
+classes:
+- system.jenkins.client.job.ceph.remove-osd
+- system.jenkins.client.job.ceph.weights
diff --git a/jenkins/client/job/ceph/remove-osd.yml b/jenkins/client/job/ceph/remove-osd.yml
new file mode 100644
index 0000000..448318a
--- /dev/null
+++ b/jenkins/client/job/ceph/remove-osd.yml
@@ -0,0 +1,43 @@
+parameters:
+ jenkins:
+ client:
+ job:
+ ceph-remove-osd:
+ type: workflow-scm
+ concurrent: true
+ display_name: "Ceph - remove OSD"
+ discard:
+ build:
+ keep_num: 50
+ scm:
+ type: git
+ url: "${_param:jenkins_gerrit_url}/mk/mk-pipelines"
+ credentials: "gerrit"
+ script: ceph-remove-osd.groovy
+ param:
+ # general parameters
+ SALT_MASTER_URL:
+ type: string
+ description: URL of Salt master
+ default: "http://${_param:salt_master_host}:6969"
+ SALT_MASTER_CREDENTIALS:
+ type: string
+ description: Credentials for login to Salt API
+ default: salt
+ HOST:
+ type: string
+ description: OSDs on this HOST will be removed from cluster
+ OSD:
+ type: string
+ description: These OSDs at HOST will be removed (comma-separated list)
+ default: '*'
+ ADMIN_HOST:
+ type: string
+ description: Host with admin keyring and access to cluster management
+ CLUSTER_FLAGS:
+ type: string
+ description: Flags to be aplied before pipeline and after pipeline (comma-separated list)
+ WAIT_FOR_HEALTHY:
+ type: boolean
+ default: 'false'
+ description: Wait for healthy during pipeline
diff --git a/jenkins/client/job/ceph/weights.yml b/jenkins/client/job/ceph/weights.yml
new file mode 100644
index 0000000..776e16f
--- /dev/null
+++ b/jenkins/client/job/ceph/weights.yml
@@ -0,0 +1,29 @@
+parameters:
+ jenkins:
+ client:
+ job:
+ ceph-enforce-weights:
+ type: workflow-scm
+ concurrent: true
+ display_name: "Ceph - enforce OSD weights"
+ discard:
+ build:
+ keep_num: 50
+ scm:
+ type: git
+ url: "${_param:jenkins_gerrit_url}/mk/mk-pipelines"
+ credentials: "gerrit"
+ script: ceph-enforce-weights.groovy
+ param:
+ # general parameters
+ SALT_MASTER_URL:
+ type: string
+ description: URL of Salt master
+ default: "http://${_param:salt_master_host}:6969"
+ SALT_MASTER_CREDENTIALS:
+ type: string
+ description: Credentials for login to Salt API
+ default: salt
+ ADMIN_HOST:
+ type: string
+ description: Host with admin keyring and access to cluster management
diff --git a/jenkins/client/job/debian/packages/extra.yml b/jenkins/client/job/debian/packages/extra.yml
index 7371d3b..13ee191 100644
--- a/jenkins/client/job/debian/packages/extra.yml
+++ b/jenkins/client/job/debian/packages/extra.yml
@@ -97,6 +97,14 @@
dist: trusty
build: jmx-exporter
branch: master
+ - package: python-bitstring
+ dist: trusty
+ build: pipeline
+ branch: debian/trusty
+ - package: libvirt-exporter
+ dist: trusty
+ build: libvirt-exporter
+ branch: master
- package: librdkafka
dist: xenial
build: pipeline
@@ -161,6 +169,26 @@
dist: xenial
build: jmx-exporter
branch: master
+ - package: influxdb-relay
+ dist: xenial
+ build: influxdb-relay
+ branch: master
+ - package: prometheus-relay
+ dist: trusty
+ build: prometheus-relay
+ branch: master
+ - package: prometheus-relay
+ dist: xenial
+ build: prometheus-relay
+ branch: master
+ - package: python-datrie
+ dist: xenial
+ build: pipeline
+ branch: debian/xenial
+ - package: contrail-api-cli
+ dist: xenial
+ build: pipeline
+ branch: debian/xenial
template:
type: workflow-scm
concurrent: false
diff --git a/jenkins/client/job/deploy/lab/cicd.yml b/jenkins/client/job/deploy/lab/cicd.yml
index 260e7b1..9002c9c 100644
--- a/jenkins/client/job/deploy/lab/cicd.yml
+++ b/jenkins/client/job/deploy/lab/cicd.yml
@@ -63,10 +63,6 @@
OPENSTACK_API_URL:
type: string
default: "https://cloud-cz.bud.mirantis.net:5000"
- TARGET_OPENSTACK_IP:
- type: string
- default: "${_param:oss_target_openstack_ip}"
- description: "IP address of the OpenStack deployment, managed by OSS tooling"
OPENSTACK_API_CREDENTIALS:
type: string
default: "openstack-devcloud-credentials"
diff --git a/jenkins/client/job/deploy/lab/cleanup.yml b/jenkins/client/job/deploy/lab/cleanup.yml
index 626dd4e..4d2a179 100644
--- a/jenkins/client/job/deploy/lab/cleanup.yml
+++ b/jenkins/client/job/deploy/lab/cleanup.yml
@@ -74,7 +74,7 @@
script: delete-broken-stacks-pipeline.groovy
trigger:
timer:
- spec: "0 H * * *"
+ spec: "0 0 * * *"
param:
# openstack api
OPENSTACK_API_URL:
diff --git a/jenkins/client/job/deploy/lab/component/aaa.yml b/jenkins/client/job/deploy/lab/component/aaa.yml
index 61d0b60..1c640d5 100644
--- a/jenkins/client/job/deploy/lab/component/aaa.yml
+++ b/jenkins/client/job/deploy/lab/component/aaa.yml
@@ -4,6 +4,7 @@
_param:
jenkins_deploy_jobs:
- stack_name: aaa_ha_freeipa
+ stack_env: devcloud
stack_type: heat
stack_install: core,aaa
stack_test: ""
diff --git a/jenkins/client/job/deploy/lab/component/ceph.yml b/jenkins/client/job/deploy/lab/component/ceph.yml
index 0d84374..e9e3d64 100644
--- a/jenkins/client/job/deploy/lab/component/ceph.yml
+++ b/jenkins/client/job/deploy/lab/component/ceph.yml
@@ -4,7 +4,14 @@
_param:
jenkins_deploy_jobs:
- stack_name: ceph_ha
+ stack_env: devcloud
stack_type: heat
stack_install: core,ceph
stack_test: "ceph"
job_timer: ""
+ - stack_name: ceph_ha
+ stack_env: devcloud
+ stack_type: aws
+ stack_install: core,ceph
+ stack_test: "ceph"
+ job_timer: "H H * * *"
diff --git a/jenkins/client/job/deploy/lab/component/drivetrain.yml b/jenkins/client/job/deploy/lab/component/drivetrain.yml
index e9e00e7..945ac4a 100644
--- a/jenkins/client/job/deploy/lab/component/drivetrain.yml
+++ b/jenkins/client/job/deploy/lab/component/drivetrain.yml
@@ -4,11 +4,13 @@
_param:
jenkins_deploy_jobs:
- stack_name: drivetrain_ha
+ stack_env: devcloud
stack_type: heat
stack_install: core
stack_test: ""
job_timer: ""
- stack_name: drivetrain_ha_clusters
+ stack_env: devcloud
stack_type: heat
stack_install: core
stack_test: ""
diff --git a/jenkins/client/job/deploy/lab/component/kubernetes.yml b/jenkins/client/job/deploy/lab/component/kubernetes.yml
index 9e80c64..62526f7 100644
--- a/jenkins/client/job/deploy/lab/component/kubernetes.yml
+++ b/jenkins/client/job/deploy/lab/component/kubernetes.yml
@@ -4,27 +4,38 @@
_param:
jenkins_deploy_jobs:
- stack_name: k8s_aio_calico
+ stack_env: devcloud
stack_type: heat
stack_install: core,k8s,calico
stack_test: ""
job_timer: ""
- stack_name: k8s_aio_contrail
+ stack_env: devcloud
stack_type: heat
stack_install: core,k8s,contrail
stack_test: ""
job_timer: ""
- stack_name: k8s_ha_calico
+ stack_env: devcloud
stack_type: aws
stack_install: core,k8s,calico
stack_test: ""
job_timer: "H H(0-6) * * *"
- stack_name: k8s_ha_calico
+ stack_env: devcloud
stack_type: heat
stack_install: core,k8s,calico
stack_test: ""
job_timer: "H H(0-6) * * *"
- stack_name: k8s_ha_contrail
+ stack_env: devcloud
stack_type: heat
stack_install: core,k8s,contrail
stack_test: ""
job_timer: "H H(0-6) * * *"
+ - stack_name: k8s_ha_calico_sm
+ stack_env: devcloud
+ stack_type: aws
+ stack_install: core,k8s,calico
+ stack_test: ""
+ job_timer: "H H(0-6) * * *"
diff --git a/jenkins/client/job/deploy/lab/component/openstack.yml b/jenkins/client/job/deploy/lab/component/openstack.yml
index 33c03f3..0e526c6 100644
--- a/jenkins/client/job/deploy/lab/component/openstack.yml
+++ b/jenkins/client/job/deploy/lab/component/openstack.yml
@@ -4,20 +4,30 @@
_param:
jenkins_deploy_jobs:
- stack_name: os_aio_contrail
+ stack_env: devcloud
stack_type: heat
stack_install: core,openstack,contrail
stack_test: ""
job_timer: ""
- stack_name: os_aio_ovs
+ stack_env: devcloud
stack_type: heat
stack_install: core,openstack,ovs
job_timer: ""
- stack_name: os_ha_contrail
+ stack_env: devcloud
stack_type: heat
stack_install: core,openstack,contrail
stack_test: ""
job_timer: "H H(0-6) * * *"
+ - stack_name: os_ha_contrail_ironic
+ stack_env: devcloud
+ stack_type: heat
+ stack_install: core,openstack,contrail
+ stack_test: ""
+ job_timer: ""
- stack_name: os_ha_ovs
+ stack_env: devcloud
stack_type: heat
stack_install: core,openstack,ovs
stack_test: ""
diff --git a/jenkins/client/job/deploy/lab/component/stacklight.yml b/jenkins/client/job/deploy/lab/component/stacklight.yml
index 2802e13..94ccce2 100644
--- a/jenkins/client/job/deploy/lab/component/stacklight.yml
+++ b/jenkins/client/job/deploy/lab/component/stacklight.yml
@@ -4,16 +4,19 @@
_param:
jenkins_deploy_jobs:
- stack_name: stacklight_k8s_calico
+ stack_env: devcloud
stack_type: heat
stack_install: core,k8s,calico,stacklight
stack_test: ""
job_timer: "H H(0-6) * * *"
- stack_name: stacklight_os_contrail
+ stack_env: devcloud
stack_type: heat
stack_install: core,openstack,contrail,stacklight
stack_test: ""
job_timer: "H H(0-6) * * *"
- stack_name: stacklight_os_ovs
+ stack_env: devcloud
stack_type: heat
stack_install: core,openstack,ovs,stacklight
stack_test: ""
diff --git a/jenkins/client/job/deploy/lab/deploy.yml b/jenkins/client/job/deploy/lab/deploy.yml
index 5d87340..4a18e8e 100644
--- a/jenkins/client/job/deploy/lab/deploy.yml
+++ b/jenkins/client/job/deploy/lab/deploy.yml
@@ -68,6 +68,10 @@
type: string
default: 'deploy-stack-cleanup'
+ STACK_RECLASS_BRANCH:
+ type: string
+ default: ""
+
# salt
SALT_MASTER_CREDENTIALS:
type: string
@@ -94,7 +98,7 @@
# heat
HEAT_STACK_ENVIRONMENT:
type: string
- default: "devcloud"
+ default: "{{stack_env}}"
HEAT_STACK_ZONE:
type: string
default: "mcp-mk"
@@ -135,7 +139,7 @@
default: "http://127.0.0.1:8080"
TEST_K8S_CONFORMANCE_IMAGE:
type: string
- default: "docker-dev-virtual.docker.mirantis.net/mirantis/kubernetes/k8s-conformance:v1.5.1-3_1482332392819"
+ default: "docker-dev-virtual.docker.mirantis.net/mirantis/kubernetes/k8s-conformance:v1.7.3-1_1503652362277"
TEST_TEMPEST_IMAGE:
type: string
diff --git a/jenkins/client/job/deploy/lab/init.yml b/jenkins/client/job/deploy/lab/init.yml
index 881e425..0fce66b 100644
--- a/jenkins/client/job/deploy/lab/init.yml
+++ b/jenkins/client/job/deploy/lab/init.yml
@@ -1,6 +1,6 @@
classes:
- system.jenkins.client.job.deploy.lab.cicd
- - system.jenkins.client.job.deploy.lab.test-cicd
+ - system.jenkins.client.job.deploy.lab.test-devops-portal-cicd
- system.jenkins.client.job.deploy.lab.demo
- system.jenkins.client.job.deploy.lab.cleanup
- system.jenkins.client.job.deploy.lab.release.mcp05
@@ -8,6 +8,7 @@
- system.jenkins.client.job.deploy.lab.release.mcp11
- system.jenkins.client.job.deploy.lab.component.aaa
- system.jenkins.client.job.deploy.lab.component.ceph
+ - system.jenkins.client.job.deploy.lab.component.drivetrain
- system.jenkins.client.job.deploy.lab.component.kubernetes
- system.jenkins.client.job.deploy.lab.component.openstack
- system.jenkins.client.job.deploy.lab.component.stacklight
diff --git a/jenkins/client/job/deploy/lab/release/mcp05.yml b/jenkins/client/job/deploy/lab/release/mcp05.yml
index 3dbc25f..61d5399 100644
--- a/jenkins/client/job/deploy/lab/release/mcp05.yml
+++ b/jenkins/client/job/deploy/lab/release/mcp05.yml
@@ -3,12 +3,14 @@
parameters:
_param:
jenkins_deploy_jobs:
- - stack_name: virtual_mcp05_dvr
+ - stack_name: virtual_mcp05_ovs_dvr
+ stack_env: devcloud_virtual_mcp05_dvr
stack_install: core,openstack,dvr
stack_type: heat
stack_test: ""
job_timer: ""
- stack_name: virtual_mcp05_ovs
+ stack_env: devcloud
stack_install: core,openstack,ovs
stack_type: heat
stack_test: ""
diff --git a/jenkins/client/job/deploy/lab/release/mcp10.yml b/jenkins/client/job/deploy/lab/release/mcp10.yml
index e8905ac..34fb940 100644
--- a/jenkins/client/job/deploy/lab/release/mcp10.yml
+++ b/jenkins/client/job/deploy/lab/release/mcp10.yml
@@ -5,21 +5,25 @@
jenkins_deploy_jobs:
# physical
- stack_name: mcp10_contrail
+ stack_env: devcloud
stack_install: core,kvm,openstack,contrail
stack_type: physical
stack_test: openstack
job_timer: ""
- stack_name: mcp10_opencontrail_nfv
+ stack_env: devcloud
stack_install: core,kvm,openstack,nfv
stack_type: physical
stack_test: openstack
job_timer: ""
- stack_name: mcp10_dvr
+ stack_env: devcloud
stack_install: core,kvm,openstack,dvr
stack_type: physical
stack_test: openstack
job_timer: ""
- stack_name: mcp10_non_dvr
+ stack_env: devcloud
stack_install: core,kvm,openstack
stack_type: physical
stack_test: openstack
@@ -27,16 +31,19 @@
# virtual
- stack_name: virtual_mcp10_contrail
+ stack_env: devcloud_virtual_mcp10_contrail
stack_install: core,openstack,contrail
stack_type: heat
stack_test: ""
job_timer: "H H(0-6) * * *"
- - stack_name: virtual_mcp10_dvr
+ - stack_name: virtual_mcp10_ovs_dvr
+ stack_env: devcloud_virtual_mcp10_dvr
stack_install: core,openstack,dvr
stack_type: heat
stack_test: ""
job_timer: "H H(0-6) * * *"
- stack_name: virtual_mcp10_ovs
+ stack_env: devcloud_virtual_mcp10_ovs
stack_install: core,openstack,ovs
stack_type: heat
stack_test: ""
diff --git a/jenkins/client/job/deploy/lab/release/mcp11.yml b/jenkins/client/job/deploy/lab/release/mcp11.yml
index 98c8a5c..0a3127c 100644
--- a/jenkins/client/job/deploy/lab/release/mcp11.yml
+++ b/jenkins/client/job/deploy/lab/release/mcp11.yml
@@ -4,46 +4,55 @@
_param:
jenkins_deploy_jobs:
- stack_name: virtual_mcp11_contrail
+ stack_env: devcloud_virtual_mcp11_contrail
stack_install: core,openstack,contrail
stack_type: heat
stack_test: ""
job_timer: ""
- - stack_name: virtual_mcp11_dvr
+ - stack_name: virtual_mcp11_ovs_dvr
+ stack_env: devcloud_virtual_mcp11_dvr
stack_install: core,openstack,dvr
stack_type: heat
stack_test: ""
job_timer: ""
- stack_name: virtual_mcp11_ovs
+ stack_env: devcloud_virtual_mcp11_ovs
stack_install: core,openstack,ovs
stack_type: heat
stack_test: ""
job_timer: ""
- stack_name: virtual_mcp11_ironic_small
+ stack_env: devcloud
stack_install: core,openstack
stack_type: heat
stack_test: ""
job_timer: ""
- stack_name: virtual_mcp11_aio
- stack_install: core,openstack
+ stack_env: devcloud
+ stack_install: core,openstack,ovs
stack_type: heat
stack_test: ""
job_timer: ""
- stack_name: virtual_mcp11_k8s_calico
+ stack_env: devcloud
stack_install: core,k8s,calico
stack_type: heat
stack_test: k8s
job_timer: "H H(0-6) * * *"
- stack_name: virtual_mcp11_k8s_contrail
+ stack_env: devcloud
stack_install: core,k8s,contrail
stack_type: heat
stack_test: k8s
job_timer: "H H(0-6) * * *"
- stack_name: virtual_mcp11_contrail_nfv
+ stack_env: devcloud_virtual_mcp11_contrail_nfv
stack_install: core,openstack,contrail
stack_type: heat
stack_test: ""
job_timer: "H H(0-6) * * *"
- stack_name: virtual_mcp11_ovs_dpdk
+ stack_env: devcloud_virtual_mcp11_ovs_dpdk
stack_install: core,openstack,ovs
stack_type: heat
stack_test: ""
diff --git a/jenkins/client/job/deploy/lab/release/mk.yml b/jenkins/client/job/deploy/lab/release/mk.yml
index 4fce1c5..453e632 100644
--- a/jenkins/client/job/deploy/lab/release/mk.yml
+++ b/jenkins/client/job/deploy/lab/release/mk.yml
@@ -5,22 +5,26 @@
jenkins_deploy_jobs:
# mk20
- stack_name: virtual_mk20_advanced
+ stack_env: devcloud_virtual_mk20_advanced
stack_install: core,openstack
stack_type: heat
stack_test: ""
job_timer: ""
- stack_name: virtual_mk20_basic
+ stack_env: devcloud_virtual_mk20_basic
stack_install: core,openstack
stack_type: heat
stack_test: ""
job_timer: ""
# mk22
- stack_name: virtual_mk22_advanced
+ stack_env: devcloud_virtual_mk22_advanced
stack_install: core,openstack
stack_type: heat
stack_test: ""
job_timer: ""
- stack_name: virtual_mk22_basic
+ stack_env: devcloud_virtual_mk22_basic
stack_install: core,openstack
stack_type: heat
stack_test: ""
diff --git a/jenkins/client/job/deploy/lab/test-cicd.yml b/jenkins/client/job/deploy/lab/test-devops-portal-cicd.yml
similarity index 92%
rename from jenkins/client/job/deploy/lab/test-cicd.yml
rename to jenkins/client/job/deploy/lab/test-devops-portal-cicd.yml
index 0205223..8dfc70e 100644
--- a/jenkins/client/job/deploy/lab/test-cicd.yml
+++ b/jenkins/client/job/deploy/lab/test-devops-portal-cicd.yml
@@ -13,11 +13,23 @@
display_name: "Deploy {{name}} heat stack"
scm:
type: git
- url: "${_param:jenkins_gerrit_url}/mk/mk-pipelines"
+ url: "${_param:jenkins_gerrit_url}/oss/jenkins/pipelines"
credentials: "gerrit"
- script: cicd-lab-pipeline.groovy
+ script: test-func-devops-portal-pipeline.groovy
param:
# heat
+ HEAT_STACK_DELETE:
+ type: boolean
+ default: 'true'
+ description: "Delete heat stack at the end of job"
+ HEAT_STACK_REUSE:
+ type: boolean
+ default: 'false'
+ description: "Reuse existing stack and only orchestrate deployment"
+ HEAT_STACK_KEEP_INTACT:
+ type: boolean
+ default: 'false'
+ description: "Save current deployment status without re-orchestrating"
HEAT_TEMPLATE_URL:
type: string
default: "${_param:jenkins_gerrit_url}/mk/heat-templates"
@@ -42,14 +54,6 @@
HEAT_STACK_PUBLIC_NET:
type: string
default: "public"
- HEAT_STACK_DELETE:
- type: boolean
- default: 'true'
- description: "Delete heat stack at the end of job"
- HEAT_STACK_REUSE:
- type: boolean
- default: 'false'
- description: "Reuse existing stack and only orchestrate deployment"
# salt master
SALT_MASTER_CREDENTIALS:
diff --git a/jenkins/client/job/deploy/rollout.yml b/jenkins/client/job/deploy/rollout.yml
new file mode 100644
index 0000000..06aab0a
--- /dev/null
+++ b/jenkins/client/job/deploy/rollout.yml
@@ -0,0 +1,92 @@
+parameters:
+ jenkins:
+ client:
+ job:
+ deploy_rollout_config_change:
+ name: deploy-rollout-config-change
+ type: workflow-scm
+ discard:
+ build:
+ keep_num: 20
+ concurrent: true
+ display_name: "Deploy - Rollout change"
+ scm:
+ type: git
+ url: "${_param:jenkins_gerrit_url}/mk/mk-pipelines"
+ credentials: "gerrit"
+ script: rollout-config-change.groovy
+ param:
+ TST_SALT_MASTER_CREDENTIALS:
+ type: string
+ TST_SALT_MASTER_URL:
+ type: string
+ PRD_SALT_MASTER_CREDENTIALS:
+ type: string
+ PRD_SALT_MASTER_URL:
+ type: string
+ MODEL_REPO_URL:
+ type: string
+ MODEL_REPO_CREDENTIALS:
+ type: string
+ default: "gerrit"
+ MODEL_REPO_SOURCE_BRANCH:
+ type: string
+ MODEL_REPO_TARGET_BRANCH:
+ type: string
+ TARGET_SERVERS:
+ type: string
+ TARGET_STATES:
+ type: string
+ TARGET_SUBSET_TEST:
+ type: string
+ TARGET_SUBSET_LIVE:
+ type: string
+ TARGET_BATCH_LIVE:
+ type: string
+ # test
+ TEST_SERVICE:
+ type: string
+ TEST_K8S_API_SERVER:
+ type: string
+ default: "http://127.0.0.1:8080"
+ TEST_K8S_CONFORMANCE_IMAGE:
+ type: string
+ default: "docker-dev-virtual.docker.mirantis.net/mirantis/kubernetes/k8s-conformance:v1.7.3-1_1503652362277"
+ TEST_TEMPEST_IMAGE:
+ type: string
+ description: "Tempest docker image"
+ default: "sandbox-docker-prod-local.docker.mirantis.net/mirantis/rally_tempest:0.1"
+ TEST_TEMPEST_TARGET:
+ type: string
+ description: "Node to run tests"
+ default: ""
+ TEST_DOCKER_INSTALL:
+ type: boolean
+ description: "Install docker on the target if true"
+ default: "true"
+ TEST_TEMPEST_PATTERN:
+ type: string
+ description: "Run tests matched to pattern only"
+ git_merge_branches:
+ name: git-merge-branches
+ type: workflow-scm
+ discard:
+ build:
+ keep_num: 20
+ concurrent: true
+ display_name: "Git - Merge branches"
+ scm:
+ type: git
+ url: "${_param:jenkins_gerrit_url}/mk/mk-pipelines"
+ credentials: "gerrit"
+ script: git-merge-branches-pipeline.groovy
+ param:
+ REPO_URL:
+ type: string
+ CREDENTIALS_ID:
+ type: string
+ default: "gerrit"
+ SOURCE_BRANCH:
+ type: string
+ TARGET_BRANCH:
+ type: string
diff --git a/jenkins/client/job/deploy/test.yml b/jenkins/client/job/deploy/test.yml
new file mode 100644
index 0000000..0f9b202
--- /dev/null
+++ b/jenkins/client/job/deploy/test.yml
@@ -0,0 +1,59 @@
+parameters:
+ jenkins:
+ client:
+ job:
+ test_service_job:
+ name: deploy-test-service
+ type: workflow-scm
+ discard:
+ build:
+ keep_num: 20
+ concurrent: true
+ display_name: "Deploy - Test services in environment"
+ scm:
+ type: git
+ url: "${_param:jenkins_gerrit_url}/mk/mk-pipelines"
+ credentials: "gerrit"
+ script: test-service.groovy
+ param:
+
+ # salt
+ SALT_MASTER_CREDENTIALS:
+ type: string
+ default: "salt-qa-credentials"
+ SALT_MASTER_URL:
+ type: string
+ default: ""
+
+ # test
+ TEST_K8S_API_SERVER:
+ type: string
+ default: "http://127.0.0.1:8080"
+ TEST_K8S_CONFORMANCE_IMAGE:
+ type: string
+ default: "docker-dev-virtual.docker.mirantis.net/mirantis/kubernetes/k8s-conformance:v1.7.3-1_1503652362277"
+
+ TEST_TEMPEST_IMAGE:
+ type: string
+ description: "Tempest docker image"
+ default: "obutenko/rally_tempest_docker"
+ TEST_TEMPEST_TARGET:
+ type: string
+ description: "Node to run tests. use FQDN for ctl01 e.g. ctl01.deploy-heat-os_ha_contrail-17.bud-mk.local"
+ default: ""
+ TEST_DOCKER_INSTALL:
+ type: boolean
+ description: "Install docker on the target if true"
+ default: "true"
+ TEST_TEMPEST_PATTERN:
+ type: string
+ description: "Run tests matched to pattern only e.g. tempest.api.identity"
+ default: "false"
+ TEST_SERVICE:
+ type: string
+ description: "openstack or k8s"
+ default: "openstack"
+ TEST_JUNIT_RATIO:
+ type: string
+ description: "The amplification factor to apply to test failures when computing the test result contribution to the build health score."
+ default: "1.0"
diff --git a/jenkins/client/job/deploy/update/config.yml b/jenkins/client/job/deploy/update/config.yml
index 9beabfb..e956736 100644
--- a/jenkins/client/job/deploy/update/config.yml
+++ b/jenkins/client/job/deploy/update/config.yml
@@ -42,4 +42,7 @@
TARGET_BATCH_LIVE:
type: string
description: Batch size for the complete live config changes on all nodes, empty string means apply to all targetted nodes.
-
+ PULL_MODEL:
+ type: boolean
+ default: 'true'
+ description: Pull the latest reclass cluster model before applying the states.
diff --git a/jenkins/client/job/deploy/update/package.yml b/jenkins/client/job/deploy/update/package.yml
index a4e7fc0..55a9ef0 100644
--- a/jenkins/client/job/deploy/update/package.yml
+++ b/jenkins/client/job/deploy/update/package.yml
@@ -29,7 +29,7 @@
description: Salt compound target to match nodes to be updated [*, G@osfamily:debian].
TARGET_PACKAGES:
type: string
- description: Space delimited list of packages to be updates [package1=version package2=version], empty string means all updating all packages to the latest version.
+ description: Space delimited list of packages to be updated, empty string means updating all packages to the latest version e.g. [package1=version package2=version] or [package1 package2].
TARGET_SUBSET_TEST:
type: string
description: Number of nodes to list package updates, empty string means all targetted nodes.
diff --git a/jenkins/client/job/deploy/update/utils.yml b/jenkins/client/job/deploy/update/utils.yml
new file mode 100644
index 0000000..fa6ce14
--- /dev/null
+++ b/jenkins/client/job/deploy/update/utils.yml
@@ -0,0 +1,70 @@
+parameters:
+ jenkins:
+ client:
+ job:
+ reclass_metadata_update:
+ type: workflow-scm
+ concurrent: true
+ display_name: "Deploy - Update reclass metadata"
+ scm:
+ type: git
+ url: "${_param:jenkins_gerrit_url}/mk/mk-pipelines"
+ credentials: "gerrit"
+ script: update-reclass-metadata.groovy
+ param:
+ SALT_MASTER_URL:
+ type: string
+ default: "http://127.0.0.1:8000"
+ description: Full Salt API address [https://127.0.0.1:8000].
+ SALT_MASTER_CREDENTIALS:
+ type: string
+ default: "salt"
+ description: Credentials to the Salt API.
+ TARGET_SERVERS:
+ type: string
+ default: "I@reclass:storage"
+ description: Salt compound target to match nodes to be updated.
+ salt_master_formula_update:
+ type: workflow-scm
+ concurrent: true
+ display_name: "Deploy - Update salt master formulas"
+ scm:
+ type: git
+ url: "${_param:jenkins_gerrit_url}/mk/mk-pipelines"
+ credentials: "gerrit"
+ script: update-salt-master-formulas.groovy
+ param:
+ SALT_MASTER_URL:
+ type: string
+ default: "http://127.0.0.1:8000"
+ description: Full Salt API address [https://127.0.0.1:8000].
+ SALT_MASTER_CREDENTIALS:
+ type: string
+ default: "salt"
+ description: Credentials to the Salt API.
+ TARGET_SERVERS:
+ type: string
+ default: "I@reclass:storage"
+ description: Salt compound target to match nodes to be updated.
+ jenkins_master_job_update:
+ type: workflow-scm
+ concurrent: true
+ display_name: "Deploy - Update jenkins master jobs"
+ scm:
+ type: git
+ url: "${_param:jenkins_gerrit_url}/mk/mk-pipelines"
+ credentials: "gerrit"
+ script: update-jenkins-master-jobs.groovy
+ param:
+ SALT_MASTER_URL:
+ type: string
+ default: "http://127.0.0.1:8000"
+ description: Full Salt API address [https://127.0.0.1:8000].
+ SALT_MASTER_CREDENTIALS:
+ type: string
+ default: "salt"
+ description: Credentials to the Salt API.
+ TARGET_SERVERS:
+ type: string
+ default: "I@reclass:storage"
+ description: Salt compound target to match nodes to be updated.
diff --git a/jenkins/client/job/docker/build-images.yml b/jenkins/client/job/docker/build-images.yml
index ca1d058..61f1e6d 100644
--- a/jenkins/client/job/docker/build-images.yml
+++ b/jenkins/client/job/docker/build-images.yml
@@ -26,7 +26,7 @@
trigger:
gerrit:
project:
- "mk/docker-{{name}}":
+ "{{repo}}/docker-{{name}}":
branches:
- master
event:
@@ -54,3 +54,6 @@
DOCKER_GIT_TAG:
type: boolean
default: "true"
+ EXTRA_REPO_URL:
+ type: string
+ default: "${_param:jenkins_aptly_url}"
diff --git a/jenkins/client/job/docker/cleanup.yml b/jenkins/client/job/docker/cleanup.yml
new file mode 100644
index 0000000..eff5754
--- /dev/null
+++ b/jenkins/client/job/docker/cleanup.yml
@@ -0,0 +1,35 @@
+parameters:
+ _param:
+ jenkins_salt_api_url: "http://${_param:salt_master_host}:6969"
+ jenkins_salt_model_name: "salt"
+ jenkins:
+ client:
+ job:
+ docker-cleanup-pipeline:
+ name: docker-cleanup
+ discard:
+ build:
+ keep_num: 3
+ artifact:
+ keep_num: 3
+ type: workflow-scm
+ concurrent: true
+ scm:
+ type: git
+ url: "${_param:jenkins_gerrit_url}/mk/mk-pipelines"
+ credentials: "gerrit"
+ script: docker-cleanup-pipeline.groovy
+ trigger:
+ timer:
+ spec: "H H * * *"
+ param:
+ SALT_MASTER_URL:
+ type: string
+ default: "${_param:jenkins_salt_api_url}"
+ SALT_MASTER_CREDENTIALS:
+ type: string
+ default: "salt"
+ TEST_DATE_STRING:
+ type: string
+ default: "yesterday"
+ description: "Date string for comparison determining deletion of docker container"
diff --git a/jenkins/client/job/docker/init.yml b/jenkins/client/job/docker/init.yml
index 99e230b..b6bab31 100644
--- a/jenkins/client/job/docker/init.yml
+++ b/jenkins/client/job/docker/init.yml
@@ -23,8 +23,8 @@
tags: "2.32"
dockerfile: "Dockerfile"
- name: jenkins
- branch: "2.71"
- tags: "2.71 latest"
+ branch: "2.73"
+ tags: "2.73 latest"
dockerfile: "Dockerfile"
- name: phpldapadmin
branch: "master"
diff --git a/jenkins/client/job/docker/oss/janitor-monkey-docker.yml b/jenkins/client/job/docker/oss/janitor-monkey-docker.yml
index 083d086..78167bd 100644
--- a/jenkins/client/job/docker/oss/janitor-monkey-docker.yml
+++ b/jenkins/client/job/docker/oss/janitor-monkey-docker.yml
@@ -58,10 +58,4 @@
default: "Dockerfile"
CONTEXT_PATH:
type: string
- default: "."
- CI_BUILD_ARG_JANITOR_MONKEY_REPO:
- type: string
- default: ""
- CI_BUILD_ARG_JANITOR_MONKEY_REF:
- type: string
- default: ""
\ No newline at end of file
+ default: "."
\ No newline at end of file
diff --git a/jenkins/client/job/docker/oss/pushkin-docker.yml b/jenkins/client/job/docker/oss/pushkin-docker.yml
index d71e701..e77e99b 100644
--- a/jenkins/client/job/docker/oss/pushkin-docker.yml
+++ b/jenkins/client/job/docker/oss/pushkin-docker.yml
@@ -58,16 +58,4 @@
default: "Dockerfile"
CONTEXT_PATH:
type: string
- default: "."
- CI_BUILD_ARG_PUSHKIN_REPO:
- type: string
- default: ""
- CI_BUILD_ARG_PUSHKIN_REF:
- type: string
- default: ""
- CI_BUILD_ARG_PUSHKIN_EXT_REPO:
- type: string
- default: ""
- CI_BUILD_ARG_PUSHKIN_EXT_REF:
- type: string
- default: ""
\ No newline at end of file
+ default: "."
\ No newline at end of file
diff --git a/jenkins/client/job/docker/oss/security-monkey-docker.yml b/jenkins/client/job/docker/oss/security-monkey-docker.yml
index 7724f80..b9d4512 100644
--- a/jenkins/client/job/docker/oss/security-monkey-docker.yml
+++ b/jenkins/client/job/docker/oss/security-monkey-docker.yml
@@ -58,16 +58,4 @@
default: "security-monkey/Dockerfile"
CONTEXT_PATH:
type: string
- default: "."
- CI_BUILD_ARG_SECURITY_MONKEY_REPO:
- type: string
- default: ""
- CI_BUILD_ARG_SECURITY_MONKEY_REF:
- type: string
- default: ""
- CI_BUILD_ARG_SECURITY_MONKEY_OPENSTACK_REPO:
- type: string
- default: ""
- CI_BUILD_ARG_SECURITY_MONKEY_OPENSTACK_REF:
- type: string
- default: ""
\ No newline at end of file
+ default: "."
\ No newline at end of file
diff --git a/jenkins/client/job/fake_test.yml b/jenkins/client/job/fake_test.yml
deleted file mode 100644
index 079651c..0000000
--- a/jenkins/client/job/fake_test.yml
+++ /dev/null
@@ -1,37 +0,0 @@
-parameters:
- jenkins:
- client:
- job:
- gerrit-fake-test:
- name: gerrit-fake-test
- discard:
- build:
- keep_num: 25
- artifact:
- keep_num: 25
- type: workflow-scm
- concurrent: true
- scm:
- type: git
- url: "${_param:jenkins_gerrit_url}/mk/mk-pipelines"
- credentials: "gerrit"
- script: fake-test-pipeline.groovy
- trigger:
- gerrit:
- project:
- "salt-formulas/salt-formulas":
- branches:
- - master
- event:
- patchset:
- - created:
- excludeDrafts: false
- excludeTrivialRebase: false
- excludeNoCodeChange: false
- comment:
- - addedContains:
- commentAddedCommentContains: '(recheck|reverify)'
- param:
- CREDENTIALS_ID:
- type: string
- default: "gerrit"
diff --git a/jenkins/client/job/gating.yml b/jenkins/client/job/gating.yml
index 6886b06..db2033e 100644
--- a/jenkins/client/job/gating.yml
+++ b/jenkins/client/job/gating.yml
@@ -25,9 +25,9 @@
template:
discard:
build:
- keep_num: 5
+ keep_num: 25
artifact:
- keep_num: 5
+ keep_num: 25
type: workflow-scm
concurrent: true
scm:
@@ -38,7 +38,6 @@
quiet_period: 60
trigger:
gerrit:
- silent_start_mode: true
project:
'{{regex}}':
compare_type: REG_EXP
diff --git a/jenkins/client/job/git-mirrors/downstream/debian-packages.yml b/jenkins/client/job/git-mirrors/downstream/debian-packages.yml
index dde7d9a..eb899dc 100644
--- a/jenkins/client/job/git-mirrors/downstream/debian-packages.yml
+++ b/jenkins/client/job/git-mirrors/downstream/debian-packages.yml
@@ -15,3 +15,7 @@
downstream: debian/gophercloud
upstream: "https://github.com/gophercloud/gophercloud.git"
branches: master
+ - name: debian-influxdb-relay
+ downstream: debian/influxdb-relay
+ upstream: "https://github.com/influxdata/influxdb-relay.git"
+ branches: master
diff --git a/jenkins/client/job/git-mirrors/upstream/init.yml b/jenkins/client/job/git-mirrors/upstream/init.yml
index e11e63c..cc267d9 100644
--- a/jenkins/client/job/git-mirrors/upstream/init.yml
+++ b/jenkins/client/job/git-mirrors/upstream/init.yml
@@ -25,7 +25,8 @@
project:
"{{downstream}}":
branches:
- - master
+ - compare_type: "REG_EXP"
+ name: "(.*?)"
message:
build_successful: "Build successful"
build_unstable: "Build unstable"
diff --git a/jenkins/client/job/image/centos.yml b/jenkins/client/job/image/centos.yml
index 2524163..d478ccc 100644
--- a/jenkins/client/job/image/centos.yml
+++ b/jenkins/client/job/image/centos.yml
@@ -38,7 +38,7 @@
default: ""
UPLOAD_URL:
type: string
- default: "http://jenkins:eyoocaiG3ADireK3Eef8gae1roh5oox010.10.100.85:8088/"
+ default: "${_param:jenkins_packer_upload_url}"
SKIP_UPLOAD:
type: boolean
default: "false"
diff --git a/jenkins/client/job/image/debian.yml b/jenkins/client/job/image/debian.yml
index 2c92f80..31c46b3 100644
--- a/jenkins/client/job/image/debian.yml
+++ b/jenkins/client/job/image/debian.yml
@@ -38,7 +38,7 @@
default: ""
UPLOAD_URL:
type: string
- default: "http://jenkins:eyoocaiG3ADireK3Eef8gae1roh5oox0@10.10.100.85:8088/"
+ default: "${_param:jenkins_packer_upload_url}"
SKIP_UPLOAD:
type: boolean
default: "false"
diff --git a/jenkins/client/job/image/ubuntu.yml b/jenkins/client/job/image/ubuntu.yml
index c5b43d6..fa84813 100644
--- a/jenkins/client/job/image/ubuntu.yml
+++ b/jenkins/client/job/image/ubuntu.yml
@@ -111,7 +111,7 @@
default: ""
UPLOAD_URL:
type: string
- default: "http://jenkins:eyoocaiG3ADireK3Eef8gae1roh5oox0@10.10.100.85:8088/"
+ default: "${_param:jenkins_packer_upload_url}"
SKIP_UPLOAD:
type: boolean
default: "false"
diff --git a/jenkins/client/job/k8s-test/init.yml b/jenkins/client/job/k8s-test/init.yml
new file mode 100644
index 0000000..0157bb8
--- /dev/null
+++ b/jenkins/client/job/k8s-test/init.yml
@@ -0,0 +1,2 @@
+classes:
+- system.jenkins.client.job.k8s-test.mcp-k8s-test-pipeline
\ No newline at end of file
diff --git a/jenkins/client/job/k8s-test/mcp-k8s-test-pipeline.yml b/jenkins/client/job/k8s-test/mcp-k8s-test-pipeline.yml
new file mode 100644
index 0000000..7bc2f79
--- /dev/null
+++ b/jenkins/client/job/k8s-test/mcp-k8s-test-pipeline.yml
@@ -0,0 +1,74 @@
+parameters:
+ jenkins:
+ client:
+ job:
+ mcp_k8s_test_pipeline:
+ type: workflow-scm
+ name: mcp-k8s-test-pipeline
+ display_name: "Kubernetes tests pipeline"
+ discard:
+ build:
+ keep_num: 20
+ concurrent: false
+ scm:
+ type: git
+ url: "${_param:jenkins_gerrit_url}/kubernetes-ci/kubernetes-pipelines"
+ credentials: "gerrit"
+ script: pipelines/mcp-k8s-test-pipeline.groovy
+ trigger:
+ gerrit:
+ project:
+ kubernetes/kubernetes:
+ branches:
+ - compare_type: "ANT"
+ name: "**"
+ message:
+ build_successful: "Build successful"
+ build_unstable: "Build unstable"
+ build_failure: "Build failed"
+ event:
+ patchset:
+ - created:
+ excludeDrafts: false
+ excludeTrivialRebase: false
+ excludeNoCodeChange: false
+ comment:
+ - addedContains:
+ commentAddedCommentContains: '(recheck|reverify)'
+ param:
+ KUBE_DOCKER_REGISTRY:
+ type: string
+ default: 'docker-dev-virtual.docker.mirantis.net'
+ description: 'Docker registry for binaries and images'
+ CALICO_DOCKER_REGISTRY:
+ type: string
+ default: 'docker-prod-virtual.docker.mirantis.net'
+ description: 'Docker registry for published Calico images'
+ K8S_BASE_IMAGE:
+ type: string
+ default: '{docker-prod-virtual}/mirantis/base-images/debian-base:20161223134732'
+ description: 'Base Docker image to build k8s'
+ DOCKER_IMAGE_UNIT:
+ type: string
+ default: '{docker-prod-virtual}/mirantis/k8s-tests-images/k8s-tests-unit:latest'
+ desription: 'Docker image for k8s unit tests'
+ DOCKER_IMAGE_INTEGRATION:
+ type: string
+ default: '{docker-prod-virtual}/mirantis/k8s-tests-images/k8s-tests-integration:latest'
+ desription: 'Docker image for k8s integration tests'
+ CALICO_CNI_IMAGE_REPO:
+ type: string
+ default: 'calico/cni'
+ description: 'Custom calico/cni image repository'
+ CALICO_CNI_IMAGE_TAG:
+ type: string
+ default: 'v1.5.1'
+ description: 'Custom calico/cni image tag'
+ CALICO_DOWNSTREAM:
+ type: boolean
+ default: 'true'
+ description: 'Use Calico downstream'
+ CALICO_VER:
+ type: string
+ default: 'mcp'
+ description: 'Custom Calico version'
diff --git a/jenkins/client/job/opencontrail/build/dpdk-extra.yml b/jenkins/client/job/opencontrail/build/dpdk-extra.yml
index 156cedb..0a152f1 100644
--- a/jenkins/client/job/opencontrail/build/dpdk-extra.yml
+++ b/jenkins/client/job/opencontrail/build/dpdk-extra.yml
@@ -1,4 +1,6 @@
parameters:
+ _param:
+ jenkins_contrail_dpdk_kernel_modules_dkms: "${_param:jenkins_gerrit_url}/contrail/contrail-dpdk-kernel-modules-dkms"
jenkins:
client:
job_template:
@@ -84,3 +86,65 @@
description: "binary packages to create"
type: string
default: "{{binary}}"
+ build-opencontrail-dpdk-kernel-modules-dkms:
+ name: build-opencontrail-dpdk-kernel-modules-dkms-{{os}}-{{dist}}-{{dpdk}}
+ jobs:
+ - os: ubuntu
+ dist: xenial
+ branch: contrail_dpdk_2_1
+ dpdk: "21"
+ aptly_repo: ubuntu-xenial-mitaka
+ - os: ubuntu
+ dist: xenial
+ dpdk: "1702"
+ branch: contrail_dpdk_17_02
+ aptly_repo: ubuntu-xenial-oc40-dpdk1702
+ template:
+ discard:
+ build:
+ keep_num: 5
+ artifact:
+ keep_num: 5
+ type: workflow-scm
+ concurrent: false
+ quiet_period: 120
+ scm:
+ type: git
+ url: "${_param:jenkins_contrail_dpdk_kernel_modules_dkms}"
+ credentials: "gerrit"
+ branch: "{{branch}}"
+ trigger:
+ gerrit:
+ project:
+ contrail/contrail-dpdk:
+ branches:
+ - "{{branch}}"
+ message:
+ build_successful: "Build successful"
+ build_unstable: "Build unstable"
+ build_failure: "Build failed"
+ event:
+ ref:
+ - updated
+ param:
+ SOURCE_BRANCH:
+ type: string
+ default: "{{branch}}"
+ SOURCE_CREDENTIALS:
+ type: string
+ default: "gerrit"
+ APTLY_URL:
+ type: string
+ default: "${_param:jenkins_aptly_api_url}"
+ APTLY_REPO:
+ type: string
+ default: "{{aptly_repo}}"
+ OS:
+ type: string
+ default: "{{os}}"
+ DIST:
+ type: string
+ default: "{{dist}}"
+ ARCH:
+ type: string
+ default: "amd64"
diff --git a/jenkins/client/job/opencontrail/build/generic.yml b/jenkins/client/job/opencontrail/build/generic.yml
index 9643254..14dd93c 100644
--- a/jenkins/client/job/opencontrail/build/generic.yml
+++ b/jenkins/client/job/opencontrail/build/generic.yml
@@ -14,6 +14,7 @@
ppa: mirantis-opencontrail/opencontrail-3.0.3
upload_source_package: false
dpdk: contrail_dpdk_2_1
+ build_trigger: ""
- buildname: oc31
os: ubuntu
dist: trusty
@@ -21,6 +22,7 @@
ppa: mirantis-opencontrail/opencontrail-3.1
upload_source_package: true
dpdk: contrail_dpdk_2_1
+ build_trigger: ""
- buildname: oc31
os: ubuntu
dist: xenial
@@ -28,6 +30,7 @@
ppa: mirantis-opencontrail/opencontrail-3.1
upload_source_package: true
dpdk: contrail_dpdk_2_1
+ build_trigger: ""
- buildname: oc311
os: ubuntu
dist: trusty
@@ -35,6 +38,7 @@
ppa: mirantis-opencontrail/opencontrail-3.1.1
upload_source_package: true
dpdk: contrail_dpdk_2_1
+ build_trigger: "H H(20-23) * * *"
- buildname: oc311
os: ubuntu
dist: xenial
@@ -42,6 +46,7 @@
ppa: mirantis-opencontrail/opencontrail-3.1.1
upload_source_package: true
dpdk: contrail_dpdk_2_1
+ build_trigger: "H H(20-23) * * *"
- buildname: oc32
os: ubuntu
dist: trusty
@@ -49,6 +54,7 @@
ppa: mirantis-opencontrail/opencontrail-3.2
upload_source_package: true
dpdk: contrail_dpdk_2_1
+ build_trigger: ""
- buildname: oc32
os: ubuntu
dist: xenial
@@ -56,6 +62,7 @@
ppa: mirantis-opencontrail/opencontrail-3.2
upload_source_package: true
dpdk: contrail_dpdk_2_1
+ build_trigger: ""
- buildname: oc323
os: ubuntu
dist: trusty
@@ -63,6 +70,7 @@
ppa: mirantis-opencontrail/opencontrail-3.2.3
upload_source_package: true
dpdk: contrail_dpdk_2_1
+ build_trigger: "H H(20-23) * * *"
- buildname: oc323
os: ubuntu
dist: xenial
@@ -70,46 +78,55 @@
ppa: mirantis-opencontrail/opencontrail-3.2.3
upload_source_package: true
dpdk: contrail_dpdk_2_1
+ build_trigger: "H H(20-23) * * *"
- buildname: oc40
os: ubuntu
dist: trusty
branch: R4.0
ppa: mirantis-opencontrail/opencontrail-4.0
upload_source_package: true
- dpdk: contrail_dpdk_2_1
+ dpdk: contrail_dpdk_17_02
+ build_trigger: "H H(20-23) * * *"
- buildname: oc40
os: ubuntu
dist: xenial
branch: R4.0
ppa: mirantis-opencontrail/opencontrail-4.0
upload_source_package: true
- dpdk: contrail_dpdk_2_1
- - buildname: oc40-dpdk1702
+ dpdk: contrail_dpdk_17_02
+ build_trigger: "H H(20-23) * * *"
+ - buildname: oc41
os: ubuntu
dist: trusty
- branch: R4.0
- ppa: mirantis-opencontrail/opencontrail-4.0-dpdk-17-02
- upload_source_package: false
+ branch: R4.1
+ ppa: mirantis-opencontrail/opencontrail-4.1
+ upload_source_package: true
dpdk: contrail_dpdk_17_02
- - buildname: oc40-dpdk1702
+ build_trigger: "H H(20-23) * * *"
+ - buildname: oc41
os: ubuntu
dist: xenial
- branch: R4.0
- ppa: mirantis-opencontrail/opencontrail-4.0-dpdk-17-02
- upload_source_package: false
+ branch: R4.1
+ ppa: mirantis-opencontrail/opencontrail-4.1
+ upload_source_package: true
dpdk: contrail_dpdk_17_02
+ build_trigger: "H H(20-23) * * *"
- buildname: oc666
os: ubuntu
dist: trusty
branch: master
ppa: mirantis-opencontrail/opencontrail-master
- upload_source_package: false
+ upload_source_package: true
+ dpdk: contrail_dpdk_17_02
+ build_trigger: "H H(20-23) * * *"
- buildname: oc666
os: ubuntu
dist: xenial
branch: master
ppa: mirantis-opencontrail/opencontrail-master
- upload_source_package: false
+ upload_source_package: true
+ dpdk: contrail_dpdk_17_02
+ build_trigger: "H H(20-23) * * *"
template:
discard:
build:
@@ -164,6 +181,8 @@
type: boolean
default: '{{upload_source_package}}'
trigger:
+ pollscm:
+ spec: "{{build_trigger}}"
gerrit:
project:
contrail/contrail-pipeline:
diff --git a/jenkins/client/job/opencontrail/git-mirrors/upstream.yml b/jenkins/client/job/opencontrail/git-mirrors/upstream.yml
index 0fa0491..fa9bc5b 100644
--- a/jenkins/client/job/opencontrail/git-mirrors/upstream.yml
+++ b/jenkins/client/job/opencontrail/git-mirrors/upstream.yml
@@ -62,7 +62,19 @@
github:
url: "https://github.com/Mirantis/{{name}}"
trigger:
- github:
+ gerrit:
+ project:
+ contrail/{{name}}:
+ branches:
+ - compare_type: "REG_EXP"
+ name: ".*"
+ 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/opencontrail/init.yml b/jenkins/client/job/opencontrail/init.yml
index 4b42d50..34cc4e5 100644
--- a/jenkins/client/job/opencontrail/init.yml
+++ b/jenkins/client/job/opencontrail/init.yml
@@ -3,12 +3,12 @@
- system.jenkins.client.job.opencontrail.git-mirrors
parameters:
_param:
- contrail_branches: "R3.0.2.x,R3.0.3.x,R3.1,R3.1.1.x,R3.2,R3.2.3.x,R4.0,master"
+ contrail_branches: "R3.0.2.x,R3.0.3.x,R3.1,R3.1.1.x,R3.2,R3.2.3.x,R4.0,R4.1,master"
contrail_kubernetes_branches: "master,release-1.2"
- contrail_dpdk_extra_branches: "mitaka,mitaka_dpdk_17_02,mitaka_dpdk_17_05,kilo,liberty-multiqueue,newton"
- contrail_ceilometer_plugin_branches: "master,R4.0"
+ contrail_dpdk_extra_branches: "mitaka,mitaka_dpdk_17_02,mitaka_dpdk_17_05,kilo,liberty-multiqueue,newton,ocata"
+ contrail_ceilometer_plugin_branches: "master,R4.0,R4.1"
contrail_kubernetes_branches: "master,origin-1.1,origin-1.1.3,release-1.1,release-1.2"
- contrail_dpdk_branches: "master,R3.0.2.x,R3.0.3.x,R3.1,R3.1.1.x,R3.2,R3.2.3.x,R4.0,contrail_dpdk_17_02,contrail_dpdk_17_05,contrail_dpdk_1_7,contrail_dpdk_2_0,contrail_dpdk_2_1"
+ contrail_dpdk_branches: "master,R3.0.2.x,R3.0.3.x,R3.1,R3.1.1.x,R3.2,R3.2.3.x,R4.0,R4.0.1,R4.1,contrail_dpdk_17_02,contrail_dpdk_17_05,contrail_dpdk_1_7,contrail_dpdk_2_0,contrail_dpdk_2_1"
jenkins:
client:
view:
@@ -27,7 +27,11 @@
naming_rule: "R3.1.1.x"
- group_regex: "build-opencontrail-oc32-.*"
naming_rule: "R3.2"
+ - group_regex: "build-opencontrail-oc323-.*"
+ naming_rule: "R3.2.3.x"
- group_regex: "build-opencontrail-oc40-.*"
naming_rule: "R4.0"
+ - group_regex: "build-opencontrail-oc41-.*"
+ naming_rule: "R4.1"
- group_regex: "build-opencontrail-oc666-.*"
naming_rule: "oc-666"
diff --git a/jenkins/client/job/oss/init.yml b/jenkins/client/job/oss/init.yml
index 0e23f01..9478ffd 100644
--- a/jenkins/client/job/oss/init.yml
+++ b/jenkins/client/job/oss/init.yml
@@ -1,3 +1,5 @@
classes:
- system.jenkins.client.job.oss.test_devops_portal
+ - system.jenkins.client.job.oss.test_devops_portal_nightly
+ - system.jenkins.client.job.oss.test_pushkin_codebase
- system.jenkins.client.job.oss.test_security_monkey_openstack
diff --git a/jenkins/client/job/oss/test_devops_portal.yml b/jenkins/client/job/oss/test_devops_portal.yml
index 4007010..7001200 100644
--- a/jenkins/client/job/oss/test_devops_portal.yml
+++ b/jenkins/client/job/oss/test_devops_portal.yml
@@ -41,3 +41,6 @@
DEFAULT_GIT_REF:
type: string
default: master
+ NIGHTLY_BUILD:
+ type: boolean
+ default: false
diff --git a/jenkins/client/job/oss/test_devops_portal_nightly.yml b/jenkins/client/job/oss/test_devops_portal_nightly.yml
new file mode 100644
index 0000000..34a8bec
--- /dev/null
+++ b/jenkins/client/job/oss/test_devops_portal_nightly.yml
@@ -0,0 +1,34 @@
+parameters:
+ jenkins:
+ client:
+ job:
+ test-oss-devops-portal-nightly:
+ name: test-oss-devops-portal-nightly
+ discard:
+ build:
+ keep_num: 15
+ artifact:
+ keep_num: 15
+ type: workflow-scm
+ concurrent: true
+ scm:
+ type: git
+ url: "${_param:jenkins_gerrit_url}/oss/jenkins/pipelines"
+ credentials: "gerrit"
+ script: test-devops-portal-pipeline.groovy
+ trigger:
+ timer:
+ spec: "0 23 * * *"
+ param:
+ CREDENTIALS_ID:
+ type: string
+ default: "gerrit"
+ DEFAULT_GIT_URL:
+ type: string
+ default: "${_param:jenkins_gerrit_url}/oss/devops-portal"
+ DEFAULT_GIT_REF:
+ type: string
+ default: master
+ NIGHTLY_BUILD:
+ type: boolean
+ default: true
diff --git a/jenkins/client/job/oss/test_pushkin_codebase.yml b/jenkins/client/job/oss/test_pushkin_codebase.yml
new file mode 100644
index 0000000..245f1d8
--- /dev/null
+++ b/jenkins/client/job/oss/test_pushkin_codebase.yml
@@ -0,0 +1,50 @@
+parameters:
+ jenkins:
+ client:
+ job:
+ test-oss-pushkin-codebase:
+ name: test-oss-pushkin-codebase
+ discard:
+ build:
+ keep_num: 15
+ artifact:
+ keep_num: 15
+ type: workflow-scm
+ concurrent: true
+ scm:
+ type: git
+ url: "${_param:jenkins_gerrit_url}/oss/jenkins/pipelines"
+ credentials: "gerrit"
+ script: test-pushkin-pipeline.groovy
+ trigger:
+ gerrit:
+ project:
+ "oss/pushkin":
+ branches:
+ - devel
+ - master
+ skip_vote:
+ - successful
+ - failed
+ - unstable
+ - not_built
+ event:
+ patchset:
+ - created:
+ excludeDrafts: false
+ excludeTrivialRebase: false
+ excludeNoCodeChange: false
+ comment:
+ - addedContains:
+ commentAddedCommentContains: '^(?s:Patch Set \d+:.*(test|recheck|reverify)\s*)$'
+ param:
+ CREDENTIALS_ID:
+ type: string
+ default: "gerrit"
+ DEFAULT_GIT_URL:
+ type: string
+ default: "${_param:jenkins_gerrit_url}/oss/pushkin"
+ DEFAULT_GIT_REF:
+ type: string
+ default: master
+ description: "Refspec in format refs/changes/, i.e. refs/changes/32/10332/4"
diff --git a/jenkins/client/job/salt-formulas/tests.yml b/jenkins/client/job/salt-formulas/tests.yml
index c25cc49..448c421 100644
--- a/jenkins/client/job/salt-formulas/tests.yml
+++ b/jenkins/client/job/salt-formulas/tests.yml
@@ -10,8 +10,9 @@
- name: aptcacher
- name: aptly
- name: artifactory
- - name: backupninja
- name: avinetworks
+ - name: backupninja
+ - name: barbican
- name: billometer
- name: bind
- name: bird
@@ -155,8 +156,42 @@
DEFAULT_GIT_REF:
type: string
default: master
- KITCHEN_TESTS_PARALLEL:
- type: boolean
- default: 'false'
CUSTOM_KITCHEN_ENVS:
type: text
+ PARALLEL_GROUP_SIZE:
+ type: string
+ default: "8"
+ job:
+ test-salt-formulas-env:
+ name: test-salt-formulas-env
+ discard:
+ build:
+ keep_num: 500
+ artifact:
+ keep_num: 10
+ type: workflow-scm
+ concurrent: true
+ scm:
+ type: git
+ url: "${_param:jenkins_gerrit_url}/mk/mk-pipelines"
+ credentials: "gerrit"
+ script: test-salt-formulas-env.groovy
+ param:
+ SALT_VERSION:
+ type: string
+ default: "latest"
+ SALT_OPTS:
+ type: string
+ default: "--force-color"
+ CREDENTIALS_ID:
+ type: string
+ default: "gerrit"
+ DEFAULT_GIT_URL:
+ type: string
+ description: "Run against alternate system reclass"
+ default: "${_param:jenkins_gerrit_url}/salt-formulas/{{name}}"
+ DEFAULT_GIT_REF:
+ type: string
+ default: master
+ KITCHEN_ENV:
+ type: text
diff --git a/jenkins/client/job/salt-models/tests.yml b/jenkins/client/job/salt-models/tests.yml
index 4b6c006..fc1fc5f 100644
--- a/jenkins/client/job/salt-models/tests.yml
+++ b/jenkins/client/job/salt-models/tests.yml
@@ -1,6 +1,6 @@
parameters:
_param:
- jenkins_pollscm_spec: "0 1 * * *"
+ jenkins_pollscm_spec: "0 1 * * *"
jenkins:
client:
job_template:
@@ -41,7 +41,7 @@
default: "gerrit"
PARALLEL_NODE_GROUP_SIZE:
type: string
- default: "2"
+ default: "9"
# Salt master setup extra formulas
EXTRA_FORMULAS:
type: string
@@ -73,6 +73,16 @@
url: "${_param:jenkins_gerrit_url}/mk/mk-pipelines"
credentials: "gerrit"
script: test-system-reclass-pipeline.groovy
+ trigger:
+ gerrit:
+ project:
+ salt-models/{{name}}:
+ branches:
+ - master
+ event:
+ comment:
+ - addedContains:
+ commentAddedCommentContains: '(recheck|reverify)'
concurrent: true
param:
TEST_MODELS:
@@ -85,11 +95,19 @@
DEFAULT_GIT_REF:
type: string
default: master
- test_salt_model_cookiecutter:
- name: test-salt-model-cookiecutter-{{cookiecutter_template}}
+ PARALLEL_NODE_GROUP_SIZE:
+ type: string
+ default: "5"
+ test_mk_cookiecutter_templates:
+ name: test-mk-{{cookiecutter_template}}
jobs:
- cookiecutter_template: cookiecutter-templates
template:
+ discard:
+ build:
+ keep_num: 20
+ artifact:
+ keep_num: 20
type: workflow-scm
concurrent: true
scm:
@@ -148,6 +166,9 @@
NODE_TARGET:
type: string
default: ""
+ CLUSTER_NAME:
+ type: string
+ default: ""
DEFAULT_GIT_URL:
type: string
default: "${_param:jenkins_gerrit_url}/salt-models/{{name}}"
diff --git a/jenkins/client/job/test_pipelines.yml b/jenkins/client/job/test_pipelines.yml
index d0f0a6e..b1b782a 100644
--- a/jenkins/client/job/test_pipelines.yml
+++ b/jenkins/client/job/test_pipelines.yml
@@ -7,6 +7,8 @@
jobs:
- name: mk-mk-pipelines
repo: mk/mk-pipelines
+ - name: mcp-ci-pipeline-library
+ repo: mcp-ci/pipeline-library
- name: oss-jenkins-pipelines
repo: oss/jenkins/pipelines
template:
@@ -46,7 +48,7 @@
default: "niaquinto/gradle"
GRADLE_CMD:
type: string
- default: "check"
+ default: "check --info"
DEFAULT_GIT_URL:
type: string
description: "Run against alternate system reclass"
diff --git a/jenkins/client/job/validate.yml b/jenkins/client/job/validate.yml
new file mode 100644
index 0000000..7be935b
--- /dev/null
+++ b/jenkins/client/job/validate.yml
@@ -0,0 +1,79 @@
+parameters:
+ jenkins:
+ client:
+ view:
+ Validation:
+ enabled: true
+ type: ListView
+ include_regex: "validate.*"
+ job:
+ validate_openstack:
+ type: workflow-scm
+ name: validate-openstack
+ display_name: "Validate - Openstack"
+ discard:
+ build:
+ keep_num: 20
+ artifact:
+ keep_num: 20
+ concurrent: false
+ scm:
+ type: git
+ url: "${_param:jenkins_gerrit_url}/mk/mk-pipelines"
+ credentials: "gerrit"
+ script: validate-cloud.groovy
+
+ param:
+ SALT_MASTER_URL:
+ type: string
+ default: ""
+ SALT_MASTER_CREDENTIALS:
+ type: string
+ default: "salt"
+ TEST_IMAGE:
+ type: string
+ default: "docker-prod-local.artifactory.mirantis.com/mirantis/oss/qa-tools"
+ TARGET_NODE:
+ type: string
+ default: ""
+ RUN_RALLY_TESTS:
+ type: boolean
+ default: 'true'
+ RUN_TEMPEST_TESTS:
+ type: boolean
+ default: 'true'
+ RUN_K8S_TESTS:
+ type: boolean
+ default: 'true'
+ TEMPEST_TEST_SET:
+ type: choice
+ choices:
+ - smoke
+ - full
+ TEST_K8S_API_SERVER:
+ type: string
+ default: "http://127.0.0.1:8080"
+ TEST_K8S_CONFORMANCE_IMAGE:
+ type: string
+ default: "docker-dev-virtual.docker.mirantis.net/mirantis/kubernetes/k8s-conformance:v1.7.3-1_1503652362277"
+ RUN_SPT_TESTS:
+ type: boolean
+ default: 'true'
+ SPT_SSH_USER:
+ type: string
+ default: "root"
+ SPT_FLOATING_NETWORK:
+ type: string
+ default: ""
+ SPT_IMAGE:
+ type: string
+ default: ""
+ SPT_USER:
+ type: string
+ default: ""
+ SPT_FLAVOR:
+ type: string
+ default: ""
+ SPT_AVAILABILITY_ZONE:
+ type: string
+ default: "nova"
diff --git a/jenkins/client/node.yml b/jenkins/client/node.yml
index 321951a..e5e4d3b 100644
--- a/jenkins/client/node.yml
+++ b/jenkins/client/node.yml
@@ -7,6 +7,8 @@
master:
node_mode: Exclusive
remote_home: /var/lib/jenkins
+ labels:
+ - python
launcher:
type: master
slave01:
diff --git a/keystone/client/service/barbican.yml b/keystone/client/service/barbican.yml
index f83e6ab..70b6054 100644
--- a/keystone/client/service/barbican.yml
+++ b/keystone/client/service/barbican.yml
@@ -5,13 +5,17 @@
client:
server:
identity:
+ roles:
+ - creator
project:
service:
user:
barbican:
- is_admin: true
password: ${_param:keystone_barbican_password}
email: ${_param:admin_email}
+ roles:
+ - admin
+ - creator
service:
barbican:
type: key-manager
diff --git a/keystone/server/cluster.yml b/keystone/server/cluster.yml
index 9b13788..0c79462 100644
--- a/keystone/server/cluster.yml
+++ b/keystone/server/cluster.yml
@@ -4,6 +4,12 @@
- system.haproxy.proxy.listen.openstack.keystone
- system.haproxy.proxy.listen.openstack.keystone.standalone
parameters:
+ linux:
+ system:
+ package:
+ python-pymysql:
+ fromrepo: ${_param:openstack_version}
+ version: latest
keystone:
server:
enabled: true
diff --git a/keystone/server/single.yml b/keystone/server/single.yml
index 72dc045..c35ef73 100644
--- a/keystone/server/single.yml
+++ b/keystone/server/single.yml
@@ -7,6 +7,12 @@
mysql_admin_user: root
mysql_admin_password: password
mysql_keystone_password: password
+ linux:
+ system:
+ package:
+ python-pymysql:
+ fromrepo: ${_param:openstack_version}
+ version: latest
keystone:
server:
enabled: true
diff --git a/libvirt/server/single.yml b/libvirt/server/single.yml
new file mode 100644
index 0000000..f25f8ed
--- /dev/null
+++ b/libvirt/server/single.yml
@@ -0,0 +1,7 @@
+parameters:
+ linux:
+ system:
+ group:
+ libvirtd:
+ enabled: true
+ name: libvirtd
diff --git a/linux/network/dynamic_hosts.yml b/linux/network/dynamic_hosts.yml
new file mode 100644
index 0000000..fc1ef68
--- /dev/null
+++ b/linux/network/dynamic_hosts.yml
@@ -0,0 +1,13 @@
+parameters:
+ linux:
+ network:
+ purge_hosts: true
+ mine_dns_records: true
+ host:
+ localhost_hostname:
+ address: ${_param:single_address}
+ grain: true
+ names:
+ - ${linux:network:fqdn}
+ - ${linux:network:hostname}
+
diff --git a/linux/network/hosts.yml b/linux/network/hosts.yml
new file mode 100644
index 0000000..1b29324
--- /dev/null
+++ b/linux/network/hosts.yml
@@ -0,0 +1,9 @@
+parameters:
+ linux:
+ network:
+ host:
+ localhost_hostname:
+ address: ${_param:single_address}
+ names:
+ - ${linux:network:fqdn}
+ - ${linux:network:hostname}
diff --git a/linux/system/profile/autosudo.yml b/linux/system/profile/autosudo.yml
new file mode 100644
index 0000000..ff5f029
--- /dev/null
+++ b/linux/system/profile/autosudo.yml
@@ -0,0 +1,127 @@
+parameters:
+ linux:
+ system:
+ profile:
+ # script provides sudoon & sudooff commands, allows working as-if root while tracking all commands
+ autosudo.sh: |
+ #!/bin/bash
+
+ # USAGE: $ . autosudo.sh
+ # $ sudoon
+ # $ sudo: <any commands>
+ # $ sudo: ...
+ # $ sudo: sudooff
+ # LIMITATIONS:
+ # - does not check your sudo policy, assumes "bash -c ..." is allowed
+ # - autocompletion (tab) for files/dirs does not work in restricted folders
+ # - may contain bugs
+ # NOTES: supports "cd ..."; allows to freely operate in restricted directories
+
+ function sudoon () {
+ if [ -z "$PREEXEC_PROMPT" ]
+ then
+ trap - DEBUG
+ ORIGINAL_PROMPT_COMMAND="$PROMPT_COMMAND"
+ PREEXEC_PROMPT=1
+ ORIGINAL_PS1=$PS1
+ PS1=$ORIGINAL_PS1"sudo: "
+ shopt -s extdebug
+ PROMPT_COMMAND="_preexec_prompt"
+ trap "_preexec_sudo" DEBUG
+ fi
+ }
+
+ function sudooff () {
+ trap - DEBUG
+ shopt -u extdebug
+ unset PREEXEC_PROMPT
+ PS1=$ORIGINAL_PS1
+ unset SUDO_DIR
+ PROMPT_COMMAND="$ORIGINAL_PROMPT_COMMAND"
+ unset ORIGINAL_PROMPT_COMMAND
+ }
+
+ function _preexec_prompt() {
+ trap - DEBUG
+ PREEXEC_PROMPT=1
+ trap "_preexec_sudo" DEBUG
+ }
+
+
+ function _preexec_sudo() {
+ # echo PREEXEC_PROMPT=$PREEXEC_PROMPT BASH_COMMAND=$BASH_COMMAND SUDO_DIR=$SUDO_DIR
+ [ -n "$COMP_LINE" ] && return
+ [ "$BASH_COMMAND" == "$PROMPT_COMMAND" ] && return
+ [ -z "$BASH_COMMAND" ] && return
+ [[ "$BASH_COMMAND" =~ ^exit$|^set\ |^shopt\ |^trap\ |^sudoon$|^sudooff$ ]] && return
+ [ -z "$PREEXEC_PROMPT" ] && return
+ if [ "$PREEXEC_PROMPT" -eq 0 ]; then
+ # echo cancelling "$BASH_COMMAND"
+ return 1
+ fi
+
+ # echo "trap-DEBUG"
+ trap - DEBUG
+ PREEXEC_PROMPT=0
+ FULL_COMMAND=$(HISTTIMEFORMAT='' history 1 | sed -e "s/^[ ]*[0-9]*[ ]*//")
+ # echo "Running _preexec_sudo $FULL_COMMAND"
+ ARG_0=$(cut -d' ' -f1 <<< "$BASH_COMMAND")
+ TYPE=$(type "$ARG_0" 2> /dev/null | head -n 1)
+ if [[ ! "$TYPE" =~ / ]]
+ then
+ if [ "$BASH_COMMAND" == "$FULL_COMMAND" ]
+ then
+ if [[ "$BASH_COMMAND" =~ ^cd\ ]]
+ then
+ if [ -z "$SUDO_DIR" ]
+ then
+ if $BASH_COMMAND 2> /dev/null
+ then
+ trap "_preexec_sudo" DEBUG
+ return 1
+ else
+ DIR=$(sudo bash -c "$BASH_COMMAND; pwd")
+ DIR_ERR=$?
+ fi
+ else
+ DIR=$(sudo bash -c "cd $SUDO_DIR; $BASH_COMMAND; pwd")
+ DIR_ERR=$?
+ fi
+ if [ "$DIR_ERR" -eq 0 ]
+ then
+ if cd "$DIR" 2> /dev/null
+ then
+ SUDO_DIR=''
+ PS1=$ORIGINAL_PS1"sudo: "
+ else
+ SUDO_DIR=$DIR
+ [ -n "$SUDO_DIR" ] && PS1_SUDO_DIR="($(echo "$SUDO_DIR" | rev | cut -d'/' -f1 | rev))" || PS1_SUDO_DIR=''
+ PS1=$ORIGINAL_PS1"sudo$PS1_SUDO_DIR: "
+ fi
+ fi
+ trap "_preexec_sudo" DEBUG
+ return 1
+ elif [ -z "$SUDO_DIR" ]
+ then
+ trap "_preexec_sudo" DEBUG
+ return # single call to function / builtin; not sudoing
+ fi
+ fi
+ fi
+ [[ "$TYPE" =~ / ]] && [ "$(which "$ARG_0")" == "$(which sudo)" ] && return 0 # execute explicit sudo as-is
+ if [ -n "$SUDO_DIR" ]
+ then
+ CMD_DIR="cd $SUDO_DIR; "
+ else
+ CMD_DIR=''
+ fi
+ if [ ! "$BASH_COMMAND" == "$FULL_COMMAND" ] || [ -n "$CMD_DIR" ]
+ then
+ # echo combined or cd command: `printf '%q' "$CMD_DIR$FULL_COMMAND"`
+ eval sudo -E bash -c $(printf '%q' "$CMD_DIR$FULL_COMMAND")
+ else
+ eval sudo -E $FULL_COMMAND
+ fi
+ trap "_preexec_sudo" DEBUG
+ return 1
+ }
diff --git a/linux/system/repo/aptly.yml b/linux/system/repo/aptly.yml
new file mode 100644
index 0000000..330ba03
--- /dev/null
+++ b/linux/system/repo/aptly.yml
@@ -0,0 +1,9 @@
+parameters:
+ linux:
+ system:
+ repo:
+ aptly:
+ source: "deb http://repo.aptly.info/ squeeze main"
+ architectures: amd64
+ key_id: 9E3E53F19C7DE460
+ key_server: keys.gnupg.net
diff --git a/linux/system/repo/ceph.yml b/linux/system/repo/ceph.yml
new file mode 100644
index 0000000..ccf63d7
--- /dev/null
+++ b/linux/system/repo/ceph.yml
@@ -0,0 +1,11 @@
+parameters:
+ _param:
+ linux_repo_ceph_component: jewel
+ linux_repo_ceph_mirror: download
+ linux:
+ system:
+ repo:
+ ceph:
+ source: "deb [arch=amd64] https://${_param:linux_repo_ceph_mirror}.ceph.com/debian-${_param:linux_repo_ceph_component} ${_param:linux_system_codename} main"
+ architectures: amd64
+ key_url: "https://${_param:linux_repo_ceph_mirror}.ceph.com/keys/release.asc"
diff --git a/linux/system/repo/docker.yml b/linux/system/repo/docker.yml
index c527aa8..bb36728 100644
--- a/linux/system/repo/docker.yml
+++ b/linux/system/repo/docker.yml
@@ -3,7 +3,6 @@
system:
repo:
docker:
- source: "deb https://apt.dockerproject.org/repo ubuntu-${_param:linux_system_codename} main"
+ source: 'deb [arch=amd64] https://download.docker.com/linux/ubuntu/ ${_param:linux_system_codename} stable'
architectures: amd64
- key_id: 58118E89F3A912897C070ADBF76221572C52609D
- key_server: keyserver.ubuntu.com
+ key_url: https://download.docker.com/linux/ubuntu/gpg
diff --git a/linux/system/repo/elasticsearch.yml b/linux/system/repo/elasticsearch.yml
index 60f6fd0..2030114 100644
--- a/linux/system/repo/elasticsearch.yml
+++ b/linux/system/repo/elasticsearch.yml
@@ -5,4 +5,8 @@
elasticsearch:
source: "deb http://packages.elastic.co/elasticsearch/2.x/debian stable main"
architectures: amd64
- key_url: "https://packages.elastic.co/GPG-KEY-elasticsearch"
\ No newline at end of file
+ key_url: "https://packages.elastic.co/GPG-KEY-elasticsearch"
+ elasticsearch_curator:
+ source: "deb http://packages.elastic.co/curator/4/debian stable main"
+ architectures: amd64
+ key_url: "https://packages.elastic.co/GPG-KEY-elasticsearch"
diff --git a/linux/system/repo/mcp/contrail.yml b/linux/system/repo/mcp/contrail.yml
index 0d9d68e..8dad590 100644
--- a/linux/system/repo/mcp/contrail.yml
+++ b/linux/system/repo/mcp/contrail.yml
@@ -7,7 +7,7 @@
system:
repo:
mcp_opencontrail:
- source: "deb [arch=amd64] http://apt-mk.mirantis.com/${_param:linux_system_codename}/ ${_param:linux_system_repo_mcp_contrail_version} ${_param:openstack_version} ${_param:linux_repo_contrail_component} extra"
+ source: "deb [arch=amd64] http://apt-mk.mirantis.com/${_param:linux_system_codename}/ ${_param:linux_system_repo_mcp_contrail_version} ${_param:linux_repo_contrail_component} extra"
architectures: amd64
key_url: "http://apt-mk.mirantis.com/public.gpg"
pin:
diff --git a/linux/system/single/debian.yml b/linux/system/single/debian.yml
new file mode 100644
index 0000000..b6d0b2b
--- /dev/null
+++ b/linux/system/single/debian.yml
@@ -0,0 +1,10 @@
+classes:
+- system.linux.system.single
+
+# DEBIAN family overrides
+parameters:
+ linux:
+ system:
+ package:
+ python-msgpack:
+ version: latest
diff --git a/linux/system/single.yml b/linux/system/single/init.yml
similarity index 84%
rename from linux/system/single.yml
rename to linux/system/single/init.yml
index ef23a39..1e68380 100644
--- a/linux/system/single.yml
+++ b/linux/system/single/init.yml
@@ -4,13 +4,21 @@
- system.openssh.server.single
- system.ntp.client.single
parameters:
+ _param:
+ local_package_repos: false
linux:
system:
+ local_package_repos: ${_param:local_package_repos}
+ user:
+ root:
+ enabled: true
+ name: root
+ home: /root
package:
- python-msgpack:
- version: latest
cloud-init:
version: purged
+ unattended-updates:
+ version: purged
mcelog:
version: latest
kernel:
@@ -30,6 +38,7 @@
net.ipv4.neigh.default.gc_thresh2: 8192
net.ipv4.neigh.default.gc_thresh3: 16384
net.core.netdev_max_backlog: 261144
+ net.ipv4.tcp_tw_reuse: 1
kernel.panic: 60
cpu:
governor: performance
diff --git a/linux/system/single/rhel.yml b/linux/system/single/rhel.yml
new file mode 100644
index 0000000..38dba03
--- /dev/null
+++ b/linux/system/single/rhel.yml
@@ -0,0 +1,4 @@
+classes:
+- system.linux.system.single
+
+# RHEL family overrides
diff --git a/linux/system/sudo.yml b/linux/system/sudo.yml
index 8f03f7d..68f2b84 100644
--- a/linux/system/sudo.yml
+++ b/linux/system/sudo.yml
@@ -21,21 +21,33 @@
- /bin/su -
- /bin/su
- /usr/sbin/visudo
+ - /usr/bin/sudo
+ - /bin/bash
sudo_coreutils_safe:
+ - /usr/bin/cat
- /usr/bin/less
+ - /usr/bin/view
+ - /usr/bin/more
- /usr/bin/grep
- /usr/bin/fgrep
- /usr/bin/egrep
- /usr/bin/zgrep
+ - /usr/bin/ack
- /usr/bin/tail
- /usr/bin/socat
- /usr/bin/top
+ - /usr/bin/atop
- /usr/bin/tail
- /usr/bin/lsof
- /usr/bin/virsh
- /bin/ls
- /bin/cp
- /bin/netstat
+ sudo_coreutils_trusted:
+ - /usr/bin/vi*
+ - /usr/bin/vim*
+ - /usr/bin/emacs*
+ - /usr/bin/nano*
sudo_rabbitmq_safe:
- /usr/sbin/rabbitmqctl
- /usr/sbin/rabbitmqctl status
@@ -79,6 +91,9 @@
- /usr/bin/rados*
- /usr/bin/rbd
- /usr/sbin/gluster
+ - /usr/fdisk -l *
+ - /usr/bin/du *
+ - /bin/df *
sudo_openstack_clients:
- /usr/bin/openstack
- /usr/bin/heat*
diff --git a/mysql/client/database/barbican.yml b/mysql/client/database/barbican.yml
new file mode 100644
index 0000000..f9fe6dd
--- /dev/null
+++ b/mysql/client/database/barbican.yml
@@ -0,0 +1,17 @@
+parameters:
+ mysql:
+ client:
+ server:
+ database:
+ database:
+ barbican:
+ encoding: utf8
+ users:
+ - name: barbican
+ password: ${_param:mysql_barbican_password}
+ host: '%'
+ rights: all
+ - name: barbican
+ password: ${_param:mysql_barbican_password}
+ host: ${_param:single_address}
+ rights: all
diff --git a/neutron/compute/cluster.yml b/neutron/compute/cluster.yml
index d6674f0..13ee31c 100644
--- a/neutron/compute/cluster.yml
+++ b/neutron/compute/cluster.yml
@@ -3,10 +3,18 @@
parameters:
_param:
neutron_enable_qos: False
+ neutron_enable_vlan_aware_vms: False
+ linux:
+ system:
+ package:
+ python-pymysql:
+ fromrepo: ${_param:openstack_version}
+ version: latest
neutron:
compute:
dvr: ${_param:neutron_compute_dvr}
qos: ${_param:neutron_enable_qos}
+ vlan_aware_vms: ${_param:neutron_enable_vlan_aware_vms}
agent_mode: ${_param:neutron_compute_agent_mode}
external_access: ${_param:neutron_compute_external_access}
backend:
diff --git a/neutron/control/cluster.yml b/neutron/control/cluster.yml
index dd1d3ee..9beed6b 100644
--- a/neutron/control/cluster.yml
+++ b/neutron/control/cluster.yml
@@ -4,6 +4,12 @@
- service.neutron.control.cluster
- system.haproxy.proxy.listen.openstack.neutron
parameters:
+ linux:
+ system:
+ package:
+ python-pymysql:
+ fromrepo: ${_param:openstack_version}
+ version: latest
mysql:
server:
database:
diff --git a/neutron/control/openvswitch/cluster.yml b/neutron/control/openvswitch/cluster.yml
index 0587342..c840e9a 100644
--- a/neutron/control/openvswitch/cluster.yml
+++ b/neutron/control/openvswitch/cluster.yml
@@ -10,6 +10,7 @@
neutron_external_mtu: 1500
neutron_tenant_network_types: "flat,vxlan"
neutron_enable_qos: False
+ neutron_enable_vlan_aware_vms: False
neutron:
server:
plugin: ml2
@@ -17,6 +18,7 @@
l3_ha: ${_param:neutron_l3_ha}
dvr: ${_param:neutron_control_dvr}
qos: ${_param:neutron_enable_qos}
+ vlan_aware_vms: ${_param:neutron_enable_vlan_aware_vms}
backend:
engine: ml2
tenant_network_types: "${_param:neutron_tenant_network_types}"
diff --git a/neutron/control/openvswitch/single.yml b/neutron/control/openvswitch/single.yml
index 91db484..1b830f6 100644
--- a/neutron/control/openvswitch/single.yml
+++ b/neutron/control/openvswitch/single.yml
@@ -8,6 +8,7 @@
neutron_external_mtu: 1500
neutron_tenant_network_types: "flat,vxlan"
neutron_enable_qos: False
+ neutron_enable_vlan_aware_vms: False
neutron:
server:
plugin: ml2
@@ -15,6 +16,7 @@
l3_ha: ${_param:neutron_l3_ha}
dvr: ${_param:neutron_control_dvr}
qos: ${_param:neutron_enable_qos}
+ vlan_aware_vms: ${_param:neutron_enable_vlan_aware_vms}
backend:
engine: ml2
tenant_network_types: "${_param:neutron_tenant_network_types}"
diff --git a/neutron/control/single.yml b/neutron/control/single.yml
index 663ec32..e412f36 100644
--- a/neutron/control/single.yml
+++ b/neutron/control/single.yml
@@ -1,6 +1,12 @@
classes:
- service.neutron.control.single
parameters:
+ linux:
+ system:
+ package:
+ python-pymysql:
+ fromrepo: ${_param:openstack_version}
+ version: latest
neutron:
server:
database:
diff --git a/neutron/fwaas.yml b/neutron/fwaas.yml
new file mode 100644
index 0000000..79c6439
--- /dev/null
+++ b/neutron/fwaas.yml
@@ -0,0 +1,8 @@
+classes:
+- service.neutron.fwaas
+parameters:
+ _param:
+ fwaas_version: v1
+ neutron:
+ fwaas:
+ api_version: ${_param:fwaas_version}
diff --git a/neutron/gateway/cluster.yml b/neutron/gateway/cluster.yml
index a4f37b1..c96c6bb 100644
--- a/neutron/gateway/cluster.yml
+++ b/neutron/gateway/cluster.yml
@@ -3,10 +3,12 @@
parameters:
_param:
neutron_enable_qos: False
+ neutron_enable_vlan_aware_vms: False
neutron:
gateway:
dvr: ${_param:neutron_gateway_dvr}
qos: ${_param:neutron_enable_qos}
+ vlan_aware_vms: ${_param:neutron_enable_vlan_aware_vms}
agent_mode: ${_param:neutron_gateway_agent_mode}
backend:
tenant_network_types: ${_param:neutron_tenant_network_types}"
diff --git a/nginx/server/proxy/cicd/gerrit.yml b/nginx/server/proxy/cicd/gerrit.yml
index 2593dd7..0baf26c 100644
--- a/nginx/server/proxy/cicd/gerrit.yml
+++ b/nginx/server/proxy/cicd/gerrit.yml
@@ -1,34 +1,23 @@
parameters:
_param:
- nginx_proxy_gerrit_server_ssl_authority: virt
- nginx_proxy_gerrit_server_proxy_host: ${_param:single_address}
- nginx_proxy_gerrit_server_proxy_port: 8082
- nginx_proxy_gerrit_server_site_host: ${linux:network:fqdn}
- nginx_proxy_gerrit_server_site_port: 8083
+ nginx_proxy_gerrit_server_proxy_host: ${_param:cicd_control_address}
+ nginx_proxy_gerrit_server_proxy_port: 8080
+ nginx_proxy_gerrit_server_site_host: ${_param:cluster_public_host}
+ nginx_proxy_gerrit_server_site_port: 8080
nginx:
server:
enabled: true
- user:
- admin:
- enabled: true
- password: password
site:
- nginx_proxy_gerrit_server:
+ nginx_proxy_gerrit:
enabled: true
type: nginx_proxy
- name: gerrit_server
- auth:
- engine: basic
+ name: gerrit
proxy:
host: ${_param:nginx_proxy_gerrit_server_proxy_host}
port: ${_param:nginx_proxy_gerrit_server_proxy_port}
protocol: http
- ssl:
- enabled: true
- engine: salt
- authority: ${_param:nginx_proxy_gerrit_server_ssl_authority}
- certificate: ${_param:nginx_proxy_gerrit_server_site_host}
- mode: secure
host:
name: ${_param:nginx_proxy_gerrit_server_site_host}
port: ${_param:nginx_proxy_gerrit_server_site_port}
+ protocol: https
+ ssl: ${_param:nginx_proxy_ssl}
diff --git a/nginx/server/proxy/cicd/jenkins.yml b/nginx/server/proxy/cicd/jenkins.yml
index 975cc4d..bd270f2 100644
--- a/nginx/server/proxy/cicd/jenkins.yml
+++ b/nginx/server/proxy/cicd/jenkins.yml
@@ -1,4 +1,9 @@
parameters:
+ _param:
+ nginx_proxy_jenkins_server_proxy_host: ${_param:cicd_control_address}
+ nginx_proxy_jenkins_server_proxy_port: 8081
+ nginx_proxy_jenkins_server_site_host: ${_param:cluster_public_host}
+ nginx_proxy_jenkins_server_site_port: 8081
nginx:
server:
enabled: true
@@ -8,11 +13,11 @@
type: nginx_proxy
name: jenkins
proxy:
- host: ${_param:foundation_intergration_address}
- port: 8080
+ host: ${_param:nginx_proxy_jenkins_server_proxy_host}
+ port: ${_param:nginx_proxy_jenkins_server_proxy_port}
protocol: http
host:
- name: ${_param:cluster_public_host}
- port: 8095
+ name: ${_param:nginx_proxy_jenkins_server_site_host}
+ port: ${_param:nginx_proxy_jenkins_server_site_port}
protocol: https
ssl: ${_param:nginx_proxy_ssl}
diff --git a/nginx/server/proxy/openstack/barbican.yml b/nginx/server/proxy/openstack/barbican.yml
new file mode 100644
index 0000000..5f658d1
--- /dev/null
+++ b/nginx/server/proxy/openstack/barbican.yml
@@ -0,0 +1,20 @@
+parameters:
+ _param:
+ nginx_proxy_openstack_api_host: ${_param:cluster_public_host}
+ nginx:
+ server:
+ enabled: true
+ site:
+ nginx_proxy_openstack_api_barbican:
+ enabled: true
+ type: nginx_proxy
+ name: openstack_api_barbican
+ check: false
+ proxy:
+ host: ${_param:barbican_service_host}
+ port: 9311
+ protocol: http
+ host:
+ name: ${_param:nginx_proxy_openstack_api_host}
+ port: 9311
+ ssl: ${_param:nginx_proxy_ssl}
diff --git a/nova/client/flavor/default.yml b/nova/client/flavor/default.yml
new file mode 100644
index 0000000..1d374c5
--- /dev/null
+++ b/nova/client/flavor/default.yml
@@ -0,0 +1,64 @@
+classes:
+- service.nova.client
+parameters:
+ nova:
+ client:
+ server:
+ admin_identity:
+ flavor:
+ m1.tiny:
+ ram: 256
+ disk: 1
+ vcpus: 1
+ m1.medium80:
+ ram: 4096
+ disk: 80
+ vcpus: 2
+ m1.xxlarge40:
+ ram: 32300
+ disk: 40
+ vcpus: 16
+ m1.large20:
+ ram: 8128
+ disk: 20
+ vcpus: 4
+ m1.large1000:
+ ram: 8128
+ disk: 1000
+ vcpus: 8
+ m1.large40:
+ ram: 8128
+ disk: 40
+ vcpus: 4
+ m1.medium20:
+ ram: 4096
+ disk: 20
+ vcpus: 2
+ m1.xlarge40:
+ ram: 16200
+ disk: 40
+ vcpus: 8
+ m1.small:
+ ram: 2048
+ disk: 20
+ vcpus: 1
+ m1.large:
+ ram: 8128
+ disk: 80
+ vcpus: 4
+ m1.xlarge:
+ ram: 16200
+ disk: 160
+ vcpus: 8
+ m1.medium:
+ ram: 4000
+ disk: 40
+ vcpus: 2
+ m1.xlarge20:
+ ram: 16200
+ disk: 20
+ vcpus: 8
+ m1.large100:
+ ram: 8096
+ disk: 100
+ vcpus: 4
diff --git a/nova/client/flavor/devcloud.yml b/nova/client/flavor/devcloud.yml
new file mode 100644
index 0000000..7e0f5ff
--- /dev/null
+++ b/nova/client/flavor/devcloud.yml
@@ -0,0 +1,80 @@
+classes:
+- service.nova.client
+parameters:
+ nova:
+ client:
+ server:
+ admin_identity:
+ flavor:
+ k8s_ctl_medium:
+ ram: 8192
+ disk: 40
+ vcpus: 2
+ k8_cmp_small:
+ ram: 4096
+ disk: 40
+ vcpus: 2
+ k8s_ctl_small:
+ ram: 4096
+ disk: 20
+ vcpus: 2
+ os_ha_ctl:
+ ram: 16384
+ disk: 60
+ vcpus: 8
+ stl_mon_medium:
+ ram: 8192
+ disk: 60
+ vcpus: 4
+ cfg_salt_small:
+ ram: 4096
+ disk: 20
+ vcpus: 1
+ os_cmp_small:
+ ram: 8192
+ disk: 40
+ vcpus: 4
+ windows:
+ ram: 8186
+ disk: 160
+ vcpus: 2
+ cid_aio:
+ ram: 24576
+ disk: 60
+ vcpus: 8
+ oc_aio_large:
+ ram: 16384
+ disk: 60
+ vcpus: 8
+ oc_aio_small:
+ ram: 8192
+ disk: 60
+ vcpus: 2
+ cph_ha_osd:
+ ram: 8192
+ disk: 60
+ vcpus: 4
+ cph_cfs:
+ ram: 8192
+ disk: 40
+ vcpus: 4
+ oc_vsrx:
+ ram: 4096
+ disk: 80
+ vcpus: 2
+ os_aio_ctl:
+ ram: 24576
+ disk: 60
+ vcpus: 8
+ oc_aio_medium:
+ ram: 8192
+ disk: 60
+ vcpus: 4
+ cph_ha_mon:
+ ram: 8192
+ disk: 40
+ vcpus: 4
+ cfg_salt_small-1:
+ ram: 4096
+ disk: 20
+ vcpus: 1
diff --git a/nova/client/service/octavia.yml b/nova/client/service/octavia.yml
index e0b6557..e31fde3 100644
--- a/nova/client/service/octavia.yml
+++ b/nova/client/service/octavia.yml
@@ -1,8 +1,6 @@
classes:
- service.nova.client
parameters:
- _param:
- octavia_ssh_key_path: "/etc/octavia/.ssh/octavia_ssh_key.pub"
nova:
client:
server:
@@ -18,4 +16,4 @@
endpoint_type: internalURL
keypair:
octavia_ssh_key:
- pub_file: ${_param:octavia_ssh_key_path}
+ pub_key: ${_param:octavia_public_key}
diff --git a/nova/control/cluster.yml b/nova/control/cluster.yml
index d47c5e1..dee725d 100644
--- a/nova/control/cluster.yml
+++ b/nova/control/cluster.yml
@@ -11,6 +11,12 @@
nova_ram_allocation_ratio: 1.5
nova_disk_allocation_ratio: 1.0
metadata_password: metadataPass
+ linux:
+ system:
+ package:
+ python-pymysql:
+ fromrepo: ${_param:openstack_version}
+ version: latest
nova:
controller:
enabled: true
diff --git a/nova/control/single.yml b/nova/control/single.yml
index 00182a3..c2aef10 100644
--- a/nova/control/single.yml
+++ b/nova/control/single.yml
@@ -1,6 +1,12 @@
classes:
- service.nova.control.single
parameters:
+ linux:
+ system:
+ package:
+ python-pymysql:
+ fromrepo: ${_param:openstack_version}
+ version: latest
nova:
controller:
database:
diff --git a/octavia/manager/single.yml b/octavia/manager/single.yml
index a7bc7a9..acab136 100644
--- a/octavia/manager/single.yml
+++ b/octavia/manager/single.yml
@@ -5,3 +5,7 @@
manager:
enabled: true
version: ${_param:octavia_version}
+ ssh:
+ private_key: ${_param:octavia_private_key}
+ user: octavia
+ group: octavia
diff --git a/opencontrail/client/resource/k8s_api.yml b/opencontrail/client/resource/k8s_api.yml
index 3c6102b..79d6f0d 100644
--- a/opencontrail/client/resource/k8s_api.yml
+++ b/opencontrail/client/resource/k8s_api.yml
@@ -4,6 +4,6 @@
linklocal_service:
k8s_api:
lls_ip: ${_param:kubernetes_internal_api_address}
- lls_port: 6443
+ lls_port: 443
ipf_addresses: ${_param:kubernetes_control_address}
ipf_port: 443
diff --git a/opencontrail/client/resource/virtual_router.yml b/opencontrail/client/resource/virtual_router.yml
index 0333c8f..c02f8e8 100644
--- a/opencontrail/client/resource/virtual_router.yml
+++ b/opencontrail/client/resource/virtual_router.yml
@@ -1,10 +1,12 @@
parameters:
_param:
contrail_compute_dpdk_enabled: False
+ contrail_client_virtual_router_type: hypervisor
opencontrail:
client:
virtual_router:
local_compute:
name: ${linux:system:name}
ip_address: ${_param:single_address}
- dpdk_enabled: ${_param:contrail_compute_dpdk_enabled}
\ No newline at end of file
+ dpdk_enabled: ${_param:contrail_compute_dpdk_enabled}
+ router_type: ${_param:contrail_client_virtual_router_type}
diff --git a/opencontrail/compute/tor/cluster.yml b/opencontrail/compute/tor/cluster.yml
new file mode 100644
index 0000000..662de03
--- /dev/null
+++ b/opencontrail/compute/tor/cluster.yml
@@ -0,0 +1,4 @@
+classes:
+- service.haproxy.proxy.single
+- service.keepalived.cluster.single
+- service.opencontrail.compute.tor.cluster
diff --git a/opencontrail/control/control.yml b/opencontrail/control/control.yml
index fdc4f7d..50c0c77 100644
--- a/opencontrail/control/control.yml
+++ b/opencontrail/control/control.yml
@@ -4,7 +4,10 @@
- system.haproxy.proxy.listen.opencontrail.control
parameters:
_param:
- multi_tenancy: false
+ multi_tenancy: false
+ opencontrail_message_queue_node01_address: ${_param:openstack_message_queue_node01_address}
+ opencontrail_message_queue_node02_address: ${_param:openstack_message_queue_node02_address}
+ opencontrail_message_queue_node03_address: ${_param:openstack_message_queue_node03_address}
opencontrail:
common:
identity:
@@ -21,9 +24,9 @@
address: ${_param:cluster_local_address}
message_queue:
members:
- - host: ${_param:openstack_message_queue_node01_address}
- - host: ${_param:openstack_message_queue_node02_address}
- - host: ${_param:openstack_message_queue_node03_address}
+ - host: ${_param:opencontrail_message_queue_node01_address}
+ - host: ${_param:opencontrail_message_queue_node02_address}
+ - host: ${_param:opencontrail_message_queue_node03_address}
identity:
region: ${_param:openstack_region}
host: ${_param:openstack_control_address}
diff --git a/openssh/server/team/all.yml b/openssh/server/team/all.yml
new file mode 100644
index 0000000..1fea51d
--- /dev/null
+++ b/openssh/server/team/all.yml
@@ -0,0 +1,21 @@
+classes:
+- system.openssh.server.team.lab
+- system.openssh.server.team.cicd
+- system.openssh.server.team.mcp_qa
+- system.openssh.server.team.mcp_ci
+- system.openssh.server.team.mmo_devops
+- system.openssh.server.team.presales
+- system.openssh.server.team.services
+# avoid teams w/sudo group restrictions, or override restrictions
+#- system.openssh.server.team.support
+- system.openssh.server.team.stacklight
+- system.openssh.server.team.networking
+- system.openssh.server.team.oss_team
+- system.openssh.server.team.services_qa
+- system.openssh.server.team.qa_scale
+- system.openssh.server.team.oscore_devops
+- system.openssh.server.team.k8s_team
+- system.openssh.server.team.k8s_apps_team
+parameters:
+ _param:
+ linux_system_user_sudo: true
diff --git a/openssh/server/team/cicd.yml b/openssh/server/team/cicd.yml
new file mode 100644
index 0000000..99f6bd6
--- /dev/null
+++ b/openssh/server/team/cicd.yml
@@ -0,0 +1,19 @@
+classes:
+- system.openssh.server.team.members.akomarek
+- system.openssh.server.team.members.atengler
+- system.openssh.server.team.members.fpytloun
+- system.openssh.server.team.members.jbroulik
+- system.openssh.server.team.members.jcach
+- system.openssh.server.team.members.jjosef
+- system.openssh.server.team.members.jpavlik
+- system.openssh.server.team.members.mpolreich
+- system.openssh.server.team.members.rfelkl
+- system.openssh.server.team.members.tkukral
+- system.openssh.server.team.members.psvimbersky
+
+parameters:
+ _param:
+ linux_system_user_sudo: true
+ openssh:
+ server:
+ enabled: true
diff --git a/openssh/server/team/k8s_apps_team.yml b/openssh/server/team/k8s_apps_team.yml
index e57ed1a..1cd8bd9 100644
--- a/openssh/server/team/k8s_apps_team.yml
+++ b/openssh/server/team/k8s_apps_team.yml
@@ -1,4 +1,6 @@
parameters:
+ _param:
+ linux_system_user_sudo: true
linux:
system:
user:
diff --git a/openssh/server/team/k8s_team.yml b/openssh/server/team/k8s_team.yml
index 36f3252..9ec2b88 100644
--- a/openssh/server/team/k8s_team.yml
+++ b/openssh/server/team/k8s_team.yml
@@ -1,4 +1,6 @@
parameters:
+ _param:
+ linux_system_user_sudo: true
linux:
system:
user:
diff --git a/openssh/server/team/l1_support.yml b/openssh/server/team/l1_support.yml
index aab98c7..1db07d6 100644
--- a/openssh/server/team/l1_support.yml
+++ b/openssh/server/team/l1_support.yml
@@ -1,3 +1,5 @@
+## DEPRECATED, this class will be removed 01/2018
+# please use support.yml instead
classes:
- system.linux.system.sudo
# L1
@@ -11,18 +13,21 @@
- system.openssh.server.team.members.deniskostriukov
- system.openssh.server.team.members.dmitrygoloshubov
- system.openssh.server.team.members.javierdiaz
+- system.openssh.server.team.members.jorgesorondo
- system.openssh.server.team.members.josuepalmerin
- system.openssh.server.team.members.krzysztoffranckowski
- system.openssh.server.team.members.matthewroark
- system.openssh.server.team.members.maximefimov
- system.openssh.server.team.members.michaelpetersen
- system.openssh.server.team.members.mikhailkraynov
-- system.openssh.server.team.members.nadezhdakabanova
+- system.openssh.server.team.members.nkabanova
- system.openssh.server.team.members.renesoto
- system.openssh.server.team.members.rsafonov
- system.openssh.server.team.members.scottmachtmes
- system.openssh.server.team.members.zahedkhurasani
parameters:
+ _param:
+ linux_system_user_sudo: false
linux:
system:
group:
diff --git a/openssh/server/team/l2_support.yml b/openssh/server/team/l2_support.yml
index 6c54999..d231abc 100644
--- a/openssh/server/team/l2_support.yml
+++ b/openssh/server/team/l2_support.yml
@@ -1,3 +1,5 @@
+## DEPRECATED, this class will be removed 01/2018
+# please use support3.yml instead
classes:
- system.linux.system.sudo
# L2
@@ -16,6 +18,8 @@
- system.openssh.server.team.members.oliemieshko
- system.openssh.server.team.members.sovsianikov
parameters:
+ _param:
+ linux_system_user_sudo: false
linux:
system:
group:
diff --git a/openssh/server/team/lab.yml b/openssh/server/team/lab.yml
index 7ede7c0..b6c90f8 100644
--- a/openssh/server/team/lab.yml
+++ b/openssh/server/team/lab.yml
@@ -1,5 +1,6 @@
parameters:
_param:
+ linux_system_user_sudo: true
# This is the public key associated to the default private key setup in
# openssh.client.lab
cluster_public_key: >-
diff --git a/openssh/server/team/mcp_ci.yml b/openssh/server/team/mcp_ci.yml
index 4bf0a5c..829839e 100644
--- a/openssh/server/team/mcp_ci.yml
+++ b/openssh/server/team/mcp_ci.yml
@@ -1,4 +1,6 @@
parameters:
+ _param:
+ linux_system_user_sudo: true
linux:
system:
user:
diff --git a/openssh/server/team/mcp_qa.yml b/openssh/server/team/mcp_qa.yml
index 1da0d1e..e80d339 100644
--- a/openssh/server/team/mcp_qa.yml
+++ b/openssh/server/team/mcp_qa.yml
@@ -1,4 +1,6 @@
parameters:
+ _param:
+ linux_system_user_sudo: true
linux:
system:
user:
diff --git a/openssh/server/team/members/achuprin.yml b/openssh/server/team/members/achuprin.yml
index 0fbea13..08edc89 100644
--- a/openssh/server/team/members/achuprin.yml
+++ b/openssh/server/team/members/achuprin.yml
@@ -5,7 +5,7 @@
achuprin:
enabled: true
name: achuprin
- sudo: true
+ sudo: ${_param:linux_system_user_sudo}
full_name: Alexey Chuprin
home: /home/achuprin
email: achuprin@mirantis.com
diff --git a/openssh/server/team/members/aepifanov.yml b/openssh/server/team/members/aepifanov.yml
index cb7c8e9..be825bc 100644
--- a/openssh/server/team/members/aepifanov.yml
+++ b/openssh/server/team/members/aepifanov.yml
@@ -5,12 +5,10 @@
aepifanov:
enabled: true
name: aepifanov
- sudo: false
+ sudo: ${_param:linux_system_user_sudo}
full_name: Andrey Epifanov
home: /home/aepifanov
email: aepifanov@mirantis.com
- groups:
- - supportl2
openssh:
server:
enabled: true
diff --git a/openssh/server/team/members/akomarek.yml b/openssh/server/team/members/akomarek.yml
index 7fe33fb..4ccc697 100644
--- a/openssh/server/team/members/akomarek.yml
+++ b/openssh/server/team/members/akomarek.yml
@@ -5,7 +5,7 @@
newt:
enabled: true
name: newt
- sudo: true
+ sudo: ${_param:linux_system_user_sudo}
full_name: Ales Komarek
home: /home/newt
email: mail@newt.cz
diff --git a/openssh/server/team/members/aleksandrdobdin.yml b/openssh/server/team/members/aleksandrdobdin.yml
index 7739e45..34abcf4 100644
--- a/openssh/server/team/members/aleksandrdobdin.yml
+++ b/openssh/server/team/members/aleksandrdobdin.yml
@@ -5,12 +5,10 @@
adobdin:
enabled: true
name: adobdin
- sudo: false
+ sudo: ${_param:linux_system_user_sudo}
full_name: Aleksandr Dobdin
home: /home/adobdin
email: adobdin@mirantis.com
- groups:
- - support
openssh:
server:
enabled: true
diff --git a/openssh/server/team/members/aleksandrrubtsov.yml b/openssh/server/team/members/aleksandrrubtsov.yml
index e9fb4a5..93d26df 100644
--- a/openssh/server/team/members/aleksandrrubtsov.yml
+++ b/openssh/server/team/members/aleksandrrubtsov.yml
@@ -5,12 +5,10 @@
arubtsov:
enabled: true
name: arubtsov
- sudo: false
+ sudo: ${_param:linux_system_user_sudo}
full_name: Aleksandr Rubtsov
home: /home/arubtsov
email: arubtsov@mirantis.com
- groups:
- - support
openssh:
server:
enabled: true
diff --git a/openssh/server/team/members/anatoliineliubin.yml b/openssh/server/team/members/anatoliineliubin.yml
index a86785c..a8b1f21 100644
--- a/openssh/server/team/members/anatoliineliubin.yml
+++ b/openssh/server/team/members/anatoliineliubin.yml
@@ -5,12 +5,10 @@
aneliubin:
enabled: true
name: aneliubin
- sudo: false
+ sudo: ${_param:linux_system_user_sudo}
full_name: Anatolii Neliubin
home: /home/aneliubin
email: aneliuubin@mirantis.com
- groups:
- - support
openssh:
server:
enabled: true
diff --git a/openssh/server/team/members/antonrodionov.yml b/openssh/server/team/members/antonrodionov.yml
index a4347f4..3be1f17 100644
--- a/openssh/server/team/members/antonrodionov.yml
+++ b/openssh/server/team/members/antonrodionov.yml
@@ -5,12 +5,10 @@
arodionov:
enabled: true
name: arodionov
- sudo: false
+ sudo: ${_param:linux_system_user_sudo}
full_name: Anton Rodionov
home: /home/arodionov
email: arodionov@mirantis.com
- groups:
- - support
openssh:
server:
enabled: true
diff --git a/openssh/server/team/members/apetrenko.yml b/openssh/server/team/members/apetrenko.yml
index e754a8e..f4fa3d9 100644
--- a/openssh/server/team/members/apetrenko.yml
+++ b/openssh/server/team/members/apetrenko.yml
@@ -5,12 +5,10 @@
apetrenko:
enabled: true
name: apetrenko
- sudo: false
+ sudo: ${_param:linux_system_user_sudo}
full_name: Andrii Petrenko
home: /home/apetrenko
email: apetrenko@mirantis.com
- groups:
- - supportl2
openssh:
server:
enabled: true
diff --git a/openssh/server/team/members/ashestakov.yml b/openssh/server/team/members/ashestakov.yml
index c3eae16..e00e839 100644
--- a/openssh/server/team/members/ashestakov.yml
+++ b/openssh/server/team/members/ashestakov.yml
@@ -5,7 +5,7 @@
ashestakov:
enabled: true
name: ashestakov
- sudo: true
+ sudo: ${_param:linux_system_user_sudo}
full_name: Andrey Shestakov
home: /home/ashestakov
email: ashestakov@mirantis.com
diff --git a/openssh/server/team/members/ashishkin.yml b/openssh/server/team/members/ashishkin.yml
index e9a132e..9f74171 100644
--- a/openssh/server/team/members/ashishkin.yml
+++ b/openssh/server/team/members/ashishkin.yml
@@ -5,12 +5,10 @@
ashishkin:
enabled: true
name: ashishkin
- sudo: false
+ sudo: ${_param:linux_system_user_sudo}
full_name: Aleksei Shishkin
home: /home/ashishkin
email: ashishkin@mirantis.com
- groups:
- - supportl2
openssh:
server:
enabled: true
diff --git a/openssh/server/team/members/atarasov.yml b/openssh/server/team/members/atarasov.yml
index deada75..935aa91 100644
--- a/openssh/server/team/members/atarasov.yml
+++ b/openssh/server/team/members/atarasov.yml
@@ -5,12 +5,10 @@
atarasov:
enabled: true
name: atarasov
- sudo: false
+ sudo: ${_param:linux_system_user_sudo}
full_name: Anton Tarasov
home: /home/atarasov
email: atarasov@mirantis.com
- groups:
- - supportl2
openssh:
server:
enabled: true
diff --git a/openssh/server/team/members/atengler.yml b/openssh/server/team/members/atengler.yml
index cf06e02..34ef793 100644
--- a/openssh/server/team/members/atengler.yml
+++ b/openssh/server/team/members/atengler.yml
@@ -5,7 +5,7 @@
tux:
enabled: true
name: tux
- sudo: true
+ sudo: ${_param:linux_system_user_sudo}
full_name: Adam Tengler
home: /home/tux
email: atengler@mirantis.com
diff --git a/openssh/server/team/members/cade.yml b/openssh/server/team/members/cade.yml
index dd50b54..6b14ff3 100644
--- a/openssh/server/team/members/cade.yml
+++ b/openssh/server/team/members/cade.yml
@@ -5,7 +5,7 @@
cade:
enabled: true
name: cade
- sudo: true
+ sudo: ${_param:linux_system_user_sudo}
full_name: Cade Ekblad-Frank
home: /home/cade
email: cade@mirantis.com
diff --git a/openssh/server/team/members/chnyda.yml b/openssh/server/team/members/chnyda.yml
new file mode 100644
index 0000000..2bcecaf
--- /dev/null
+++ b/openssh/server/team/members/chnyda.yml
@@ -0,0 +1,20 @@
+parameters:
+ linux:
+ system:
+ user:
+ chnyda:
+ enabled: true
+ name: chnyda
+ sudo: true
+ full_name: Cedric Hnyda
+ home: /home/chnyda
+ email: chnyda@mirantis.com
+ openssh:
+ server:
+ enabled: true
+ user:
+ chnyda:
+ enabled: true
+ public_keys:
+ - key: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQDHmLTwDSFslOUVo4ViT0bqVLhSaweuLt0QNWhnIaSPgqWhHOSkdqt3+Tg4l8Vd4O4Z44Yv/rXqhmO5X1AIytNccA6+nJe4Km3JC6QzG6npS3ghtHWDU3DOGgWd5RrULviEDSIj1w1oG8oHxdycGkbfjApAkiDR/xr7NHhTcPhEuvn/q7i1raj4vpNdIrR+cr6XA3l+I4cmaizpjuWaFrag1q24RS7PVEUmcPRSODrkdwFREsrLkIlIgtIoMIIjtEDdk1RU/loiXrNwuVRI3KTLqhheFlHedQd13uzpn66KF6UVlZAm+k2y2jLdEi5IFKD3g6mmWsNH6xSZYVn6d84/XvLjMsS/UL+WHr5xetHNSi3RtQOkCPYphq1KcRAXLwH0dgtDwfyg2F+5ezG3wMsZAqD3KiaGNmDcA6R19Fpjm0S4SXa+QnX5eZcO9DS5cYTjs8F2T9Vsaspvwc0U80M6+JvOlV1PBNJYQhSxdX1Plf2p1MrrRnYhlgMdzCiPSQHsKp3tei8I+bqCvV9iScLAbLxKaW/yWdeuh74oGitTfI4R0h0HMJ1lqK+rT5wtMXyJSvFMK6Zph0GqJf3QHBhzCfs5PIto1pyNdXbI8KzfgTgyo+3gpIPAQ2VD/pf8mOD218UPNQglYWP6wniTq/hVtC2tl3DW53qx5qv10osGmw== chnyda@mirantis.com
+ user: ${linux:system:user:chnyda}
diff --git a/openssh/server/team/members/collinmay.yml b/openssh/server/team/members/collinmay.yml
index cf55e05..9b29a34 100644
--- a/openssh/server/team/members/collinmay.yml
+++ b/openssh/server/team/members/collinmay.yml
@@ -5,12 +5,10 @@
cmay:
enabled: true
name: cmay
- sudo: false
+ sudo: ${_param:linux_system_user_sudo}
full_name: Collin May
home: /home/cmay
email: cmay@mirantis.com
- groups:
- - support
openssh:
server:
enabled: true
diff --git a/openssh/server/team/members/daniillapshin.yml b/openssh/server/team/members/daniillapshin.yml
index da1a274..0098977 100644
--- a/openssh/server/team/members/daniillapshin.yml
+++ b/openssh/server/team/members/daniillapshin.yml
@@ -5,12 +5,10 @@
dlapshin:
enabled: true
name: dlapshin
- sudo: false
+ sudo: ${_param:linux_system_user_sudo}
full_name: Daniil Lapshin
home: /home/dlapshin
email: dlapshin@mirantis.com
- groups:
- - support
openssh:
server:
enabled: true
diff --git a/openssh/server/team/members/danilakhmetov.yml b/openssh/server/team/members/danilakhmetov.yml
index 1835188..47e38d6 100644
--- a/openssh/server/team/members/danilakhmetov.yml
+++ b/openssh/server/team/members/danilakhmetov.yml
@@ -5,12 +5,10 @@
dakhmetov:
enabled: true
name: dakhmetov
- sudo: false
+ sudo: ${_param:linux_system_user_sudo}
full_name: Danil Akhmetov
home: /home/dakhmetov
email: dakhmetov@mirantis.com
- groups:
- - support
openssh:
server:
enabled: true
diff --git a/openssh/server/team/members/dcech.yml b/openssh/server/team/members/dcech.yml
index 4e6dedf..2d29118 100644
--- a/openssh/server/team/members/dcech.yml
+++ b/openssh/server/team/members/dcech.yml
@@ -5,7 +5,7 @@
dcech:
enabled: true
name: dcech
- sudo: true
+ sudo: ${_param:linux_system_user_sudo}
full_name: Daniel Cech
home: /home/dcech
email: dcech@mirantis.com
diff --git a/openssh/server/team/members/deniskostriukov.yml b/openssh/server/team/members/deniskostriukov.yml
index 1f03ef3..26170dc 100644
--- a/openssh/server/team/members/deniskostriukov.yml
+++ b/openssh/server/team/members/deniskostriukov.yml
@@ -5,12 +5,10 @@
dkostriukov:
enabled: true
name: dkostriukov
- sudo: false
+ sudo: ${_param:linux_system_user_sudo}
full_name: Denis Kostriukov
home: /home/dkostriukov
email: dkostryukov@mirantis.com
- groups:
- - support
openssh:
server:
enabled: true
diff --git a/openssh/server/team/members/dkalashnik.yml b/openssh/server/team/members/dkalashnik.yml
new file mode 100644
index 0000000..52a2a69
--- /dev/null
+++ b/openssh/server/team/members/dkalashnik.yml
@@ -0,0 +1,20 @@
+parameters:
+ linux:
+ system:
+ user:
+ dkalashnik:
+ enabled: true
+ name: dkalashnik
+ sudo: ${_param:linux_system_user_sudo}
+ full_name: Dmitry Kalashnik
+ home: /home/dkalashnik
+ email: dkalashnik@mirantis.com
+ openssh:
+ server:
+ enabled: true
+ user:
+ dkalashnik:
+ enabled: true
+ public_keys:
+ - key: ssh-rsa AAAAB3NzaC1yc2EAAAABJQAAAIEAyz5ovMK/rRxlhiy7x4dVwFkUqN/hhdVIpsQRQoGgTOjVhH6Y+eTE3si0RRq/HKZMwkcClJIqzMgjoajT5eQQphQrAAn2pwuCyZj0mXJJ1RSXQm+nSnhoqyB1r7Nl3keopgxrDlBLWyvyS3dJM9RJy4TimIwhuSA3qdhmfeqRm5M=
+ user: ${linux:system:user:dkalashnik}
\ No newline at end of file
diff --git a/openssh/server/team/members/dklepikov.yml b/openssh/server/team/members/dklepikov.yml
index e1eeb76..fc7b81a 100644
--- a/openssh/server/team/members/dklepikov.yml
+++ b/openssh/server/team/members/dklepikov.yml
@@ -5,12 +5,10 @@
dklepikov:
enabled: true
name: dklepikov
- sudo: false
+ sudo: ${_param:linux_system_user_sudo}
full_name: Denys Klepikov
home: /home/dklepikov
email: dklepikov@mirantis.com
- groups:
- - supportl2
openssh:
server:
enabled: true
diff --git a/openssh/server/team/members/dmitrygoloshubov.yml b/openssh/server/team/members/dmitrygoloshubov.yml
index d9e242c..4509f64 100644
--- a/openssh/server/team/members/dmitrygoloshubov.yml
+++ b/openssh/server/team/members/dmitrygoloshubov.yml
@@ -5,12 +5,10 @@
dgoloshubov:
enabled: true
name: dgoloshubov
- sudo: false
+ sudo: ${_param:linux_system_user_sudo}
full_name: Dmitry Goloshubov
home: /home/dgoloshubov
email: dgoloshubov@mirantis.com
- groups:
- - support
openssh:
server:
enabled: true
diff --git a/openssh/server/team/members/dsutyagin.yml b/openssh/server/team/members/dsutyagin.yml
index 66225c0..1315772 100644
--- a/openssh/server/team/members/dsutyagin.yml
+++ b/openssh/server/team/members/dsutyagin.yml
@@ -5,12 +5,10 @@
dsutyagin:
enabled: true
name: dsutyagin
- sudo: false
+ sudo: ${_param:linux_system_user_sudo}
full_name: Dmitry Sutyagin
home: /home/dsutyagin
email: dsutyagin@mirantis.com
- groups:
- - supportl2
openssh:
server:
enabled: true
diff --git a/openssh/server/team/members/dszeluga.yml b/openssh/server/team/members/dszeluga.yml
index 2eb2b53..6557eac 100644
--- a/openssh/server/team/members/dszeluga.yml
+++ b/openssh/server/team/members/dszeluga.yml
@@ -6,7 +6,7 @@
dszeluga:
enabled: false
name: dszeluga
- sudo: true
+ sudo: ${_param:linux_system_user_sudo}
full_name: Damian Szeluga
home: /home/dszeluga
email: dszeluga@mirantis.com
diff --git a/openssh/server/team/members/ecantwell.yml b/openssh/server/team/members/ecantwell.yml
index 68bb110..309c40b 100644
--- a/openssh/server/team/members/ecantwell.yml
+++ b/openssh/server/team/members/ecantwell.yml
@@ -5,7 +5,7 @@
ecantwell:
enabled: true
name: ecantwell
- sudo: true
+ sudo: ${_param:linux_system_user_sudo}
full_name: Erick Cantwell
home: /home/ecantwell
email: ecantwell@mirantis.com
diff --git a/openssh/server/team/members/ekozhemyakin.yml b/openssh/server/team/members/ekozhemyakin.yml
index 5f7e3f8..afd36c6 100644
--- a/openssh/server/team/members/ekozhemyakin.yml
+++ b/openssh/server/team/members/ekozhemyakin.yml
@@ -5,12 +5,10 @@
ekozhemyakin:
enabled: true
name: ekozhemyakin
- sudo: false
+ sudo: ${_param:linux_system_user_sudo}
full_name: Evgeny Kozhemyakin
home: /home/ekozhemyakin
email: ekozhemyakin@mirantis.com
- groups:
- - supportl2
openssh:
server:
enabled: true
diff --git a/openssh/server/team/members/enikanorov.yml b/openssh/server/team/members/enikanorov.yml
index 5697fa7..2ea5abc 100644
--- a/openssh/server/team/members/enikanorov.yml
+++ b/openssh/server/team/members/enikanorov.yml
@@ -5,12 +5,10 @@
enikanorov:
enabled: true
name: enikanorov
- sudo: false
+ sudo: ${_param:linux_system_user_sudo}
full_name: Eugene Nikanorov
home: /home/enikanorov
email: enikanorov@mirantis.com
- groups:
- - supportl2
openssh:
server:
enabled: true
diff --git a/openssh/server/team/members/fpytloun.yml b/openssh/server/team/members/fpytloun.yml
index 8cdfcec..d5b0937 100644
--- a/openssh/server/team/members/fpytloun.yml
+++ b/openssh/server/team/members/fpytloun.yml
@@ -5,7 +5,7 @@
filip:
enabled: true
name: filip
- sudo: true
+ sudo: ${_param:linux_system_user_sudo}
full_name: Filip Pytloun
home: /home/filip
email: filip@pytloun.cz
diff --git a/openssh/server/team/members/fsoppelsa.yml b/openssh/server/team/members/fsoppelsa.yml
index 6806a0e..4478112 100644
--- a/openssh/server/team/members/fsoppelsa.yml
+++ b/openssh/server/team/members/fsoppelsa.yml
@@ -5,12 +5,10 @@
fsoppelsa:
enabled: true
name: fsoppelsa
- sudo: false
+ sudo: ${_param:linux_system_user_sudo}
full_name: Fabrizio Soppelsa
home: /home/fsoppelsa
email: fsoppelsa@mirantis.com
- groups:
- - supportl2
openssh:
server:
enabled: true
diff --git a/openssh/server/team/members/javierdiaz.yml b/openssh/server/team/members/javierdiaz.yml
index 8d1e765..8b04645 100644
--- a/openssh/server/team/members/javierdiaz.yml
+++ b/openssh/server/team/members/javierdiaz.yml
@@ -5,12 +5,10 @@
jdiaz:
enabled: true
name: jdiaz
- sudo: false
+ sudo: ${_param:linux_system_user_sudo}
full_name: Javier Diaz
home: /home/jdiaz
email: jdiaz@mirantis.com
- groups:
- - support
openssh:
server:
enabled: true
diff --git a/openssh/server/team/members/jbroulik.yml b/openssh/server/team/members/jbroulik.yml
index d7cfcff..6b25ae9 100644
--- a/openssh/server/team/members/jbroulik.yml
+++ b/openssh/server/team/members/jbroulik.yml
@@ -5,7 +5,7 @@
jbroulik:
enabled: true
name: jbroulik
- sudo: true
+ sudo: ${_param:linux_system_user_sudo}
full_name: Jiri Broulik
home: /home/jbroulik
email: jbroulik@mirantis.com
diff --git a/openssh/server/team/members/jcach.yml b/openssh/server/team/members/jcach.yml
index 8ab2a81..a9e7e6d 100644
--- a/openssh/server/team/members/jcach.yml
+++ b/openssh/server/team/members/jcach.yml
@@ -5,7 +5,7 @@
jcach:
enabled: true
name: jcach
- sudo: true
+ sudo: ${_param:linux_system_user_sudo}
full_name: Jan Cach
home: /home/jcach
email: jcach@mirantis.com
diff --git a/openssh/server/team/members/jjosef.yml b/openssh/server/team/members/jjosef.yml
index 210162a..df6d0dd 100644
--- a/openssh/server/team/members/jjosef.yml
+++ b/openssh/server/team/members/jjosef.yml
@@ -5,7 +5,7 @@
jjosef:
enabled: true
name: jjosef
- sudo: true
+ sudo: ${_param:linux_system_user_sudo}
full_name: Jakub Josef
home: /home/jjosef
email: jakub.josef@gmail.com
diff --git a/openssh/server/team/members/jmosher.yml b/openssh/server/team/members/jmosher.yml
index 00535b4..f30c92f 100644
--- a/openssh/server/team/members/jmosher.yml
+++ b/openssh/server/team/members/jmosher.yml
@@ -5,7 +5,7 @@
jmosher:
enabled: true
name: jmosher
- sudo: true
+ sudo: ${_param:linux_system_user_sudo}
full_name: Jaymes Mosher
home: /home/jmosher
email: jmosher@mirantis.com
diff --git a/openssh/server/team/members/jorgesorondo.yml b/openssh/server/team/members/jorgesorondo.yml
new file mode 100644
index 0000000..9f6a1c5
--- /dev/null
+++ b/openssh/server/team/members/jorgesorondo.yml
@@ -0,0 +1,22 @@
+parameters:
+ linux:
+ system:
+ user:
+ jsorondo:
+ enabled: true
+ name: jsorondo
+ sudo: ${_param:linux_system_user_sudo}
+ full_name: Jorge Sorondo
+ home: /home/jsorondo
+ email: jsorondo@mirantis.com
+ openssh:
+ server:
+ enabled: true
+ user:
+ jsorondo:
+ enabled: true
+ public_keys: ${public_keys:jsorondo}
+ user: ${linux:system:user:jsorondo}
+ public_keys:
+ jsorondo:
+ - key: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDQifWsY+b8n8imC0NaP1zVpgihzIT+8A5w35W8dF7YyGcgGOYAcmTRV2Wqm8el9iLsW1ANOdjjulZ/jAzicVwh5IEq9MYjNl4+YjThDN9J1yvw9BjkXPs0Ymrqt4Xq9wZdE5c3P6DaoicxOCEpaL3t1ZxigAcMpQxa5qSyxeY0mvr5eb9O6I0eznEsSjikHOJPaWTdAG5Wx6acwhqB6G7gAF0fpE3Hn+enmtAiqJQVnaBKeX06isMPxyabaNgDCdw1jIJ+uHa3RFRXlucResGiJiDggP+GabKenrSkig8xUWk6UBoO3h28fzEF/J3LSJbL2dHTcWLIrdPZJFVj/0l/
diff --git a/openssh/server/team/members/josuepalmerin.yml b/openssh/server/team/members/josuepalmerin.yml
index 72f3eda..3e0d528 100644
--- a/openssh/server/team/members/josuepalmerin.yml
+++ b/openssh/server/team/members/josuepalmerin.yml
@@ -5,12 +5,10 @@
jpalmerin:
enabled: true
name: jpalmerin
- sudo: false
+ sudo: ${_param:linux_system_user_sudo}
full_name: Josue Palmerin
home: /home/jpalmerin
email: jpalmerin@mirantis.com
- groups:
- - support
openssh:
server:
enabled: true
diff --git a/openssh/server/team/members/jpavlik.yml b/openssh/server/team/members/jpavlik.yml
index 135db8c..b073d7f 100644
--- a/openssh/server/team/members/jpavlik.yml
+++ b/openssh/server/team/members/jpavlik.yml
@@ -5,7 +5,7 @@
jpavlik:
enabled: true
name: jpavlik
- sudo: true
+ sudo: ${_param:linux_system_user_sudo}
full_name: Jakub Pavlik
home: /home/jpavlik
email: jpavlik@mirantis.com
diff --git a/openssh/server/team/members/korlowska.yml b/openssh/server/team/members/korlowska.yml
index 7b1c151..f175273 100644
--- a/openssh/server/team/members/korlowska.yml
+++ b/openssh/server/team/members/korlowska.yml
@@ -5,7 +5,7 @@
korlowska:
enabled: true
name: korlowska
- sudo: true
+ sudo: ${_param:linux_system_user_sudo}
full_name: Katarzyna Orlowska
home: /home/korlowska
email: korlowska@mirantis.com
diff --git a/openssh/server/team/members/krzysztoffranckowski.yml b/openssh/server/team/members/krzysztoffranckowski.yml
index 72edd3f..454c833 100644
--- a/openssh/server/team/members/krzysztoffranckowski.yml
+++ b/openssh/server/team/members/krzysztoffranckowski.yml
@@ -5,12 +5,10 @@
kfranckowski:
enabled: true
name: kfranckowski
- sudo: false
+ sudo: ${_param:linux_system_user_sudo}
full_name: Krzysztof Franckowski
home: /home/kfranckowski
email: kfranckowski@mirantis.com
- groups:
- - support
openssh:
server:
enabled: true
diff --git a/openssh/server/team/members/lmercl.yml b/openssh/server/team/members/lmercl.yml
index 4fd4707..c735ed5 100644
--- a/openssh/server/team/members/lmercl.yml
+++ b/openssh/server/team/members/lmercl.yml
@@ -5,7 +5,7 @@
lmercl:
enabled: true
name: lmercl
- sudo: true
+ sudo: ${_param:linux_system_user_sudo}
full_name: Lubos Mercl
home: /home/lmercl
email: lmercl@mirantis.com
diff --git a/openssh/server/team/members/manashkin.yml b/openssh/server/team/members/manashkin.yml
index bfce163..17da835 100644
--- a/openssh/server/team/members/manashkin.yml
+++ b/openssh/server/team/members/manashkin.yml
@@ -5,12 +5,10 @@
manashkin:
enabled: true
name: manashkin
- sudo: false
+ sudo: ${_param:linux_system_user_sudo}
full_name: Miroslav Anashkin
home: /home/manashkin
email: manashkin@mirantis.com
- groups:
- - support
openssh:
server:
enabled: true
@@ -21,4 +19,3 @@
- key: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDb1XOAU6ZoU+hSB0SPaypwK1Weu2armLzQrIQ3hhmlpAxFDV50oiF/PyPZ7W5NkJWgEr+DGYuZiKuqTDosrQV5Tt8TA4nt6bSJ9SlhJlNGltrOeWeLcP/Hf2YyWm0e9puzAIgUsKN8Np+CBrpIls4bq2JCshkz/vz9AreaFBMHrhjrh8YNn+yNbETJf9nmxDazVqYp3UI5SU4Wg0KchrFHBPNlREL099SSARfTGIsfbbJmSHx2LUw3Rt6v2fizRslv+Tuxvx2tqRsgbjeF7+NKfOFMBIloab97ag7N9EUdVvOHrjScXQ+nP/kdk3iq7O2WDpAgKYXIbSuaWA0YUk5Z manashkin@mirantis.com
user: ${linux:system:user:manashkin}
group:
- - supportl2
diff --git a/openssh/server/team/members/matthewroark.yml b/openssh/server/team/members/matthewroark.yml
index 0a9eb28..3dc01a6 100644
--- a/openssh/server/team/members/matthewroark.yml
+++ b/openssh/server/team/members/matthewroark.yml
@@ -5,12 +5,10 @@
mroark:
enabled: true
name: mroark
- sudo: false
+ sudo: ${_param:linux_system_user_sudo}
full_name: Matthew Roark
home: /home/mroark
email: mroark@mirantis.com
- groups:
- - support
openssh:
server:
enabled: true
diff --git a/openssh/server/team/members/maximefimov.yml b/openssh/server/team/members/maximefimov.yml
index 2dab7d7..9baaaaf 100644
--- a/openssh/server/team/members/maximefimov.yml
+++ b/openssh/server/team/members/maximefimov.yml
@@ -5,12 +5,10 @@
mefimov:
enabled: true
name: mefimov
- sudo: false
+ sudo: ${_param:linux_system_user_sudo}
full_name: Maxim Efimov
home: /home/mefimov
email: mefimov@mirantis.com
- groups:
- - support
openssh:
server:
enabled: true
diff --git a/openssh/server/team/members/mceloud.yml b/openssh/server/team/members/mceloud.yml
index 62dc444..d1f3359 100644
--- a/openssh/server/team/members/mceloud.yml
+++ b/openssh/server/team/members/mceloud.yml
@@ -5,7 +5,7 @@
marco:
enabled: true
name: marco
- sudo: true
+ sudo: ${_param:linux_system_user_sudo}
full_name: Marek Celoud
home: /home/marco
email: mceloud@mirantis.com
diff --git a/openssh/server/team/members/michaelpetersen.yml b/openssh/server/team/members/michaelpetersen.yml
index 8174b6b..4ac6ee6 100644
--- a/openssh/server/team/members/michaelpetersen.yml
+++ b/openssh/server/team/members/michaelpetersen.yml
@@ -5,12 +5,10 @@
mpetersen:
enabled: true
name: mpetersen
- sudo: false
+ sudo: ${_param:linux_system_user_sudo}
full_name: Michael Petersen
home: /home/mpetersen
email: mpetersen@mirantis.com
- groups:
- - support
openssh:
server:
enabled: true
diff --git a/openssh/server/team/members/mikhailkraynov.yml b/openssh/server/team/members/mikhailkraynov.yml
index 0019a41..a7a2d95 100644
--- a/openssh/server/team/members/mikhailkraynov.yml
+++ b/openssh/server/team/members/mikhailkraynov.yml
@@ -5,12 +5,10 @@
mkraynov:
enabled: true
name: mkraynov
- sudo: false
+ sudo: ${_param:linux_system_user_sudo}
full_name: Mikhail Kraynov
home: /home/mkraynov
email: mkraynov@mirantis.com
- groups:
- - support
openssh:
server:
enabled: true
diff --git a/openssh/server/team/members/miwinski.yml b/openssh/server/team/members/miwinski.yml
index 48f91e9..5dc9d80 100644
--- a/openssh/server/team/members/miwinski.yml
+++ b/openssh/server/team/members/miwinski.yml
@@ -5,7 +5,7 @@
miwinski:
enabled: true
name: miwinski
- sudo: true
+ sudo: ${_param:linux_system_user_sudo}
full_name: Marcin Iwinski
home: /home/miwinski
email: miwinski@mirantis.com
diff --git a/openssh/server/team/members/mlos.yml b/openssh/server/team/members/mlos.yml
index 1e9da38..6b30817 100644
--- a/openssh/server/team/members/mlos.yml
+++ b/openssh/server/team/members/mlos.yml
@@ -5,7 +5,7 @@
mlos:
enabled: true
name: mlos
- sudo: true
+ sudo: ${_param:linux_system_user_sudo}
full_name: Mateusz Los
home: /home/mlos
email: mlos@mirantis.com
diff --git a/openssh/server/team/members/mniedbala.yml b/openssh/server/team/members/mniedbala.yml
new file mode 100644
index 0000000..30f7f30
--- /dev/null
+++ b/openssh/server/team/members/mniedbala.yml
@@ -0,0 +1,20 @@
+parameters:
+ linux:
+ system:
+ user:
+ mniedbala:
+ enabled: true
+ name: mniedbala
+ sudo: ${_param:linux_system_user_sudo}
+ full_name: Mikolaj Niedbala
+ home: /home/mniedbala
+ email: mniedbala@mirantis.com
+ openssh:
+ server:
+ enabled: true
+ user:
+ mniedbala:
+ enabled: true
+ public_keys:
+ - key: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDNepHgtflir2vNW+h9cr3hP3llsTlg5uIvvmByykfk455Cum0vSO27mWKZJu0ebU4LXfeH+WP4MjR3tKAKvXqzjGhPVGjMO3wo4/NLlel2CDx99w0KotcjQhW6p+iqLv1AT9E5LW4Kr1NuQ65nvGn6y4SevRw2y36bNS4VJBq40HlgQFTW3oNP+5u4TVzu7QQhulsTUdQETgLswZKsarX7whgvcHvFs1dnbriZlkPXvrKhZLA/CUb7ot+ugw6KWOl+g4gTFLjnt0IXjJXMstCOL9R7/juflUku9CYFvSuq4/T67yMW7XntQ89VkwudSCMjjUWg6ilEG0ghd9+b3bPr mniedbala@mirantis.com
+ user: ${linux:system:user:mniedbala}
diff --git a/openssh/server/team/members/mpolreich.yml b/openssh/server/team/members/mpolreich.yml
index 8a01168..a4658aa 100644
--- a/openssh/server/team/members/mpolreich.yml
+++ b/openssh/server/team/members/mpolreich.yml
@@ -5,7 +5,7 @@
mpolreich:
enabled: true
name: mpolreich
- sudo: true
+ sudo: ${_param:linux_system_user_sudo}
full_name: Martin Polreich
home: /home/mpolreich
email: mpolreich@mirantis.com
diff --git a/openssh/server/team/members/mrelewicz.yml b/openssh/server/team/members/mrelewicz.yml
index 168e9b5..144379b 100644
--- a/openssh/server/team/members/mrelewicz.yml
+++ b/openssh/server/team/members/mrelewicz.yml
@@ -6,7 +6,7 @@
mrelewicz:
enabled: false
name: mrelewicz
- sudo: true
+ sudo: ${_param:linux_system_user_sudo}
full_name: Maciej Relewicz
home: /home/mrelewicz
email: mrelewicz@mirantis.com
diff --git a/openssh/server/team/members/mwilson.yml b/openssh/server/team/members/mwilson.yml
index f9280eb..720edf3 100644
--- a/openssh/server/team/members/mwilson.yml
+++ b/openssh/server/team/members/mwilson.yml
@@ -5,7 +5,7 @@
mwilson:
enabled: true
name: mwilson
- sudo: true
+ sudo: ${_param:linux_system_user_sudo}
full_name: Mike Wilson
home: /home/mwilson
email: mwilson@mirantis.com
diff --git a/openssh/server/team/members/nadezhdakabanova.yml b/openssh/server/team/members/nkabanova.yml
similarity index 64%
rename from openssh/server/team/members/nadezhdakabanova.yml
rename to openssh/server/team/members/nkabanova.yml
index 6979c5e..fdbb827 100644
--- a/openssh/server/team/members/nadezhdakabanova.yml
+++ b/openssh/server/team/members/nkabanova.yml
@@ -5,12 +5,10 @@
nkabanova:
enabled: true
name: nkabanova
- sudo: false
+ sudo: ${_param:linux_system_user_sudo}
full_name: Nadezhda Kabanova
home: /home/nkabanova
email: nkabanova@mirantis.com
- groups:
- - support
openssh:
server:
enabled: true
@@ -22,4 +20,6 @@
public_keys:
nkabanova:
- key: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDuI74hcXTCbbvWoWHNLkng0nDBBwEzZJu8APmKVBukr9Lldz5r8n4OLRzlMI9oKbzvOuY082Cwp+9f5w5ViF/wmmEBa5sktUOBI5Jsi+g5ulb1i2HQOiaRibFJZZcoW03YRQCqQ8D9H4QcuXkT4oNuL5Wcj0UKPQT5r6N2kvuNXlJfEezQQim4nVRymel2USPt/AhlN4AUfBShR8Ykaky2Me4pt5xi0fLOJ9ZDWlEa4dl19Jd4tPz66+dLPiWql+6dgd9GiN+f7NLdDOv3RfOBH6n/It4y/fI+2/UY57X13dWauQNIQHQHDTpCCRiB+XOHwoCRaV81XTHbR865+/sP
+ - key: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDTOke7Y9PB9lbFxaOHVq/YriVzPWsjH+Ie/KiqfjkeLLy3HsUIAJGrxeDbT1YB8Y6OBEKrCk45ECgsRu6MS6jMx4CmJPEV2QNf05Y7g3XBoTeNZwUQtW1aUER6ZXALiBon81cAvVhHDIRHDwTxrSMUTyY0m4sInSt+M6yg22nW24BJLNbRvKwMvO0bdVFzCHrTWbODAOGNplQf63eWlYC2t87PsqTT8CVHgv40QGLIbmGFCyMhnTk2TUMW8d8qMLzHAQU8Cd50HLW6mCEF1oW5QNffpemqeW0oA8vi2iLcRV0lbD5yuwaojYRMpudXOzMttkfjz/+ok/d+qWpiUzep root@Nadezhda
+
diff --git a/openssh/server/team/members/nkondra.yml b/openssh/server/team/members/nkondra.yml
index 77bfde5..b250e2b 100644
--- a/openssh/server/team/members/nkondra.yml
+++ b/openssh/server/team/members/nkondra.yml
@@ -5,12 +5,10 @@
nkondra:
enabled: true
name: nkondra
- sudo: false
+ sudo: ${_param:linux_system_user_sudo}
full_name: Nazarii Kondra
home: /home/nkondra
email: nkondra@mirantis.com
- groups:
- - supportl2
openssh:
server:
enabled: true
diff --git a/openssh/server/team/members/obryndzii.yml b/openssh/server/team/members/obryndzii.yml
index 85763b3..9f7498c 100644
--- a/openssh/server/team/members/obryndzii.yml
+++ b/openssh/server/team/members/obryndzii.yml
@@ -5,12 +5,10 @@
obryndzii:
enabled: true
name: obryndzii
- sudo: false
+ sudo: ${_param:linux_system_user_sudo}
full_name: Oleksandr Bryndzii
home: /home/obryndzii
email: obryndzii@mirantis.com
- groups:
- - supportl2
openssh:
server:
enabled: true
diff --git a/openssh/server/team/members/oliemieshko.yml b/openssh/server/team/members/oliemieshko.yml
index fdf52c7..ec8d8d6 100644
--- a/openssh/server/team/members/oliemieshko.yml
+++ b/openssh/server/team/members/oliemieshko.yml
@@ -5,12 +5,10 @@
oliemieshko:
enabled: true
name: oliemieshko
- sudo: false
+ sudo: ${_param:linux_system_user_sudo}
full_name: Oleksandr Liemieshko
home: /home/oliemieshko
email: oliemieshko@mirantis.com
- groups:
- - supportl2
openssh:
server:
enabled: true
diff --git a/openssh/server/team/members/osmola.yml b/openssh/server/team/members/osmola.yml
index 653027b..2083ddf 100644
--- a/openssh/server/team/members/osmola.yml
+++ b/openssh/server/team/members/osmola.yml
@@ -5,7 +5,7 @@
osmola:
enabled: true
name: osmola
- sudo: true
+ sudo: ${_param:linux_system_user_sudo}
full_name: Ondrej Smola
home: /home/osmola
email: osmola@mirantis.com
diff --git a/openssh/server/team/members/pcizinsky.yml b/openssh/server/team/members/pcizinsky.yml
index d702687..e9870c3 100644
--- a/openssh/server/team/members/pcizinsky.yml
+++ b/openssh/server/team/members/pcizinsky.yml
@@ -5,7 +5,7 @@
pcizinsky:
enabled: true
name: pcizinsky
- sudo: true
+ sudo: ${_param:linux_system_user_sudo}
full_name: Pavel Cizinsky
home: /home/pcizinsky
email: pcizinsky@mirantis.com
diff --git a/openssh/server/team/members/pjediny.yml b/openssh/server/team/members/pjediny.yml
index 7a4b17d..968ec33 100644
--- a/openssh/server/team/members/pjediny.yml
+++ b/openssh/server/team/members/pjediny.yml
@@ -5,7 +5,7 @@
pjediny:
enabled: true
name: pjediny
- sudo: true
+ sudo: ${_param:linux_system_user_sudo}
full_name: Petr Jediny
home: /home/pjediny
email: pjediny@mirantis.com
diff --git a/openssh/server/team/members/pmathews.yml b/openssh/server/team/members/pmathews.yml
index 0e1761e..91904a7 100644
--- a/openssh/server/team/members/pmathews.yml
+++ b/openssh/server/team/members/pmathews.yml
@@ -5,7 +5,7 @@
pmathews:
enabled: true
name: pmathews
- sudo: true
+ sudo: ${_param:linux_system_user_sudo}
full_name: Paul Mathews
home: /home/pmathews
email: pmathews@mirantis.com
diff --git a/openssh/server/team/members/pmichalec.yml b/openssh/server/team/members/pmichalec.yml
index c397cd4..b9b9c90 100644
--- a/openssh/server/team/members/pmichalec.yml
+++ b/openssh/server/team/members/pmichalec.yml
@@ -5,7 +5,7 @@
pmichalec:
enabled: true
name: pmichalec
- sudo: true
+ sudo: ${_param:linux_system_user_sudo}
full_name: Petr Michalec
home: /home/pmichalec
email: pmichalec@mirantis.com
diff --git a/openssh/server/team/members/renesoto.yml b/openssh/server/team/members/renesoto.yml
index ad76260..a9988ed 100644
--- a/openssh/server/team/members/renesoto.yml
+++ b/openssh/server/team/members/renesoto.yml
@@ -5,12 +5,10 @@
rsoto:
enabled: true
name: rsoto
- sudo: false
+ sudo: ${_param:linux_system_user_sudo}
full_name: Rene Soto
home: /home/rsoto
email: rsoto@mirantis.com
- groups:
- - support
openssh:
server:
enabled: true
diff --git a/openssh/server/team/members/rfelkl.yml b/openssh/server/team/members/rfelkl.yml
index 1b7fbf4..a2151f9 100644
--- a/openssh/server/team/members/rfelkl.yml
+++ b/openssh/server/team/members/rfelkl.yml
@@ -5,7 +5,7 @@
rfelkl:
enabled: true
name: rfelkl
- sudo: true
+ sudo: ${_param:linux_system_user_sudo}
full_name: Richard Felkl
home: /home/rfelkl
email: rfelkl@mirantis.com
diff --git a/openssh/server/team/members/rsafonov.yml b/openssh/server/team/members/rsafonov.yml
index 5569975..9965a1b 100644
--- a/openssh/server/team/members/rsafonov.yml
+++ b/openssh/server/team/members/rsafonov.yml
@@ -5,12 +5,10 @@
rsafonov:
enabled: true
name: rsafonov
- sudo: false
+ sudo: ${_param:linux_system_user_sudo}
full_name: Roman Safonov
home: /home/rsafonov
email: rsafonov@mirantis.com
- groups:
- - support
openssh:
server:
enabled: true
diff --git a/openssh/server/team/members/rsatek.yml b/openssh/server/team/members/rsatek.yml
index 7b99a7c..227d20d 100644
--- a/openssh/server/team/members/rsatek.yml
+++ b/openssh/server/team/members/rsatek.yml
@@ -5,7 +5,7 @@
rsatek:
enabled: true
name: rsatek
- sudo: true
+ sudo: ${_param:linux_system_user_sudo}
full_name: Rudolf Satek
home: /home/rsatek
email: rsatek@mirantis.com
diff --git a/openssh/server/team/members/scottmachtmes.yml b/openssh/server/team/members/scottmachtmes.yml
index 6feb7a2..369db34 100644
--- a/openssh/server/team/members/scottmachtmes.yml
+++ b/openssh/server/team/members/scottmachtmes.yml
@@ -5,12 +5,10 @@
smachtmes:
enabled: true
name: smachtmes
- sudo: false
+ sudo: ${_param:linux_system_user_sudo}
full_name: Scott Machtmes
home: /home/smachtmes
email: smachtmes@mirantis.com
- groups:
- - support
openssh:
server:
enabled: true
diff --git a/openssh/server/team/members/sflorczak.yml b/openssh/server/team/members/sflorczak.yml
index d340089..152fe39 100644
--- a/openssh/server/team/members/sflorczak.yml
+++ b/openssh/server/team/members/sflorczak.yml
@@ -5,7 +5,7 @@
sflorczak:
enabled: true
name: sflorczak
- sudo: true
+ sudo: ${_param:linux_system_user_sudo}
full_name: Szymon Florczak
home: /home/sflorczak
email: sflorczak@mirantis.com
diff --git a/openssh/server/team/members/skreys.yml b/openssh/server/team/members/skreys.yml
index df76889..19a0f70 100644
--- a/openssh/server/team/members/skreys.yml
+++ b/openssh/server/team/members/skreys.yml
@@ -5,7 +5,7 @@
skreys:
enabled: true
name: skreys
- sudo: true
+ sudo: ${_param:linux_system_user_sudo}
full_name: Sergey Kreys
home: /home/skreys
email: skreys@mirantis.com
diff --git a/openssh/server/team/members/smatov.yml b/openssh/server/team/members/smatov.yml
index 8c21e28..073b02f 100644
--- a/openssh/server/team/members/smatov.yml
+++ b/openssh/server/team/members/smatov.yml
@@ -5,7 +5,7 @@
smatov:
enabled: true
name: smatov
- sudo: true
+ sudo: ${_param:linux_system_user_sudo}
full_name: Sergey Matov
home: /home/smatov
email: smatov@mirantis.com
diff --git a/openssh/server/team/members/sovsianikov.yml b/openssh/server/team/members/sovsianikov.yml
index 646bde9..d5a2fed 100644
--- a/openssh/server/team/members/sovsianikov.yml
+++ b/openssh/server/team/members/sovsianikov.yml
@@ -5,12 +5,10 @@
sovsianikov:
enabled: true
name: sovsianikov
- sudo: false
+ sudo: ${_param:linux_system_user_sudo}
full_name: Serhii Ovsianikov
home: /home/sovsianikov
email: sovsianikov@mirantis.com
- groups:
- - supportl2
openssh:
server:
enabled: true
diff --git a/openssh/server/team/members/tkukral.yml b/openssh/server/team/members/tkukral.yml
index e53ce2d..60b34f5 100644
--- a/openssh/server/team/members/tkukral.yml
+++ b/openssh/server/team/members/tkukral.yml
@@ -5,7 +5,7 @@
tkukral:
enabled: true
name: tkukral
- sudo: true
+ sudo: ${_param:linux_system_user_sudo}
full_name: Tomas Kukral
home: /home/tkukral
email: tkukral@mirantis.com
diff --git a/openssh/server/team/members/vmikes.yml b/openssh/server/team/members/vmikes.yml
index 07d62f3..eb506ac 100644
--- a/openssh/server/team/members/vmikes.yml
+++ b/openssh/server/team/members/vmikes.yml
@@ -5,7 +5,7 @@
vmikes:
enabled: true
name: vmikes
- sudo: true
+ sudo: ${_param:linux_system_user_sudo}
full_name: Vlasta Mikes
home: /home/vmikes
email: vmikes@mirantis.com
diff --git a/openssh/server/team/members/vnogin.yml b/openssh/server/team/members/vnogin.yml
index e8c1df9..26f9106 100644
--- a/openssh/server/team/members/vnogin.yml
+++ b/openssh/server/team/members/vnogin.yml
@@ -5,7 +5,7 @@
vnogin:
enabled: true
name: vnogin
- sudo: true
+ sudo: ${_param:linux_system_user_sudo}
full_name: Vitaliy Nogin
home: /home/vnogin
email: vnogin@mirantis.com
diff --git a/openssh/server/team/members/vsaienko.yml b/openssh/server/team/members/vsaienko.yml
index bd532f6..d47a4a6 100644
--- a/openssh/server/team/members/vsaienko.yml
+++ b/openssh/server/team/members/vsaienko.yml
@@ -5,7 +5,7 @@
vsaienko:
enabled: true
name: vsaienko
- sudo: true
+ sudo: ${_param:linux_system_user_sudo}
full_name: Vasyl Saienko
home: /home/vsaienko
email: vsaienko@mirantis.com
diff --git a/openssh/server/team/members/zahedkhurasani.yml b/openssh/server/team/members/zahedkhurasani.yml
index 8504005..f5411fd 100644
--- a/openssh/server/team/members/zahedkhurasani.yml
+++ b/openssh/server/team/members/zahedkhurasani.yml
@@ -5,12 +5,10 @@
zkhurasani:
enabled: true
name: zkhurasani
- sudo: false
+ sudo: ${_param:linux_system_user_sudo}
full_name: Zahed Khurasani
home: /home/zkhurasani
email: zkhurasani@mirantis.com
- groups:
- - support
openssh:
server:
enabled: true
diff --git a/openssh/server/team/mmo_devops.yml b/openssh/server/team/mmo_devops.yml
index 60fe258..1fe82c6 100644
--- a/openssh/server/team/mmo_devops.yml
+++ b/openssh/server/team/mmo_devops.yml
@@ -1,11 +1,9 @@
classes:
# DevOps/SRE Team
- system.openssh.server.team.members.cade
-- system.openssh.server.team.members.dszeluga
- system.openssh.server.team.members.jmosher
- system.openssh.server.team.members.ecantwell
- system.openssh.server.team.members.lmercl
-- system.openssh.server.team.members.mrelewicz
- system.openssh.server.team.members.mwilson
- system.openssh.server.team.members.osmola
- system.openssh.server.team.members.pcizinsky
@@ -13,3 +11,6 @@
- system.openssh.server.team.members.pmichalec
# Missing- team members still in flux
# - system.openssh.server.team.members.bpiotrowski
+parameters:
+ _param:
+ linux_system_user_sudo: true
diff --git a/openssh/server/team/networking.yml b/openssh/server/team/networking.yml
index df85109..d912490 100644
--- a/openssh/server/team/networking.yml
+++ b/openssh/server/team/networking.yml
@@ -1,4 +1,11 @@
+classes:
+- system.openssh.server.team.members.mceloud
+- system.openssh.server.team.members.pjediny
+- system.openssh.server.team.members.skreys
+- system.openssh.server.team.members.smatov
parameters:
+ _param:
+ linux_system_user_sudo: true
linux:
system:
user:
diff --git a/openssh/server/team/oscore_devops.yml b/openssh/server/team/oscore_devops.yml
index 0ee5dde..149d765 100644
--- a/openssh/server/team/oscore_devops.yml
+++ b/openssh/server/team/oscore_devops.yml
@@ -4,3 +4,6 @@
- system.openssh.server.team.members.vnogin
- system.openssh.server.team.members.ashestakov
- system.openssh.server.team.members.mkarpin
+parameters:
+ _param:
+ linux_system_user_sudo: true
diff --git a/openssh/server/team/oss_team.yml b/openssh/server/team/oss_team.yml
index db4dbbd..d5ba940 100644
--- a/openssh/server/team/oss_team.yml
+++ b/openssh/server/team/oss_team.yml
@@ -1,4 +1,6 @@
parameters:
+ _param:
+ linux_system_user_sudo: true
linux:
system:
user:
diff --git a/openssh/server/team/presales.yml b/openssh/server/team/presales.yml
index 7efc9da..e2939be 100644
--- a/openssh/server/team/presales.yml
+++ b/openssh/server/team/presales.yml
@@ -1,4 +1,6 @@
parameters:
+ _param:
+ linux_system_user_sudo: true
linux:
system:
user:
diff --git a/openssh/server/team/qa_scale.yml b/openssh/server/team/qa_scale.yml
index 51fb260..a3f4a91 100644
--- a/openssh/server/team/qa_scale.yml
+++ b/openssh/server/team/qa_scale.yml
@@ -1,4 +1,6 @@
parameters:
+ _param:
+ linux_system_user_sudo: true
linux:
system:
user:
@@ -20,4 +22,4 @@
user: ${linux:system:user:dburnazyan}
public_keys:
dburnazyan:
- key: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQC4xJvnHle7Omjhnv8AsqfXlp1Sg4Ixq/p0Dpcj5SlGN5YTnIs+eRXwy7WHICCgWC1OA+o4omzWQI486u0C4qMkdv+nvuAsvJQVRGNiGVp4gi48x3KqMxlEzeCScMH5oj+W5LJLcb2czHulBPXRluKlITOlF4i5+z3GbFwb8Dg5hBnnbxhhRyh6XyUOh8WQvBqXAk2EqY8vqYAZxV9DXI8OSIYsvpM9jQo/26YrSoTWZ4caCNmL6zVVH7eXaqEzVwDHxpXHLvzSP4bIl85dKygJI1DyN9mZ1B77z1lNZnk7Fu8yQP05Guln5Hzg+VqycAZxOk6ysjRXiYNu56DVZuc3 dburnazyan@dburnazyan-pc.msk.mirantis.net
\ No newline at end of file
+ key: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQC4xJvnHle7Omjhnv8AsqfXlp1Sg4Ixq/p0Dpcj5SlGN5YTnIs+eRXwy7WHICCgWC1OA+o4omzWQI486u0C4qMkdv+nvuAsvJQVRGNiGVp4gi48x3KqMxlEzeCScMH5oj+W5LJLcb2czHulBPXRluKlITOlF4i5+z3GbFwb8Dg5hBnnbxhhRyh6XyUOh8WQvBqXAk2EqY8vqYAZxV9DXI8OSIYsvpM9jQo/26YrSoTWZ4caCNmL6zVVH7eXaqEzVwDHxpXHLvzSP4bIl85dKygJI1DyN9mZ1B77z1lNZnk7Fu8yQP05Guln5Hzg+VqycAZxOk6ysjRXiYNu56DVZuc3 dburnazyan@dburnazyan-pc.msk.mirantis.net
diff --git a/openssh/server/team/services.yml b/openssh/server/team/services.yml
new file mode 100644
index 0000000..9fb36c9
--- /dev/null
+++ b/openssh/server/team/services.yml
@@ -0,0 +1,12 @@
+classes:
+- system.linux.system.sudo
+- system.openssh.server.team.members.mniedbala
+- system.openssh.server.team.members.pmichalec
+- system.openssh.server.team.members.pcizinsky
+- system.openssh.server.team.members.lmercl
+- system.openssh.server.team.members.korlowska
+- system.openssh.server.team.members.miwinski
+- system.openssh.server.team.members.mlos
+parameters:
+ _param:
+ linux_system_user_sudo: true
diff --git a/openssh/server/team/services_qa.yml b/openssh/server/team/services_qa.yml
index ca75b5a..3e64bd3 100644
--- a/openssh/server/team/services_qa.yml
+++ b/openssh/server/team/services_qa.yml
@@ -1,4 +1,6 @@
parameters:
+ _param:
+ linux_system_user_sudo: true
linux:
system:
user:
diff --git a/openssh/server/team/stacklight.yml b/openssh/server/team/stacklight.yml
index 84a8255..5e2f9d3 100644
--- a/openssh/server/team/stacklight.yml
+++ b/openssh/server/team/stacklight.yml
@@ -1,4 +1,6 @@
parameters:
+ _param:
+ linux_system_user_sudo: true
linux:
system:
user:
@@ -16,13 +18,6 @@
full_name: Simon Pasquier
home: /home/spasquier
email: spasquier@mirantis.com
- ppetit:
- enabled: true
- name: ppetit
- sudo: true
- full_name: Patrick Petit
- home: /home/ppetit
- email: ppetit@mirantis.com
obourdon:
enabled: true
name: obourdon
@@ -79,6 +74,13 @@
full_name: Krzysztof Szukiełojć
home: /home/kszukielojc
email: kszukielojc@mirantis.com
+ bkupidura:
+ enabled: true
+ name: bkupidura
+ sudo: true
+ full_name: Bartosz Kupidura
+ home: /home/bkupidura
+ email: bkupidura@mirantis.com
isviridov:
enabled: true
name: isviridov
@@ -109,58 +111,58 @@
public_keys:
- ${public_keys:spasquier}
user: ${linux:system:user:spasquier}
- ppetit:
- enabled: true
- public_keys:
- - ${public_keys:ppetit}
- user: ${linux:system:user:ppetit}
obourdon:
- enable: true
+ enabled: true
public_keys:
- ${public_keys:obourdon}
user: ${linux:system:user:obourdon}
dkalashnik:
- enable: true
+ enabled: true
public_keys:
- ${public_keys:dkalashnik}
user: ${linux:system:user:dkalashnik}
rpromyshlennikov:
- enable: true
+ enabled: true
public_keys:
- ${public_keys:rpromyshlennikov}
user: ${linux:system:user:rpromyshlennikov}
vgusev:
- enable: true
+ enabled: true
public_keys:
- ${public_keys:vgusev}
user: ${linux:system:user:vgusev}
mpolreich:
- enable: true
+ enabled: true
public_keys:
- ${public_keys:mpolreich}
user: ${linux:system:user:mpolreich}
isvetlov:
- enable: true
+ enabled: true
public_keys:
- ${public_keys:isvetlov}
user: ${linux:system:user:isvetlov}
akholkin:
- enable: true
+ enabled: true
public_keys:
- ${public_keys:akholkin}
user: ${linux:system:user:akholkin}
kszukielojc:
- enable: true
+ enabled: true
public_keys:
- ${public_keys:kszukielojc}
user: ${linux:system:user:kszukielojc}
- isviridov:
+ bkupidura:
enable: true
public_keys:
+ - ${public_keys:bkupidura}
+ user: ${linux:system:user:bkupidura}
+ isviridov:
+ enabled: true
+ public_keys:
- ${public_keys:isviridov}
user: ${linux:system:user:isviridov}
nzaporozhets:
- enable: true
+ enabled: true
public_keys:
- ${public_keys:nzaporozhets}
user: ${linux:system:user:nzaporozhets}
@@ -169,8 +171,6 @@
key: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQC3odU+3V2uDA2ptAFL9hrJRPNEEdAyztWOZFQ5Oyd9oerTGOU3p4xmrgWWjfKFKbYGhiiIUcYAol5PkTfKukGEkkjCHYA1t023soCaaAj85wCZCnw2zQNAziwxTYmAzTqgxiSvtZNMMrtJvFHRIRDzJ3M1lV0prWNWkMM1/3FAd4W49y6VT3fkMCo8uqG7CfGdgR2DgBCxf9KaNPfW5eDEPOgmE5lK8tVSEI6T+Cg7hbcTf4lFYnlFBnlQgp/0JstsM4Vbwb4B34LOpOsf2S8rrWk2xQMjwaMHXkc2s/E8iW3F5nVFuyEXYISFQIiAHw8dzC6CHgLcyHUVWwznKawZ newt@newt-dev1
spasquier:
key: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCXBHKQaGUNB92DsnyvflmCbmuXnkiuNahZiue3hnyXqLA2q8jmQmzBbxReAJzexnVfJhrUCTw8IPJUpMUP27u3igvGdkhfctdUuxVf9yGJErtGNgHK/aGbeLCvUOmhw6X/xbf3IbyFL1gwxOJ2cmmjlSptYU9E1W2xFY+IMFWBhzO3vso5EABgPVli/UUMfeXUUd++lIZpoyYe2Hkri1QGNhzfbZcFjEO78+vNiLZrvjJEtkXWu7iZTYK6eE365CiFJzqFL7N6Ichb28qakcmVqR/foreuz3cOMqMGssKoOQk1213x8w4fE0yLwf9Ft8L7GMf+vXQvuNt0ZKBPWqn7 spasquier@mirantis.com
- ppetit:
- key: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCUGCb+mGidT4FRa4rJxoYx39NX2vCjRw+CmCQJW/Uf6xc0NNp5WRWJ0hnyIMRVVfehvfjdXPo4bO4cXIwmo06C1Wx+DMyvjI9NvuHtt52p3QTsh+PYZe5t4hFuGh7veWQw3LuLtDLVlVS633FQMgT/BXDaBc65yfN9CuV6lHqZ6KPKoGAi3ADlcQFqhFttO+GsVkxd6uGtelnbYXsDMwylCIKop0C/obu6wG85d/8Q2/Zts5CvUcCiCNfZtl8otgNMrpfnuhC0xAsmgwDxqK2kshxUujclyFfO7ixl+E9Plc7kUJvodNbzOcAmY3YpuHVoJQkHx/Ou81/q+JOVtFxz ppetit@baobab
obourdon:
key: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQDOd0PnoQhjjo/UrmCotaGZxXfpxLoMmuZ+XjKqAkEb9kE+aE0+k8t2EUs8PIctEgIcIC9vmovqOzIt5uNLV5MyN4R+pdIBKyWEQ5fQPaFhn/uZKf7AxLYhTVVW1wM+cDzrpWTyNQ0w59JBfNPZ/BDMtdpch9gTP24pwJ8yUDHHMSt1FnVqa7+Czw8jig4/oM05Mob5DQKlWOdtdUP3XYHSGJuHY4tHmc5sPvzIqs5r47uj5VD4gaCUqYeRS2C1YJcisN880qIqUHuCK0k9gQP+0DKJPVPmPPCuwebBzUUfjhKcbqiikKxPS0p4DWiprmeF8xjvmVWX+V8lP/v0hXiVgMc3wMoXJklH+XM7U5y5uzN8MF4YqAi4M/uSK5UF+TPn5dtu9s+joQmqt5XXaV4iFQe5kcdIYEMNJUGxiwMzByhvqWgC1reYSD8FquqLTH/5ITvFFmaTyQbBJMnXAE+QxdTXMfhTnfI/pbbhAUmfr5w8Z34lZG5UDnUy/rR+LlvJS76MqCr3nemZTHqhUYIrIJA8f9Xa8o9UJTy2QICdj2NidW1UzHCPybc/nH7qc6TjZJALLdhzK2QDbO6seJLOXuVHwSxjOx2Jdv5HImpFSeEfiGRQqc8bT+NGZI5V+cW+FuztU8i46VaSPXFM8t+57Ut/MdndAVYSPqgc7E3u3w== obourdon@mirantis.com
dkalashnik:
@@ -187,6 +187,8 @@
key: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQDjpy9RI6iEDH/04eOOwreDa+R32USZiWxyFiKHa8zoDAlOfwaZVg6mZWepOxzwxCJPYusPGXCwQ6Zw9tHxVWOCgtzzPpsCCfhUU4v+99Wh08//W8d/s/WFka+5vqyskAO5Z8Ekk+kQU+jpUBG8/gMxAPBjj0fFc5BNeqDY9r9nmMNK6N2RVjvA6wZ8G5hLGxL9bn5Prhf/+avui1NAfy6gsT/mRt1W+eHWTvpijyNGm+m83jU34dQO6gE48n6WdSylLh/fY/p31rzAURaq1V/AZhdbSuZ8aJYDnfHevpK5+hMjoOop3v3hb7WHEmybGujQfW5HVaaWmG7SFlHeKGE/gZ2P9T+bQ+SgO+PmEAw4LayiBkzTPAHdZ2UGZe+3BI5gdM/ayovK2WVO1jS5FNlNGIvEQW+ws9V+ph+S1jL4jobDJEjs358iXrAYpf4JL+LvxFHiuj6EL51tbo8EU22z5mmgRQQ5eFrDzBuVLhcim651A3a5iSlmCeAQ5rTmHX/Op/PbK+3vAtI8vnlK4AhycLvWQ3kK2DRx+Uhzrlk5v6E14SopAhvpGOHqrLgmoHwHp1xt/9M1JgxkOUK5gccFKTQduxLHoTNBaNcP60IOG/MjqUPcOXSBcAN4Y1RDBg+pwXe4PFgOzwKdFoYeuhvtm8y185S0IvvfCHLCD8pNfQ== akholkin@mirantis.com
kszukielojc:
key: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQCiUm3Z3W3t4v7oe143rCNM/hbg9NU2bYUmQXek8DJPA4c3Xm6u0q+RL9kEXME+3zcj2HKqMxKsCBLXXdFIsgdUbOBV8AYiuySE220FTnEKRmdxsEnfSaBhXxFyIBNoew4gI7URSqAOclt5WuPJTqRM7K4VhbtzwEgeWVd/NUhxMCCtgkdJCYTSmycxmxs7R6V8vMr9Mb8DOqKkSpOu6f3JkR0lwnFN9zGGC4V/60FlJSDzvvI5Tn40ANPHITivs8xME0znsx7t0bF4vQUimvhYn1mumQCY1NwIaxJ/QqasD6Ag9Sn5dxSg9b3SeLn0JM6qKoIqZtfPYVuCp9gmlH0fyzJUdqu4lKKb2wBw/H5lK6icH4+owMawkav55rbvinHQOqmVCr/Bg/rTfc35ycVqjTXH/5J7OhzioKjU0yFkXFS2X/s8gpyxp3beJ+Ea4faoX+kcs0gyhMYzqC7/DOamrau7aVyEAjKYJNy60xRfjCQzjqiurbxVFh+3Fi64UUn7Bl1QV8VEiU3ztJ118psEI7zA+x2VROLZ1jrtaBYZTYB118JZicaFDycEVgg3+BHX3pFH/QSOjLsA4SK+HJjSz8CFKvWwaO6QJv1/3KHpcGEacMvmqKxwpQK0E4WpjWhglZRMPObQ0dBaGClOujgoOIHXtFGILEpWy2SdzDQkHw== kszukielojc@w541
+ bkupidura:
+ key: ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAfsAyuh1O+SfVRgddjQ8nByz2nNzXm71sP9FAPi5G5WoJA7El3fdrOWsG5bj5kQveVZj/M4qlETajcxMLwaFQd36nS4C0WjmzfoX2i6X+iWHFH/L/ha0UaDclfYkuGdxtCeYRakJ0Xqsm0vNuMpGhIGQP8j+OSLK0Q9pnrd1md+jrxx6JS1MXM5iUh+zU4roklrGy75WQvDJcCD3miVnktJsjb2hda8cIxkRf+l88xPm5TcC82cVAWpXF91+kUVdcHiB1D13t0IDEL6BdeUHffQij1++9x6JUukIEVDoP8Ot6DC16cbma4H9ssjdc9vnTGJjsZiu7Am+BNLKD4zsMnuSqWWfPYzQuoG5HZlyonzQIYncxo98LsHLRtrEE/CWnnO+jrd8Zfe9nAatelBgVv86UHoKEPyL666nd4UxaTiyKaXfNlvHWhfgbV67ZGRTrmllfdTmu1olOIniO706L3t3V+Zu6RjN5VjYdLegKKMo2E6XwhkMCcIg9Syi95pj8x8jFoKwjvOhb1EleuZyNHNbEvosIjAy1HsUgEo5bIwiV8K0aWIQE8VVyqyhdXOpR/Gk9UtFYsACyfCX84DjQBXp7OXIkyYt9s5N15Panml2X1CXnNgsh9M60+RvJBsFj3k8M57zcc7VAarAUKnYrI59l3cCZZVLtd4aIp8= zynzel@banshee
isviridov:
key: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDGNZxzOm7OsZi/q6Qk71fnvjCfWk4BfxpZ5hDig6N1f9D0iAMaINyNmlF2PxstSLW0Mjdq2tXTUvVWlYpGrw+YLHQmVk8dckmLdUAxe2Z0oEvtWhiQC64927ibBTgQ2Tjfkao+PFYPbdjiO4FgRymS1/FpGKhvpdyPDCcOLrxsMSK9YpPi4kbkd4GmlGMercuaEzP3JOOzJioOOLtEw3LOLWG5mAIzXjGFxuCNdTI4gqxQm/iw/tOpb9PcsY10EapZsS4Pd8j58vuhJlwdoTxI3gzySJcTlWm0tcphex0g8X0tEUI+zVjemJcrYkZgUpb6x5/mUjNxC4nv+4A4yMTP
nzaporozhets:
diff --git a/openssh/server/team/support.yml b/openssh/server/team/support.yml
new file mode 100644
index 0000000..f78ceac
--- /dev/null
+++ b/openssh/server/team/support.yml
@@ -0,0 +1,167 @@
+classes:
+- system.linux.system.sudo
+# L1
+- system.openssh.server.team.members.aleksandrdobdin
+- system.openssh.server.team.members.aleksandrrubtsov
+- system.openssh.server.team.members.anatoliineliubin
+- system.openssh.server.team.members.antonrodionov
+- system.openssh.server.team.members.collinmay
+- system.openssh.server.team.members.danilakhmetov
+- system.openssh.server.team.members.deniskostriukov
+- system.openssh.server.team.members.dmitrygoloshubov
+- system.openssh.server.team.members.javierdiaz
+- system.openssh.server.team.members.jorgesorondo
+- system.openssh.server.team.members.josuepalmerin
+- system.openssh.server.team.members.krzysztoffranckowski
+- system.openssh.server.team.members.matthewroark
+- system.openssh.server.team.members.maximefimov
+- system.openssh.server.team.members.mikhailkraynov
+- system.openssh.server.team.members.renesoto
+- system.openssh.server.team.members.rsafonov
+- system.openssh.server.team.members.scottmachtmes
+- system.openssh.server.team.members.zahedkhurasani
+# L2OPS
+- system.openssh.server.team.members.aepifanov
+- system.openssh.server.team.members.apetrenko
+- system.openssh.server.team.members.atarasov
+- system.openssh.server.team.members.dklepikov
+- system.openssh.server.team.members.dsutyagin
+- system.openssh.server.team.members.ekozhemyakin
+- system.openssh.server.team.members.enikanorov
+- system.openssh.server.team.members.fsoppelsa
+- system.openssh.server.team.members.manashkin
+- system.openssh.server.team.members.nkondra
+- system.openssh.server.team.members.nkabanova
+- system.openssh.server.team.members.obryndzii
+- system.openssh.server.team.members.oliemieshko
+- system.openssh.server.team.members.sovsianikov
+- system.openssh.server.team.members.cade
+- system.openssh.server.team.members.jmosher
+- system.openssh.server.team.members.ecantwell
+- system.openssh.server.team.members.lmercl
+- system.openssh.server.team.members.osmola
+- system.openssh.server.team.members.pcizinsky
+- system.openssh.server.team.members.pmathews
+- system.openssh.server.team.members.pmichalec
+parameters:
+ _param:
+ linux_system_user_sudo: true
+ linux:
+ system:
+ group:
+ supportl1:
+ enabled: false
+ name: supportl1
+ supportl2:
+ enabled: false
+ name: supportl2
+ support0:
+ enabled: false
+ name: support0
+ support1:
+ enabled: false
+ name: support1
+ support2:
+ enabled: false
+ name: support2
+ support3:
+ enabled: true
+ name: support3
+ addusers:
+ # L1
+ - ${linux:system:user:adobdin:name}
+ - ${linux:system:user:arubtsov:name}
+ - ${linux:system:user:aneliubin:name}
+ - ${linux:system:user:arodionov:name}
+ - ${linux:system:user:cmay:name}
+ - ${linux:system:user:dakhmetov:name}
+ - ${linux:system:user:dkostriukov:name}
+ - ${linux:system:user:dgoloshubov:name}
+ - ${linux:system:user:jdiaz:name}
+ - ${linux:system:user:jpalmerin:name}
+ - ${linux:system:user:kfranckowski:name}
+ - ${linux:system:user:mroark:name}
+ - ${linux:system:user:mefimov:name}
+ - ${linux:system:user:mkraynov:name}
+ - ${linux:system:user:nkabanova:name}
+ - ${linux:system:user:rsoto:name}
+ - ${linux:system:user:rsafonov:name}
+ - ${linux:system:user:smachtmes:name}
+ - ${linux:system:user:zkhurasani:name}
+ # L2OPS
+ - ${linux:system:user:aepifanov:name}
+ - ${linux:system:user:apetrenko:name}
+ - ${linux:system:user:atarasov:name}
+ - ${linux:system:user:dklepikov:name}
+ - ${linux:system:user:dsutyagin:name}
+ - ${linux:system:user:ekozhemyakin:name}
+ - ${linux:system:user:enikanorov:name}
+ - ${linux:system:user:fsoppelsa:name}
+ - ${linux:system:user:manashkin:name}
+ - ${linux:system:user:nkondra:name}
+ - ${linux:system:user:nkabanova:name}
+ - ${linux:system:user:obryndzii:name}
+ - ${linux:system:user:oliemieshko:name}
+ - ${linux:system:user:sovsianikov:name}
+ - ${linux:system:user:pmichalec:name}
+ - ${linux:system:user:pmathews:name}
+ - ${linux:system:user:pcizinsky:name}
+ - ${linux:system:user:osmola:name}
+ - ${linux:system:user:cade:name}
+ - ${linux:system:user:jmosher:name}
+ - ${linux:system:user:ecantwell:name}
+ - ${linux:system:user:lmercl:name}
+ sudo:
+ enabled: true
+ aliases:
+ command:
+ SUPPORT_SALT: ${_param:sudo_salt_safe}
+ SUPPORT_SALT_TRUSTED: ${_param:sudo_salt_trusted}
+ SUPPORT_RESTRICTED_SHELLS: ${_param:sudo_shells}
+ SUPPORT_RESTRICTED_SU: ${_param:sudo_restricted_su}
+ SUPPORT_COREUTILS: ${_param:sudo_coreutils_safe}
+ SUPPORT_RABBITMQ: ${_param:sudo_rabbitmq_safe}
+ SUPPORT_SALT_TRUSTED: ${_param:sudo_salt_trusted}
+ SUPPORT_NETWORKING: ${_param:sudo_networking}
+ SUPPORT_CONTRAIL: ${_param:sudo_contrail_utilities}
+ SUPPORT_STORAGE: ${_param:sudo_storage_utilities}
+ SUPPORT_OPENSTACK_CLIENTS: ${_param:sudo_openstack_clients}
+ groups:
+ support0:
+ # This group should have only RO access to non-sensitive data and commands
+ # assumed usage: common operations, non experienced, non technical users.
+ commands:
+ - SUPPORT_SALT
+ - '!SUPPORT_RESTRICTED_SHELLS'
+ - '!SUPPORT_RESTRICTED_SU'
+ support1:
+ # This group should have access to safe, trusted, commands
+ commands:
+ - SUPPORT_SALT
+ - SUPPORT_COREUTILS
+ - SUPPORT_RABBITMQ
+ - SUPPORT_NETWORKING
+ - SUPPORT_CONTRAIL
+ - SUPPORT_STORAGE
+ - SUPPORT_OPENSTACK_CLIENTS
+ - '!SUPPORT_RESTRICTED_SHELLS'
+ - '!SUPPORT_RESTRICTED_SU'
+ support2:
+ # This group should have access to any command using sudo
+ commands:
+ - SUPPORT_SALT
+ - SUPPORT_SALT_TRUSTED
+ - SUPPORT_COREUTILS
+ - SUPPORT_RABBITMQ
+ - SUPPORT_NETWORKING
+ - SUPPORT_CONTRAIL
+ - SUPPORT_STORAGE
+ - SUPPORT_OPENSTACK_CLIENTS
+ - '!SUPPORT_RESTRICTED_SHELLS'
+ - '!SUPPORT_RESTRICTED_SU'
+ support3:
+ # It's never safe to run unlimited number of commands with sudo.
+ # Use with caution.
+ setenv: true
+ commands:
+ - ALL
diff --git a/openssh/server/team/tcpcloud.yml b/openssh/server/team/tcpcloud.yml
index ac6e107..5f9af00 100644
--- a/openssh/server/team/tcpcloud.yml
+++ b/openssh/server/team/tcpcloud.yml
@@ -20,8 +20,10 @@
- system.openssh.server.team.members.tkukral
- system.openssh.server.team.members.vmikes
- system.openssh.server.team.members.psvimbersky
-
+- system.openssh.server.team.members.chnyda
parameters:
+ _param:
+ linux_system_user_sudo: true
linux:
system:
user:
@@ -63,4 +65,4 @@
askotnicky:
key: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDO6EnDYaGdF/Nn6lntxDNnKanCsheZRdh8kA/6ImyeRSjT2cgepm1Fsgv7wXBYoy0OxhB5wgCp5Az/Pj4oLkG3g+G05sUPUxxGCGRiwjcnyQ/FTz4TzHglAVqgbdgWoQYf9Hg6EKZovvPcH3STbEwcl+MhLqvxz0wm5+StE+wvp6I9dEfRV+2/e1uepauOTZ1+Ui1DMNXiMefTlbiIBHzUk7RiwJWgqzQXBndgunmbJWSed8zC0Ug97waDOFIX/oKZmAmsv0NLJ2e/kC3oUTuziGT74F9sh7Pqiw/9HZxvP45hJwEvytfUjfuiikIBbmYdF7Je93czaG/qjXGN8YvP== a.skotnicky@tcpisek.cz
vzach:
- key: AAAAB3NzaC1yc2EAAAABJQAAAQEAn4MJUkXbiZPPEcdKijB4MqnjPGk80x5W+8XsMvZuUqElmuLgB30kdCnSCBgipYPor3m8wakdJTTwiY6P50yhtp/tD2b4t1TC1djPwiNS/6JwjZawj30bS5ZrVKeTHtOq6E0tf927svXgEE21/ADgWpMoDeQ/pKlbt0m/U8YGBCmJ7cBa8ggGHhvJIwCNhpELn02vKV8Qfx44rk+DoxLBwQUHQ8PsEwtoSCLMIulpLflptak1pgvN6ggA5p15i36OyJkobI1yR9YEgtb+8yQqofu2DZ+v+9Qhbb+C0446RnyGzfvk/DreCeI4rJh5/6QZjwv3XfYDER5LbNCnoOQAsQ== v.zach@tcpcloud.eu
\ No newline at end of file
+ key: AAAAB3NzaC1yc2EAAAABJQAAAQEAn4MJUkXbiZPPEcdKijB4MqnjPGk80x5W+8XsMvZuUqElmuLgB30kdCnSCBgipYPor3m8wakdJTTwiY6P50yhtp/tD2b4t1TC1djPwiNS/6JwjZawj30bS5ZrVKeTHtOq6E0tf927svXgEE21/ADgWpMoDeQ/pKlbt0m/U8YGBCmJ7cBa8ggGHhvJIwCNhpELn02vKV8Qfx44rk+DoxLBwQUHQ8PsEwtoSCLMIulpLflptak1pgvN6ggA5p15i36OyJkobI1yR9YEgtb+8yQqofu2DZ+v+9Qhbb+C0446RnyGzfvk/DreCeI4rJh5/6QZjwv3XfYDER5LbNCnoOQAsQ== v.zach@tcpcloud.eu
diff --git a/postgresql/client/alertmanager.yml b/postgresql/client/alertmanager.yml
new file mode 100644
index 0000000..8bd272a
--- /dev/null
+++ b/postgresql/client/alertmanager.yml
@@ -0,0 +1,30 @@
+classes:
+ - system.postgresql.client
+parameters:
+ _param:
+ alertmanager_db_host: ${_param:haproxy_postgresql_bind_host}
+ alertmanager_db_user: alertmanager
+ alertmanager_db_user_password: alertmanager
+ webhook_login_id: 13
+ webhook_application_id: 24
+ postgresql:
+ client:
+ server:
+ server01:
+ database:
+ alertmanager:
+ enabled: true
+ encoding: 'UTF8'
+ locale: 'en_US'
+ users:
+ - name: ${_param:alertmanager_db_user}
+ password: ${_param:alertmanager_db_user_password}
+ host: ${_param:alertmanager_db_host}
+ createdb: true
+ rights: all privileges
+ init:
+ maintenance_db: pushkin
+ force: true
+ queries:
+ - INSERT INTO login VALUES (${_param:webhook_login_id}, ${_param:webhook_application_id}) ON CONFLICT (id) DO UPDATE SET id = excluded.id;
+ - INSERT INTO device VALUES (${_param:webhook_application_id}, ${_param:webhook_login_id}, 42, 'stacklight_alertmanager', NULL, 1, NULL) ON CONFLICT (id) DO UPDATE SET id = excluded.id;
diff --git a/postgresql/client/janitor_monkey.yml b/postgresql/client/janitor_monkey.yml
new file mode 100644
index 0000000..def9a06
--- /dev/null
+++ b/postgresql/client/janitor_monkey.yml
@@ -0,0 +1,30 @@
+classes:
+ - system.postgresql.client
+parameters:
+ _param:
+ janmonkey_db_host: ${_param:haproxy_postgresql_bind_host}
+ janmonkey_db_user: janmonkey
+ janmonkey_db_user_password: janmonkey
+ janmonkey_login_id: 12
+ janmonkey_application_id: 2
+ postgresql:
+ client:
+ server:
+ server01:
+ database:
+ janmonkey:
+ enabled: true
+ encoding: 'UTF8'
+ locale: 'en_US'
+ users:
+ - name: ${_param:janmonkey_db_user}
+ password: ${_param:janmonkey_db_user_password}
+ host: ${_param:janmonkey_db_host}
+ createdb: true
+ rights: all privileges
+ init:
+ maintenance_db: pushkin
+ force: true
+ queries:
+ - INSERT INTO login VALUES (${_param:janmonkey_login_id}, ${_param:janmonkey_application_id}) ON CONFLICT (id) DO UPDATE SET id = excluded.id;
+ - INSERT INTO device VALUES (${_param:janmonkey_application_id}, ${_param:janmonkey_login_id}, 42, 'janitor_audit_service', NULL, 1, NULL) ON CONFLICT (id) DO UPDATE SET id = excluded.id;
diff --git a/postgresql/client/security_monkey.yml b/postgresql/client/security_monkey.yml
index 43e48d2..a7a341f 100644
--- a/postgresql/client/security_monkey.yml
+++ b/postgresql/client/security_monkey.yml
@@ -5,6 +5,8 @@
secmonkey_db_host: ${_param:haproxy_postgresql_bind_host}
secmonkey_db_user: secmonkey
secmonkey_db_user_password: secmonkey
+ secmonkey_login_id: 11
+ secmonkey_application_id: 1
postgresql:
client:
server:
@@ -24,5 +26,5 @@
maintenance_db: pushkin
force: true
queries:
- - INSERT INTO login VALUES (11, 1) ON CONFLICT (id) DO UPDATE SET id = excluded.id;
- - INSERT INTO device VALUES (1, 11, 42, 'security_audit_service', NULL, 1, NULL) ON CONFLICT (id) DO UPDATE SET id = excluded.id;
+ - INSERT INTO login VALUES (${_param:secmonkey_login_id}, ${_param:secmonkey_application_id}) ON CONFLICT (id) DO UPDATE SET id = excluded.id;
+ - INSERT INTO device VALUES (${_param:secmonkey_application_id}, ${_param:secmonkey_login_id}, 42, 'security_audit_service', NULL, 1, NULL) ON CONFLICT (id) DO UPDATE SET id = excluded.id;
diff --git a/prometheus/alertmanager/init.yml b/prometheus/alertmanager/init.yml
index b00a4b9..bdcdafd 100644
--- a/prometheus/alertmanager/init.yml
+++ b/prometheus/alertmanager/init.yml
@@ -2,3 +2,8 @@
_param:
prometheus_alertmanager_config_directory: /srv/alertmanager
prometheus_alertmanager_data_directory: /data
+ prometheus:
+ alertmanager:
+ dir:
+ data: /srv/volumes/local/alertmanager/data
+ config: /srv/volumes/local/alertmanager/config
diff --git a/prometheus/alertmanager/notification/email.yml b/prometheus/alertmanager/notification/email.yml
new file mode 100644
index 0000000..02b44ff
--- /dev/null
+++ b/prometheus/alertmanager/notification/email.yml
@@ -0,0 +1,23 @@
+parameters:
+ prometheus:
+ alertmanager:
+ config:
+ route:
+ routes:
+ email:
+ receiver: SMTP
+ match_re:
+ - label: route
+ value: email
+ receiver:
+ SMTP:
+ enabled: true
+ email_configs:
+ smtp_server:
+ to: ${_param:alertmanager_notification_email_to}
+ from: ${_param:alertmanager_notification_email_from}
+ auth_username: ${_param:alertmanager_notification_email_username}
+ auth_password: ${_param:alertmanager_notification_email_password}
+ smarthost: ${_param:alertmanager_notification_email_host}
+ require_tls: ${_param:alertmanager_notification_email_require_tls}
+ send_resolved: true
diff --git a/prometheus/alertmanager/notification/slack.yml b/prometheus/alertmanager/notification/slack.yml
new file mode 100644
index 0000000..c33e013
--- /dev/null
+++ b/prometheus/alertmanager/notification/slack.yml
@@ -0,0 +1,18 @@
+parameters:
+ prometheus:
+ alertmanager:
+ config:
+ route:
+ routes:
+ slack:
+ receiver: HTTP-slack
+ match_re:
+ - label: route
+ value: slack
+ receiver:
+ HTTP-slack:
+ enabled: true
+ slack_configs:
+ slack-endpoint:
+ api_url: "${_param:alertmanager_notification_slack_api_url}"
+ send_resolved: true
diff --git a/prometheus/server/alert/labels_add/route.yml b/prometheus/server/alert/labels_add/route.yml
index 47d9eea..651dab7 100644
--- a/prometheus/server/alert/labels_add/route.yml
+++ b/prometheus/server/alert/labels_add/route.yml
@@ -1,6 +1,6 @@
parameters:
_param:
- prometheus_server_alert_label_route: mail
+ prometheus_server_alert_label_route: email
prometheus:
server:
config:
diff --git a/prometheus/server/init.yml b/prometheus/server/init.yml
index 2c241bd..99fdceb 100644
--- a/prometheus/server/init.yml
+++ b/prometheus/server/init.yml
@@ -5,4 +5,6 @@
prometheus:
server:
dir:
+ data: /srv/volumes/local/prometheus/data
+ config: /srv/volumes/local/prometheus/config
config_in_container: ${_param:prometheus_server_config_directory}
diff --git a/prometheus/server/target/kubernetes.yml b/prometheus/server/target/kubernetes.yml
deleted file mode 100644
index 919c916..0000000
--- a/prometheus/server/target/kubernetes.yml
+++ /dev/null
@@ -1,9 +0,0 @@
-parameters:
- prometheus:
- server:
- target:
- kubernetes:
- enabled: true
- api_ip: ${_param:kubernetes_control_address}
- cert_name: prometheus-server.crt
- key_name: prometheus-server.key
diff --git a/rabbitmq/server/vhost/opencontrail.yml b/rabbitmq/server/vhost/opencontrail.yml
new file mode 100644
index 0000000..8f88cee
--- /dev/null
+++ b/rabbitmq/server/vhost/opencontrail.yml
@@ -0,0 +1,12 @@
+parameters:
+ rabbitmq:
+ server:
+ host:
+ '/':
+ enabled: true
+ user: guest
+ password: guest
+ policies:
+ - name: HA
+ pattern: '^(?!amq\.).*'
+ definition: '{"ha-mode": "all", "message-ttl": 120000}'
diff --git a/reclass/storage/system/ceph_mon_cluster.yml b/reclass/storage/system/ceph_mon_cluster.yml
new file mode 100644
index 0000000..85beafb
--- /dev/null
+++ b/reclass/storage/system/ceph_mon_cluster.yml
@@ -0,0 +1,39 @@
+parameters:
+ _param:
+ ceph_mon_node01_hostname: cmn01
+ ceph_mon_node02_hostname: cmn02
+ ceph_mon_node03_hostname: cmn03
+ ceph_mon_system_codename: xenial
+ reclass:
+ storage:
+ node:
+ ceph_mon_node01:
+ name: ${_param:ceph_mon_node01_hostname}
+ domain: ${_param:cluster_domain}
+ classes:
+ - cluster.${_param:cluster_name}.ceph.mon
+ params:
+ salt_master_host: ${_param:reclass_config_master}
+ linux_system_codename: ${_param:ceph_mon_system_codename}
+ single_address: ${_param:ceph_mon_node01_address}
+ keepalived_vip_priority: 103
+ ceph_mon_node02:
+ name: ${_param:ceph_mon_node02_hostname}
+ domain: ${_param:cluster_domain}
+ classes:
+ - cluster.${_param:cluster_name}.ceph.mon
+ params:
+ salt_master_host: ${_param:reclass_config_master}
+ linux_system_codename: ${_param:ceph_mon_system_codename}
+ single_address: ${_param:ceph_mon_node02_address}
+ keepalived_vip_priority: 102
+ ceph_mon_node03:
+ name: ${_param:ceph_mon_node03_hostname}
+ domain: ${_param:cluster_domain}
+ classes:
+ - cluster.${_param:cluster_name}.ceph.mon
+ params:
+ salt_master_host: ${_param:reclass_config_master}
+ linux_system_codename: ${_param:ceph_mon_system_codename}
+ single_address: ${_param:ceph_mon_node03_address}
+ keepalived_vip_priority: 101
diff --git a/reclass/storage/system/cicd_control_cluster.yml b/reclass/storage/system/cicd_control_cluster.yml
index 547ba61..bc31944 100644
--- a/reclass/storage/system/cicd_control_cluster.yml
+++ b/reclass/storage/system/cicd_control_cluster.yml
@@ -3,6 +3,7 @@
cicd_control_node01_hostname: cid01
cicd_control_node02_hostname: cid02
cicd_control_node03_hostname: cid03
+ cicd_control_system_codename: xenial
reclass:
storage:
node:
@@ -13,7 +14,7 @@
- cluster.${_param:cluster_name}.cicd.control.leader
params:
salt_master_host: ${_param:reclass_config_master}
- linux_system_codename: xenial
+ linux_system_codename: ${_param:cicd_control_system_codename}
single_address: ${_param:cicd_control_node01_address}
keepalived_vip_priority: 103
cicd_database_id: 1
@@ -24,7 +25,7 @@
- cluster.${_param:cluster_name}.cicd.control.manager
params:
salt_master_host: ${_param:reclass_config_master}
- linux_system_codename: xenial
+ linux_system_codename: ${_param:cicd_control_system_codename}
single_address: ${_param:cicd_control_node02_address}
keepalived_vip_priority: 102
cicd_database_id: 2
@@ -35,7 +36,7 @@
- cluster.${_param:cluster_name}.cicd.control.manager
params:
salt_master_host: ${_param:reclass_config_master}
- linux_system_codename: xenial
+ linux_system_codename: ${_param:cicd_control_system_codename}
single_address: ${_param:cicd_control_node03_address}
keepalived_vip_priority: 101
cicd_database_id: 3
diff --git a/reclass/storage/system/cicd_manager_cluster.yml b/reclass/storage/system/cicd_manager_cluster.yml
index 898e657..032f257 100644
--- a/reclass/storage/system/cicd_manager_cluster.yml
+++ b/reclass/storage/system/cicd_manager_cluster.yml
@@ -2,6 +2,7 @@
_param:
cicd_control_node02_hostname: cid01
cicd_control_node03_hostname: cid02
+ cicd_control_system_codename: xenial
reclass:
storage:
node:
@@ -12,7 +13,7 @@
- cluster.${_param:cluster_name}.cicd.control.manager
params:
salt_master_host: ${_param:reclass_config_master}
- linux_system_codename: xenial
+ linux_system_codename: ${_param:cicd_control_system_codename}
single_address: ${_param:cicd_control_node02_address}
keepalived_vip_priority: 102
cicd_database_id: 2
@@ -23,7 +24,7 @@
- cluster.${_param:cluster_name}.cicd.control.manager
params:
salt_master_host: ${_param:reclass_config_master}
- linux_system_codename: xenial
+ linux_system_codename: ${_param:cicd_control_system_codename}
single_address: ${_param:cicd_control_node03_address}
keepalived_vip_priority: 101
cicd_database_id: 3
diff --git a/reclass/storage/system/infra_idm_cluster.yml b/reclass/storage/system/infra_idm_cluster.yml
index aae2370..1d2efcf 100644
--- a/reclass/storage/system/infra_idm_cluster.yml
+++ b/reclass/storage/system/infra_idm_cluster.yml
@@ -3,6 +3,7 @@
infra_idm_node01_hostname: idm01
infra_idm_node02_hostname: idm02
infra_idm_node03_hostname: idm03
+ infra_idm_system_codename: centos
reclass:
storage:
node:
@@ -13,7 +14,7 @@
- cluster.${_param:cluster_name}.infra.idm
params:
salt_master_host: ${_param:reclass_config_master}
- linux_system_codename: centos
+ linux_system_codename: ${_param:infra_idm_system_codename}
single_address: ${_param:infra_idm_node01_address}
infra_idm_node02:
name: ${_param:infra_idm_node02_hostname}
@@ -22,7 +23,7 @@
- cluster.${_param:cluster_name}.infra.idm
params:
salt_master_host: ${_param:reclass_config_master}
- linux_system_codename: centos
+ linux_system_codename: ${_param:infra_idm_system_codename}
single_address: ${_param:infra_idm_node02_address}
infra_idm_node03:
name: ${_param:infra_idm_node03_hostname}
@@ -31,5 +32,5 @@
- cluster.${_param:cluster_name}.infra.idm
params:
salt_master_host: ${_param:reclass_config_master}
- linux_system_codename: centos
- single_address: ${_param:infra_idm_node03_address}
\ No newline at end of file
+ linux_system_codename: ${_param:infra_idm_system_codename}
+ single_address: ${_param:infra_idm_node03_address}
diff --git a/reclass/storage/system/infra_maas_single.yml b/reclass/storage/system/infra_maas_single.yml
index eb5a96b..c919fc9 100644
--- a/reclass/storage/system/infra_maas_single.yml
+++ b/reclass/storage/system/infra_maas_single.yml
@@ -1,6 +1,7 @@
parameters:
_param:
infra_maas_node01_hostname: mas01
+ infra_maas_system_codename: xenial
reclass:
storage:
node:
@@ -11,6 +12,5 @@
- cluster.${_param:cluster_name}.infra.maas
params:
salt_master_host: ${_param:infra_config_deploy_address}
- linux_system_codename: xenial
+ linux_system_codename: ${_param:infra_maas_system_codename}
single_address: ${_param:infra_maas_node01_deploy_address}
-
diff --git a/reclass/storage/system/infra_proxy_cluster.yml b/reclass/storage/system/infra_proxy_cluster.yml
index f7c7932..2cac99a 100644
--- a/reclass/storage/system/infra_proxy_cluster.yml
+++ b/reclass/storage/system/infra_proxy_cluster.yml
@@ -2,6 +2,7 @@
_param:
infra_proxy_node01_hostname: prx01
infra_proxy_node02_hostname: prx02
+ infra_proxy_system_codename: trusty
reclass:
storage:
node:
@@ -13,7 +14,7 @@
- cluster.${_param:cluster_name}.stacklight.proxy
params:
salt_master_host: ${_param:reclass_config_master}
- linux_system_codename: trusty
+ linux_system_codename: ${_param:infra_proxy_system_codename}
single_address: ${_param:infra_proxy_node01_address}
keepalived_vip_priority: 102
infra_proxy_node02:
@@ -24,6 +25,6 @@
- cluster.${_param:cluster_name}.stacklight.proxy
params:
salt_master_host: ${_param:reclass_config_master}
- linux_system_codename: trusty
+ linux_system_codename: ${_param:infra_proxy_system_codename}
single_address: ${_param:infra_proxy_node02_address}
keepalived_vip_priority: 101
diff --git a/reclass/storage/system/infra_proxy_single.yml b/reclass/storage/system/infra_proxy_single.yml
index a245e8c..f75acc5 100644
--- a/reclass/storage/system/infra_proxy_single.yml
+++ b/reclass/storage/system/infra_proxy_single.yml
@@ -1,6 +1,7 @@
parameters:
_param:
openstack_proxy_node01_hostname: prx01
+ openstack_proxy_system_codename: trusty
reclass:
storage:
node:
@@ -12,5 +13,5 @@
- cluster.${_param:cluster_name}.stacklight.proxy
params:
salt_master_host: ${_param:reclass_config_master}
- linux_system_codename: trusty
+ linux_system_codename: ${_param:openstack_proxy_system_codename}
single_address: ${_param:openstack_proxy_node01_address}
diff --git a/reclass/storage/system/kubernetes_control_cluster.yml b/reclass/storage/system/kubernetes_control_cluster.yml
index 5180ab6..15bec1e 100644
--- a/reclass/storage/system/kubernetes_control_cluster.yml
+++ b/reclass/storage/system/kubernetes_control_cluster.yml
@@ -3,6 +3,10 @@
kubernetes_control_node01_hostname: ctl01
kubernetes_control_node02_hostname: ctl02
kubernetes_control_node03_hostname: ctl03
+ kubernetes_control_node01_deploy_address: ${_param:kubernetes_control_node01_address}
+ kubernetes_control_node02_deploy_address: ${_param:kubernetes_control_node02_address}
+ kubernetes_control_node03_deploy_address: ${_param:kubernetes_control_node03_address}
+ kubernetes_control_system_codename: xenial
reclass:
storage:
node:
@@ -13,8 +17,9 @@
- cluster.${_param:cluster_name}.kubernetes.control
params:
salt_master_host: ${_param:reclass_config_master}
- linux_system_codename: xenial
+ linux_system_codename: ${_param:kubernetes_control_system_codename}
single_address: ${_param:kubernetes_control_node01_address}
+ deploy_address: ${_param:kubernetes_control_node01_deploy_address}
keepalived_vip_priority: 103
kubernetes_control_node02:
name: ${_param:kubernetes_control_node02_hostname}
@@ -23,8 +28,9 @@
- cluster.${_param:cluster_name}.kubernetes.control
params:
salt_master_host: ${_param:reclass_config_master}
- linux_system_codename: xenial
+ linux_system_codename: ${_param:kubernetes_control_system_codename}
single_address: ${_param:kubernetes_control_node02_address}
+ deploy_address: ${_param:kubernetes_control_node02_deploy_address}
keepalived_vip_priority: 102
kubernetes_control_node03:
name: ${_param:kubernetes_control_node03_hostname}
@@ -33,6 +39,7 @@
- cluster.${_param:cluster_name}.kubernetes.control
params:
salt_master_host: ${_param:reclass_config_master}
- linux_system_codename: xenial
+ linux_system_codename: ${_param:kubernetes_control_system_codename}
single_address: ${_param:kubernetes_control_node03_address}
- keepalived_vip_priority: 101
\ No newline at end of file
+ deploy_address: ${_param:kubernetes_control_node03_deploy_address}
+ keepalived_vip_priority: 101
diff --git a/reclass/storage/system/kubernetes_control_single.yml b/reclass/storage/system/kubernetes_control_single.yml
index c88e3c3..1ce0cd5 100644
--- a/reclass/storage/system/kubernetes_control_single.yml
+++ b/reclass/storage/system/kubernetes_control_single.yml
@@ -1,6 +1,7 @@
parameters:
_param:
kubernetes_control_node01_hostname: ctl01
+ kubernetes_control_system_codename: xenial
reclass:
storage:
node:
@@ -11,5 +12,5 @@
- cluster.${_param:cluster_name}.kubernetes.control
params:
salt_master_host: ${_param:reclass_config_master}
- linux_system_codename: xenial
- single_address: ${_param:kubernetes_control_node01_address}
\ No newline at end of file
+ linux_system_codename: ${_param:kubernetes_control_system_codename}
+ single_address: ${_param:kubernetes_control_node01_address}
diff --git a/reclass/storage/system/monitoring_service_cluster.yml b/reclass/storage/system/monitoring_service_cluster.yml
index 630ee32..0f6b3d8 100644
--- a/reclass/storage/system/monitoring_service_cluster.yml
+++ b/reclass/storage/system/monitoring_service_cluster.yml
@@ -3,6 +3,7 @@
monitor_node01_hostname: mon01
monitor_node02_hostname: mon02
monitor_node03_hostname: mon03
+ monitor_system_codename: xenial
reclass:
storage:
node:
@@ -13,7 +14,7 @@
- cluster.${_param:cluster_name}.monitoring.server
params:
salt_master_host: ${_param:reclass_config_master}
- linux_system_codename: xenial
+ linux_system_codename: ${_param:monitor_system_codename}
single_address: ${_param:monitoring_service_node01_address}
monitoring_service_node02:
name: ${_param:monitor_node02_hostname}
@@ -22,7 +23,7 @@
- cluster.${_param:cluster_name}.monitoring.server
params:
salt_master_host: ${_param:reclass_config_master}
- linux_system_codename: xenial
+ linux_system_codename: ${_param:monitor_system_codename}
single_address: ${_param:monitoring_service_node02_address}
monitoring_service_node03:
name: ${_param:monitor_node03_hostname}
@@ -31,5 +32,5 @@
- cluster.${_param:cluster_name}.monitoring.server
params:
salt_master_host: ${_param:reclass_config_master}
- linux_system_codename: xenial
+ linux_system_codename: ${_param:monitor_system_codename}
single_address: ${_param:monitoring_service_node03_address}
diff --git a/reclass/storage/system/monitoring_service_single.yml b/reclass/storage/system/monitoring_service_single.yml
index 9680529..d238b07 100644
--- a/reclass/storage/system/monitoring_service_single.yml
+++ b/reclass/storage/system/monitoring_service_single.yml
@@ -1,6 +1,7 @@
parameters:
_param:
monitor_node01_hostname: mon01
+ monitor_system_codename: xenial
reclass:
storage:
node:
@@ -11,5 +12,5 @@
- cluster.${_param:cluster_name}.monitoring.server
params:
salt_master_host: ${_param:reclass_config_master}
- linux_system_codename: xenial
+ linux_system_codename: ${_param:monitor_system_codename}
single_address: ${_param:monitoring_service_node01_address}
diff --git a/reclass/storage/system/opencontrail_analytics_cluster.yml b/reclass/storage/system/opencontrail_analytics_cluster.yml
index 6a4b7ee..400853e 100644
--- a/reclass/storage/system/opencontrail_analytics_cluster.yml
+++ b/reclass/storage/system/opencontrail_analytics_cluster.yml
@@ -3,6 +3,7 @@
opencontrail_analytics_node01_hostname: nal01
opencontrail_analytics_node02_hostname: nal02
opencontrail_analytics_node03_hostname: nal03
+ opencontrail_analytics_system_codename: trusty
reclass:
storage:
node:
@@ -13,18 +14,18 @@
- cluster.${_param:cluster_name}.opencontrail.analytics
params:
salt_master_host: ${_param:reclass_config_master}
- linux_system_codename: trusty
+ linux_system_codename: ${_param:opencontrail_analytics_system_codename}
single_address: ${_param:opencontrail_analytics_node01_address}
keepalived_vip_priority: 103
opencontrail_database_id: 1
opencontrail_analytics_node02:
name: ${_param:opencontrail_analytics_node02_hostname}
domain: ${_param:cluster_domain}
- classes:
+ classes:
- cluster.${_param:cluster_name}.opencontrail.analytics
params:
salt_master_host: ${_param:reclass_config_master}
- linux_system_codename: trusty
+ linux_system_codename: ${_param:opencontrail_analytics_system_codename}
single_address: ${_param:opencontrail_analytics_node02_address}
keepalived_vip_priority: 102
opencontrail_database_id: 2
@@ -35,7 +36,7 @@
- cluster.${_param:cluster_name}.opencontrail.analytics
params:
salt_master_host: ${_param:reclass_config_master}
- linux_system_codename: trusty
+ linux_system_codename: ${_param:opencontrail_analytics_system_codename}
single_address: ${_param:opencontrail_analytics_node03_address}
keepalived_vip_priority: 101
opencontrail_database_id: 3
diff --git a/reclass/storage/system/opencontrail_control_cluster.yml b/reclass/storage/system/opencontrail_control_cluster.yml
index d0213b3..f752c83 100644
--- a/reclass/storage/system/opencontrail_control_cluster.yml
+++ b/reclass/storage/system/opencontrail_control_cluster.yml
@@ -3,6 +3,7 @@
opencontrail_control_node01_hostname: ntw01
opencontrail_control_node02_hostname: ntw02
opencontrail_control_node03_hostname: ntw03
+ opencontrail_control_system_codename: trusty
reclass:
storage:
node:
@@ -13,7 +14,7 @@
- cluster.${_param:cluster_name}.opencontrail.control
params:
salt_master_host: ${_param:reclass_config_master}
- linux_system_codename: trusty
+ linux_system_codename: ${_param:opencontrail_control_system_codename}
single_address: ${_param:opencontrail_control_node01_address}
keepalived_vip_priority: 103
opencontrail_database_id: 1
@@ -24,7 +25,7 @@
- cluster.${_param:cluster_name}.opencontrail.control
params:
salt_master_host: ${_param:reclass_config_master}
- linux_system_codename: trusty
+ linux_system_codename: ${_param:opencontrail_control_system_codename}
single_address: ${_param:opencontrail_control_node02_address}
keepalived_vip_priority: 102
opencontrail_database_id: 2
@@ -35,7 +36,7 @@
- cluster.${_param:cluster_name}.opencontrail.control
params:
salt_master_host: ${_param:reclass_config_master}
- linux_system_codename: trusty
+ linux_system_codename: ${_param:opencontrail_control_system_codename}
single_address: ${_param:opencontrail_control_node03_address}
keepalived_vip_priority: 101
opencontrail_database_id: 3
diff --git a/reclass/storage/system/opencontrail_gateway_single.yml b/reclass/storage/system/opencontrail_gateway_single.yml
index 52b2786..30c7043 100644
--- a/reclass/storage/system/opencontrail_gateway_single.yml
+++ b/reclass/storage/system/opencontrail_gateway_single.yml
@@ -1,6 +1,7 @@
parameters:
_param:
opencontrail_gateway_hostname: gtw01
+ opencontrail_gateway_system_codename: trusty
reclass:
storage:
node:
@@ -11,5 +12,5 @@
- cluster.${_param:cluster_name}.opencontrail.gateway
params:
salt_master_host: ${_param:reclass_config_master}
- linux_system_codename: trusty
+ linux_system_codename: ${_param:opencontrail_gateway_system_codename}
single_address: ${_param:opencontrail_gateway_address}
diff --git a/reclass/storage/system/opencontrail_tor_cluster.yml b/reclass/storage/system/opencontrail_tor_cluster.yml
new file mode 100644
index 0000000..1fa2ad0
--- /dev/null
+++ b/reclass/storage/system/opencontrail_tor_cluster.yml
@@ -0,0 +1,32 @@
+parameters:
+ _param:
+ opencontrail_tor01_node01_hostname: tor01
+ opencontrail_tor01_node02_hostname: tor02
+ opencontrail_tor01_node01_tenant_address: ${_param:opencontrail_tor01_node01_address}
+ opencontrail_tor01_node02_tenant_address: ${_param:opencontrail_tor01_node02_address}
+ opencontrail_tor_system_codename: xenial
+ reclass:
+ storage:
+ node:
+ opencontrail_tor01_node01:
+ name: ${_param:opencontrail_tor01_node01_hostname}
+ domain: ${_param:cluster_domain}
+ classes:
+ - cluster.${_param:cluster_name}.opencontrail.tor
+ params:
+ salt_master_host: ${_param:reclass_config_master}
+ linux_system_codename: ${_param:opencontrail_tor_system_codename}
+ single_address: ${_param:opencontrail_tor01_node01_address}
+ tenant_address: ${_param:opencontrail_tor01_node01_tenant_address}
+ keepalived_vip_priority: 103
+ opencontrail_tor01_node02:
+ name: ${_param:opencontrail_tor01_node02_hostname}
+ domain: ${_param:cluster_domain}
+ classes:
+ - cluster.${_param:cluster_name}.opencontrail.tor
+ params:
+ salt_master_host: ${_param:reclass_config_master}
+ linux_system_codename: ${_param:opencontrail_tor_system_codename}
+ single_address: ${_param:opencontrail_tor01_node02_address}
+ tenant_address: ${_param:opencontrail_tor01_node02_tenant_address}
+ keepalived_vip_priority: 102
diff --git a/reclass/storage/system/openstack_baremetal_cluster.yml b/reclass/storage/system/openstack_baremetal_cluster.yml
index 8cab119..71f6034 100644
--- a/reclass/storage/system/openstack_baremetal_cluster.yml
+++ b/reclass/storage/system/openstack_baremetal_cluster.yml
@@ -19,6 +19,7 @@
salt_master_host: ${_param:reclass_config_master}
linux_system_codename: ${_param:linux_system_codename}
single_address: ${_param:openstack_baremetal_node01_address}
+ keepalived_vip_priority: 101
baremetal_address: ${_param:openstack_baremetal_node01_baremetal_address}
openstack_baremetal_node02:
name: ${_param:openstack_baremetal_node02_hostname}
@@ -29,6 +30,7 @@
salt_master_host: ${_param:reclass_config_master}
linux_system_codename: ${_param:linux_system_codename}
single_address: ${_param:openstack_baremetal_node02_address}
+ keepalived_vip_priority: 102
baremetal_address: ${_param:openstack_baremetal_node02_baremetal_address}
openstack_baremetal_node03:
name: ${_param:openstack_baremetal_node03_hostname}
@@ -39,6 +41,7 @@
salt_master_host: ${_param:reclass_config_master}
linux_system_codename: ${_param:linux_system_codename}
single_address: ${_param:openstack_baremetal_node03_address}
+ keepalived_vip_priority: 103
baremetal_address: ${_param:openstack_baremetal_node03_baremetal_address}
diff --git a/reclass/storage/system/openstack_benchmark_single.yml b/reclass/storage/system/openstack_benchmark_single.yml
index a676cc3..6958d41 100644
--- a/reclass/storage/system/openstack_benchmark_single.yml
+++ b/reclass/storage/system/openstack_benchmark_single.yml
@@ -1,6 +1,7 @@
parameters:
_param:
openstack_benchmark_node01_hostname: bmk01
+ openstack_benchmark_system_codename: xenial
reclass:
storage:
node:
@@ -11,5 +12,5 @@
- cluster.${_param:cluster_name}.openstack.benchmark
params:
salt_master_host: ${_param:reclass_config_master}
- linux_system_codename: xenial
+ linux_system_codename: ${_param:openstack_benchmark_system_codename}
single_address: ${_param:openstack_benchmark_node01_address}
diff --git a/reclass/storage/system/openstack_billing_single.yml b/reclass/storage/system/openstack_billing_single.yml
index 5b63ec0..49ed988 100644
--- a/reclass/storage/system/openstack_billing_single.yml
+++ b/reclass/storage/system/openstack_billing_single.yml
@@ -1,6 +1,7 @@
parameters:
_param:
openstack_billing_hostname: bil01
+ openstack_billing_system_codename: trusty
reclass:
storage:
node:
@@ -11,5 +12,5 @@
- cluster.${_param:cluster_name}.openstack.billing
params:
salt_master_host: ${_param:reclass_config_master}
- linux_system_codename: trusty
+ linux_system_codename: ${_param:openstack_billing_system_codename}
single_address: ${_param:openstack_billing_address}
diff --git a/reclass/storage/system/openstack_compute_multi.yml b/reclass/storage/system/openstack_compute_multi.yml
index 86092db..b319fa6 100644
--- a/reclass/storage/system/openstack_compute_multi.yml
+++ b/reclass/storage/system/openstack_compute_multi.yml
@@ -2,6 +2,8 @@
_param:
openstack_compute_node01_hostname: cmp01
openstack_compute_node02_hostname: cmp02
+ openstack_compute_node01_address: 172.16.10.105
+ openstack_compute_node02_address: 172.16.10.106
reclass:
storage:
node:
@@ -13,7 +15,7 @@
params:
salt_master_host: ${_param:reclass_config_master}
linux_system_codename: ${_param:linux_system_codename}
- single_address: 172.16.10.105
+ single_address: ${_param:openstack_compute_node01_address}
openstack_compute_node02:
name: ${_param:openstack_compute_node02_hostname}
domain: ${_param:cluster_domain}
@@ -22,4 +24,4 @@
params:
salt_master_host: ${_param:reclass_config_master}
linux_system_codename: ${_param:linux_system_codename}
- single_address: 172.16.10.106
+ single_address: ${_param:openstack_compute_node02_address}
diff --git a/reclass/storage/system/openstack_compute_single.yml b/reclass/storage/system/openstack_compute_single.yml
index 215c0e6..1b16352 100644
--- a/reclass/storage/system/openstack_compute_single.yml
+++ b/reclass/storage/system/openstack_compute_single.yml
@@ -1,6 +1,7 @@
parameters:
_param:
openstack_compute_node01_hostname: cmp01
+ openstack_compute_node01_address: 172.16.10.105
reclass:
storage:
node:
@@ -12,4 +13,4 @@
params:
salt_master_host: ${_param:reclass_config_master}
linux_system_codename: ${_param:linux_system_codename}
- single_address: 172.16.10.105
+ single_address: ${_param:openstack_compute_node01_address}
diff --git a/reclass/storage/system/openstack_control_cluster.yml b/reclass/storage/system/openstack_control_cluster.yml
index deb25b8..300a04c 100644
--- a/reclass/storage/system/openstack_control_cluster.yml
+++ b/reclass/storage/system/openstack_control_cluster.yml
@@ -3,6 +3,7 @@
openstack_control_node01_hostname: ctl01
openstack_control_node02_hostname: ctl02
openstack_control_node03_hostname: ctl03
+ openstack_control_system_codename: trusty
reclass:
storage:
node:
@@ -13,7 +14,7 @@
- cluster.${_param:cluster_name}.openstack.control
params:
salt_master_host: ${_param:reclass_config_master}
- linux_system_codename: trusty
+ linux_system_codename: ${_param:openstack_control_system_codename}
single_address: ${_param:openstack_control_node01_address}
keepalived_vip_priority: 103
opencontrail_database_id: 1
@@ -25,7 +26,7 @@
- cluster.${_param:cluster_name}.openstack.control
params:
salt_master_host: ${_param:reclass_config_master}
- linux_system_codename: trusty
+ linux_system_codename: ${_param:openstack_control_system_codename}
single_address: ${_param:openstack_control_node02_address}
keepalived_vip_priority: 102
opencontrail_database_id: 2
@@ -37,7 +38,7 @@
- cluster.${_param:cluster_name}.openstack.control
params:
salt_master_host: ${_param:reclass_config_master}
- linux_system_codename: trusty
+ linux_system_codename: ${_param:openstack_control_system_codename}
single_address: ${_param:openstack_control_node03_address}
keepalived_vip_priority: 101
opencontrail_database_id: 3
diff --git a/reclass/storage/system/openstack_control_single.yml b/reclass/storage/system/openstack_control_single.yml
index 016ab96..e7329da 100644
--- a/reclass/storage/system/openstack_control_single.yml
+++ b/reclass/storage/system/openstack_control_single.yml
@@ -1,6 +1,7 @@
parameters:
_param:
openstack_control_node01_hostname: ctl01
+ openstack_control_system_codename: xenial
reclass:
storage:
node:
@@ -11,5 +12,5 @@
- cluster.${_param:cluster_name}.openstack.control
params:
salt_master_host: ${_param:reclass_config_master}
- linux_system_codename: xenial
+ linux_system_codename: ${_param:openstack_control_system_codename}
single_address: ${_param:openstack_control_node01_address}
diff --git a/reclass/storage/system/openstack_control_upgrade_single.yml b/reclass/storage/system/openstack_control_upgrade_single.yml
index 964e064..e387062 100644
--- a/reclass/storage/system/openstack_control_upgrade_single.yml
+++ b/reclass/storage/system/openstack_control_upgrade_single.yml
@@ -1,6 +1,7 @@
parameters:
_param:
openstack_upgrade_node01_hostname: upg01
+ openstack_upgrade_system_codename: xenial
reclass:
storage:
node:
@@ -11,5 +12,5 @@
- cluster.${_param:cluster_name}.openstack.upgrade
params:
salt_master_host: ${_param:reclass_config_master}
- linux_system_codename: xenial
+ linux_system_codename: ${_param:openstack_upgrade_system_codename}
single_address: ${_param:openstack_upgrade_node01_address}
diff --git a/reclass/storage/system/openstack_dashboard_single.yml b/reclass/storage/system/openstack_dashboard_single.yml
index c2915d3..51e2d91 100644
--- a/reclass/storage/system/openstack_dashboard_single.yml
+++ b/reclass/storage/system/openstack_dashboard_single.yml
@@ -1,6 +1,7 @@
parameters:
_param:
openstack_proxy_hostname: prx01
+ openstack_proxy_system_codename: trusty
reclass:
storage:
node:
@@ -11,5 +12,5 @@
- cluster.${_param:cluster_name}.openstack.dashboard
params:
salt_master_host: ${_param:reclass_config_master}
- linux_system_codename: trusty
+ linux_system_codename: ${_param:openstack_proxy_system_codename}
single_address: 172.16.10.121
diff --git a/reclass/storage/system/openstack_database_cluster.yml b/reclass/storage/system/openstack_database_cluster.yml
index 33c6d24..7a2f3e5 100644
--- a/reclass/storage/system/openstack_database_cluster.yml
+++ b/reclass/storage/system/openstack_database_cluster.yml
@@ -3,6 +3,7 @@
openstack_database_node01_hostname: dbs01
openstack_database_node02_hostname: dbs02
openstack_database_node03_hostname: dbs03
+ openstack_database_system_codename: trusty
reclass:
storage:
node:
@@ -14,19 +15,19 @@
- cluster.${_param:cluster_name}.openstack.database
params:
salt_master_host: ${_param:reclass_config_master}
- linux_system_codename: trusty
+ linux_system_codename: ${_param:openstack_database_system_codename}
single_address: ${_param:openstack_database_node01_address}
keepalived_vip_priority: 103
mysql_cluster_role: master
openstack_database_node02:
name: ${_param:openstack_database_node02_hostname}
domain: ${_param:cluster_domain}
- classes:
+ classes:
- service.galera.slave.cluster
- cluster.${_param:cluster_name}.openstack.database
params:
salt_master_host: ${_param:reclass_config_master}
- linux_system_codename: trusty
+ linux_system_codename: ${_param:openstack_database_system_codename}
single_address: ${_param:openstack_database_node02_address}
keepalived_vip_priority: 102
mysql_cluster_role: slave
@@ -38,7 +39,7 @@
- cluster.${_param:cluster_name}.openstack.database
params:
salt_master_host: ${_param:reclass_config_master}
- linux_system_codename: trusty
+ linux_system_codename: ${_param:openstack_database_system_codename}
single_address: ${_param:openstack_database_node03_address}
keepalived_vip_priority: 101
mysql_cluster_role: slave
diff --git a/reclass/storage/system/openstack_dns_cluster.yml b/reclass/storage/system/openstack_dns_cluster.yml
index d134c88..d6b93d0 100644
--- a/reclass/storage/system/openstack_dns_cluster.yml
+++ b/reclass/storage/system/openstack_dns_cluster.yml
@@ -2,6 +2,7 @@
_param:
openstack_dns_node01_hostname: dns01
openstack_dns_node02_hostname: dns02
+ openstack_dns_system_codename: xenial
reclass:
storage:
node:
@@ -12,7 +13,7 @@
- cluster.${_param:cluster_name}.openstack.dns
params:
salt_master_host: ${_param:reclass_config_master}
- linux_system_codename: trusty
+ linux_system_codename: ${_param:openstack_dns_system_codename}
single_address: ${_param:openstack_dns_node01_address}
keepalived_vip_priority: 110
openstack_dns_node02:
@@ -22,6 +23,6 @@
- cluster.${_param:cluster_name}.openstack.dns
params:
salt_master_host: ${_param:reclass_config_master}
- linux_system_codename: trusty
+ linux_system_codename: ${_param:openstack_dns_system_codename}
single_address: ${_param:openstack_dns_node02_address}
keepalived_vip_priority: 111
diff --git a/reclass/storage/system/openstack_message_queue_cluster.yml b/reclass/storage/system/openstack_message_queue_cluster.yml
index c6a811f..3836af0 100644
--- a/reclass/storage/system/openstack_message_queue_cluster.yml
+++ b/reclass/storage/system/openstack_message_queue_cluster.yml
@@ -3,6 +3,7 @@
openstack_message_queue_node01_hostname: msg01
openstack_message_queue_node02_hostname: msg02
openstack_message_queue_node03_hostname: msg03
+ openstack_message_system_codename: trusty
reclass:
storage:
node:
@@ -13,18 +14,18 @@
- cluster.${_param:cluster_name}.openstack.message_queue
params:
salt_master_host: ${_param:reclass_config_master}
- linux_system_codename: trusty
+ linux_system_codename: ${_param:openstack_message_system_codename}
single_address: ${_param:openstack_message_queue_node01_address}
keepalived_vip_priority: 103
rabbitmq_cluster_role: master
openstack_message_queue_node02:
name: ${_param:openstack_message_queue_node02_hostname}
domain: ${_param:cluster_domain}
- classes:
+ classes:
- cluster.${_param:cluster_name}.openstack.message_queue
params:
salt_master_host: ${_param:reclass_config_master}
- linux_system_codename: trusty
+ linux_system_codename: ${_param:openstack_message_system_codename}
single_address: ${_param:openstack_message_queue_node02_address}
keepalived_vip_priority: 102
rabbitmq_cluster_role: slave
@@ -35,7 +36,7 @@
- cluster.${_param:cluster_name}.openstack.message_queue
params:
salt_master_host: ${_param:reclass_config_master}
- linux_system_codename: trusty
+ linux_system_codename: ${_param:openstack_message_system_codename}
single_address: ${_param:openstack_message_queue_node03_address}
keepalived_vip_priority: 101
rabbitmq_cluster_role: slave
diff --git a/reclass/storage/system/openstack_proxy_cluster.yml b/reclass/storage/system/openstack_proxy_cluster.yml
index 95439fa..ca0b2a9 100644
--- a/reclass/storage/system/openstack_proxy_cluster.yml
+++ b/reclass/storage/system/openstack_proxy_cluster.yml
@@ -2,6 +2,7 @@
_param:
openstack_proxy_node01_hostname: prx01
openstack_proxy_node02_hostname: prx02
+ openstack_proxy_system_codename: trusty
reclass:
storage:
node:
@@ -12,7 +13,7 @@
- cluster.${_param:cluster_name}.openstack.proxy
params:
salt_master_host: ${_param:reclass_config_master}
- linux_system_codename: trusty
+ linux_system_codename: ${_param:openstack_proxy_system_codename}
single_address: ${_param:openstack_proxy_node01_address}
keepalived_vip_priority: 102
openstack_proxy_node02:
@@ -22,6 +23,6 @@
- cluster.${_param:cluster_name}.openstack.proxy
params:
salt_master_host: ${_param:reclass_config_master}
- linux_system_codename: trusty
+ linux_system_codename: ${_param:openstack_proxy_system_codename}
single_address: ${_param:openstack_proxy_node02_address}
keepalived_vip_priority: 101
diff --git a/reclass/storage/system/openstack_proxy_single.yml b/reclass/storage/system/openstack_proxy_single.yml
index 794ca64..a2dddd7 100644
--- a/reclass/storage/system/openstack_proxy_single.yml
+++ b/reclass/storage/system/openstack_proxy_single.yml
@@ -1,6 +1,7 @@
parameters:
_param:
openstack_proxy_node01_hostname: prx01
+ openstack_proxy_system_codename: trusty
reclass:
storage:
node:
@@ -11,5 +12,5 @@
- cluster.${_param:cluster_name}.openstack.proxy
params:
salt_master_host: ${_param:reclass_config_master}
- linux_system_codename: trusty
+ linux_system_codename: ${_param:openstack_proxy_system_codename}
single_address: ${_param:openstack_proxy_node01_address}
diff --git a/reclass/storage/system/openstack_telemetry_cluster.yml b/reclass/storage/system/openstack_telemetry_cluster.yml
index d184fc9..9dc6457 100644
--- a/reclass/storage/system/openstack_telemetry_cluster.yml
+++ b/reclass/storage/system/openstack_telemetry_cluster.yml
@@ -3,6 +3,7 @@
openstack_telemetry_node01_hostname: mdb01
openstack_telemetry_node02_hostname: mdb02
openstack_telemetry_node03_hostname: mdb03
+ openstack_telemetry_system_codename: trusty
reclass:
storage:
node:
@@ -13,7 +14,7 @@
- cluster.${_param:cluster_name}.openstack.telemetry
params:
salt_master_host: ${_param:reclass_config_master}
- linux_system_codename: trusty
+ linux_system_codename: ${_param:openstack_telemetry_system_codename}
single_address: ${_param:openstack_telemetry_node01_address}
keepalived_vip_priority: 103
openstack_telemetry_node02:
@@ -23,7 +24,7 @@
- cluster.${_param:cluster_name}.openstack.telemetry
params:
salt_master_host: ${_param:reclass_config_master}
- linux_system_codename: trusty
+ linux_system_codename: ${_param:openstack_telemetry_system_codename}
single_address: ${_param:openstack_telemetry_node02_address}
keepalived_vip_priority: 102
openstack_telemetry_node03:
@@ -33,6 +34,6 @@
- cluster.${_param:cluster_name}.openstack.telemetry
params:
salt_master_host: ${_param:reclass_config_master}
- linux_system_codename: trusty
+ linux_system_codename: ${_param:openstack_telemetry_system_codename}
single_address: ${_param:openstack_telemetry_node03_address}
keepalived_vip_priority: 101
diff --git a/reclass/storage/system/physical_control_cluster.yml b/reclass/storage/system/physical_control_cluster.yml
index 4622e09..ebd0eb0 100644
--- a/reclass/storage/system/physical_control_cluster.yml
+++ b/reclass/storage/system/physical_control_cluster.yml
@@ -15,6 +15,7 @@
infra_kvm_node01_public_address: ${_param:infra_kvm_node01_address}
infra_kvm_node02_public_address: ${_param:infra_kvm_node02_address}
infra_kvm_node03_public_address: ${_param:infra_kvm_node03_address}
+ infra_kvm_system_codename: trusty
reclass:
storage:
@@ -26,7 +27,7 @@
- cluster.${_param:cluster_name}.infra.kvm
params:
salt_master_host: ${_param:reclass_config_master}
- linux_system_codename: trusty
+ linux_system_codename: ${_param:infra_kvm_system_codename}
single_address: ${_param:infra_kvm_node01_address}
deploy_address: ${_param:infra_kvm_node01_deploy_address}
public_address: ${_param:infra_kvm_node01_public_address}
@@ -38,7 +39,7 @@
- cluster.${_param:cluster_name}.infra.kvm
params:
salt_master_host: ${_param:reclass_config_master}
- linux_system_codename: trusty
+ linux_system_codename: ${_param:infra_kvm_system_codename}
single_address: ${_param:infra_kvm_node02_address}
deploy_address: ${_param:infra_kvm_node02_deploy_address}
public_address: ${_param:infra_kvm_node02_public_address}
@@ -50,7 +51,7 @@
- cluster.${_param:cluster_name}.infra.kvm
params:
salt_master_host: ${_param:reclass_config_master}
- linux_system_codename: trusty
+ linux_system_codename: ${_param:infra_kvm_system_codename}
single_address: ${_param:infra_kvm_node03_address}
deploy_address: ${_param:infra_kvm_node03_deploy_address}
public_address: ${_param:infra_kvm_node03_public_address}
diff --git a/reclass/storage/system/physical_control_full.yml b/reclass/storage/system/physical_control_full.yml
index 0f510a4..1bdd345 100644
--- a/reclass/storage/system/physical_control_full.yml
+++ b/reclass/storage/system/physical_control_full.yml
@@ -40,6 +40,8 @@
infra_kvm_node08_public_address: ${_param:infra_kvm_node08_address}
infra_kvm_node09_public_address: ${_param:infra_kvm_node09_address}
+ infra_kvm_system_codename: trusty
+
reclass:
storage:
node:
@@ -50,7 +52,7 @@
- cluster.${_param:cluster_name}.infra.kvm
params:
salt_master_host: ${_param:reclass_config_master}
- linux_system_codename: trusty
+ linux_system_codename: ${_param:infra_kvm_system_codename}
single_address: ${_param:infra_kvm_node01_address}
deploy_address: ${_param:infra_kvm_node01_deploy_address}
public_address: ${_param:infra_kvm_node01_public_address}
@@ -62,7 +64,7 @@
- cluster.${_param:cluster_name}.infra.kvm
params:
salt_master_host: ${_param:reclass_config_master}
- linux_system_codename: trusty
+ linux_system_codename: ${_param:infra_kvm_system_codename}
single_address: ${_param:infra_kvm_node02_address}
deploy_address: ${_param:infra_kvm_node02_deploy_address}
public_address: ${_param:infra_kvm_node02_public_address}
@@ -74,7 +76,7 @@
- cluster.${_param:cluster_name}.infra.kvm
params:
salt_master_host: ${_param:reclass_config_master}
- linux_system_codename: trusty
+ linux_system_codename: ${_param:infra_kvm_system_codename}
single_address: ${_param:infra_kvm_node03_address}
deploy_address: ${_param:infra_kvm_node03_deploy_address}
public_address: ${_param:infra_kvm_node03_public_address}
@@ -86,7 +88,7 @@
- cluster.${_param:cluster_name}.infra.kvm
params:
salt_master_host: ${_param:reclass_config_master}
- linux_system_codename: trusty
+ linux_system_codename: ${_param:infra_kvm_system_codename}
single_address: ${_param:infra_kvm_node04_address}
deploy_address: ${_param:infra_kvm_node04_deploy_address}
public_address: ${_param:infra_kvm_node04_public_address}
@@ -98,7 +100,7 @@
- cluster.${_param:cluster_name}.infra.kvm
params:
salt_master_host: ${_param:reclass_config_master}
- linux_system_codename: trusty
+ linux_system_codename: ${_param:infra_kvm_system_codename}
single_address: ${_param:infra_kvm_node05_address}
deploy_address: ${_param:infra_kvm_node05_deploy_address}
public_address: ${_param:infra_kvm_node05_public_address}
@@ -110,7 +112,7 @@
- cluster.${_param:cluster_name}.infra.kvm
params:
salt_master_host: ${_param:reclass_config_master}
- linux_system_codename: trusty
+ linux_system_codename: ${_param:infra_kvm_system_codename}
single_address: ${_param:infra_kvm_node06_address}
deploy_address: ${_param:infra_kvm_node06_deploy_address}
public_address: ${_param:infra_kvm_node06_public_address}
@@ -122,7 +124,7 @@
- cluster.${_param:cluster_name}.infra.kvm
params:
salt_master_host: ${_param:reclass_config_master}
- linux_system_codename: trusty
+ linux_system_codename: ${_param:infra_kvm_system_codename}
single_address: ${_param:infra_kvm_node07_address}
deploy_address: ${_param:infra_kvm_node07_deploy_address}
public_address: ${_param:infra_kvm_node07_public_address}
@@ -134,7 +136,7 @@
- cluster.${_param:cluster_name}.infra.kvm
params:
salt_master_host: ${_param:reclass_config_master}
- linux_system_codename: trusty
+ linux_system_codename: ${_param:infra_kvm_system_codename}
single_address: ${_param:infra_kvm_node08_address}
deploy_address: ${_param:infra_kvm_node08_deploy_address}
public_address: ${_param:infra_kvm_node08_public_address}
@@ -146,7 +148,7 @@
- cluster.${_param:cluster_name}.infra.kvm
params:
salt_master_host: ${_param:reclass_config_master}
- linux_system_codename: trusty
+ linux_system_codename: ${_param:infra_kvm_system_codename}
single_address: ${_param:infra_kvm_node09_address}
deploy_address: ${_param:infra_kvm_node09_deploy_address}
public_address: ${_param:infra_kvm_node09_public_address}
diff --git a/reclass/storage/system/physical_control_single.yml b/reclass/storage/system/physical_control_single.yml
index 32f09c3..db92c5f 100644
--- a/reclass/storage/system/physical_control_single.yml
+++ b/reclass/storage/system/physical_control_single.yml
@@ -4,6 +4,7 @@
infra_kvm_node01_deploy_address: ${_param:infra_kvm_node01_address}
infra_kvm_node01_storage_address: ${_param:infra_kvm_node01_address}
infra_kvm_node01_public_address: ${_param:infra_kvm_node01_address}
+ infra_kvm_system_codename: trusty
reclass:
storage:
node:
@@ -14,7 +15,7 @@
- cluster.${_param:cluster_name}.infra.kvm
params:
salt_master_host: ${_param:reclass_config_master}
- linux_system_codename: trusty
+ linux_system_codename: ${_param:infra_kvm_system_codename}
single_address: ${_param:infra_kvm_node01_address}
deploy_address: ${_param:infra_kvm_node01_deploy_address}
public_address: ${_param:infra_kvm_node01_public_address}
diff --git a/reclass/storage/system/rsyslog_single.yml b/reclass/storage/system/rsyslog_single.yml
index a3eefac..b4c36bc 100644
--- a/reclass/storage/system/rsyslog_single.yml
+++ b/reclass/storage/system/rsyslog_single.yml
@@ -1,6 +1,7 @@
parameters:
_param:
rsyslog_node01_hostname: rsl01
+ rsyslog_system_codename: xenial
reclass:
storage:
node:
@@ -11,5 +12,5 @@
- cluster.${_param:cluster_name}.infra.rsyslog
params:
salt_master_host: ${_param:reclass_config_master}
- linux_system_codename: xenial
+ linux_system_codename: ${_param:rsyslog_system_codename}
single_address: ${_param:rsyslog_node01_address}
diff --git a/reclass/storage/system/stacklight_log_cluster.yml b/reclass/storage/system/stacklight_log_cluster.yml
index bbb6a6b..14b8108 100644
--- a/reclass/storage/system/stacklight_log_cluster.yml
+++ b/reclass/storage/system/stacklight_log_cluster.yml
@@ -3,6 +3,7 @@
stacklight_log_node01_hostname: log01
stacklight_log_node02_hostname: log02
stacklight_log_node03_hostname: log03
+ stacklight_log_system_codename: xenial
reclass:
storage:
node:
@@ -14,7 +15,7 @@
- cluster.${_param:cluster_name}.stacklight.log_curator
params:
salt_master_host: ${_param:reclass_config_master}
- linux_system_codename: xenial
+ linux_system_codename: ${_param:stacklight_log_system_codename}
single_address: ${_param:stacklight_log_node01_address}
keepalived_vip_priority: 103
stacklight_log_node02:
@@ -25,7 +26,7 @@
- cluster.${_param:cluster_name}.stacklight.log_curator
params:
salt_master_host: ${_param:reclass_config_master}
- linux_system_codename: xenial
+ linux_system_codename: ${_param:stacklight_log_system_codename}
single_address: ${_param:stacklight_log_node02_address}
keepalived_vip_priority: 102
stacklight_log_node03:
@@ -36,6 +37,6 @@
- cluster.${_param:cluster_name}.stacklight.log_curator
params:
salt_master_host: ${_param:reclass_config_master}
- linux_system_codename: xenial
+ linux_system_codename: ${_param:stacklight_log_system_codename}
single_address: ${_param:stacklight_log_node03_address}
keepalived_vip_priority: 101
diff --git a/reclass/storage/system/stacklight_monitor_cluster.yml b/reclass/storage/system/stacklight_monitor_cluster.yml
index f95cf81..5d56a6d 100644
--- a/reclass/storage/system/stacklight_monitor_cluster.yml
+++ b/reclass/storage/system/stacklight_monitor_cluster.yml
@@ -3,6 +3,7 @@
stacklight_monitor_node01_hostname: mon01
stacklight_monitor_node02_hostname: mon02
stacklight_monitor_node03_hostname: mon03
+ stacklight_monitor_system_codename: xenial
reclass:
storage:
node:
@@ -15,7 +16,7 @@
redis_cluster_role: 'master'
rabbitmq_cluster_role: 'master'
salt_master_host: ${_param:reclass_config_master}
- linux_system_codename: xenial
+ linux_system_codename: ${_param:stacklight_monitor_system_codename}
single_address: ${_param:stacklight_monitor_node01_address}
keepalived_vip_priority: 103
stacklight_monitor_node02:
@@ -27,7 +28,7 @@
redis_cluster_role: 'slave'
rabbitmq_cluster_role: 'slave'
salt_master_host: ${_param:reclass_config_master}
- linux_system_codename: xenial
+ linux_system_codename: ${_param:stacklight_monitor_system_codename}
single_address: ${_param:stacklight_monitor_node02_address}
keepalived_vip_priority: 102
stacklight_monitor_node03:
@@ -39,6 +40,6 @@
redis_cluster_role: 'slave'
rabbitmq_cluster_role: 'slave'
salt_master_host: ${_param:reclass_config_master}
- linux_system_codename: xenial
+ linux_system_codename: ${_param:stacklight_monitor_system_codename}
single_address: ${_param:stacklight_monitor_node03_address}
keepalived_vip_priority: 101
diff --git a/reclass/storage/system/stacklight_server_cluster.yml b/reclass/storage/system/stacklight_server_cluster.yml
index 26b9ebe..4846c84 100644
--- a/reclass/storage/system/stacklight_server_cluster.yml
+++ b/reclass/storage/system/stacklight_server_cluster.yml
@@ -3,6 +3,7 @@
stacklight_monitor_node01_hostname: mon01
stacklight_monitor_node02_hostname: mon02
stacklight_monitor_node03_hostname: mon03
+ stacklight_monitor_system_codename: xenial
reclass:
storage:
node:
@@ -18,10 +19,9 @@
redis_cluster_role: 'master'
rabbitmq_cluster_role: 'master'
salt_master_host: ${_param:reclass_config_master}
- linux_system_codename: xenial
+ linux_system_codename: ${_param:stacklight_monitor_system_codename}
single_address: ${_param:stacklight_monitor_node01_address}
keepalived_vip_priority: 103
- rabbitmq_cluster_role: master
stacklight_server_node02:
name: ${_param:stacklight_monitor_node02_hostname}
domain: ${_param:cluster_domain}
@@ -31,10 +31,9 @@
redis_cluster_role: 'slave'
rabbitmq_cluster_role: 'slave'
salt_master_host: ${_param:reclass_config_master}
- linux_system_codename: xenial
+ linux_system_codename: ${_param:stacklight_monitor_system_codename}
single_address: ${_param:stacklight_monitor_node02_address}
keepalived_vip_priority: 102
- rabbitmq_cluster_role: slave
stacklight_server_node03:
name: ${_param:stacklight_monitor_node03_hostname}
domain: ${_param:cluster_domain}
@@ -44,7 +43,6 @@
redis_cluster_role: 'slave'
rabbitmq_cluster_role: 'slave'
salt_master_host: ${_param:reclass_config_master}
- linux_system_codename: xenial
+ linux_system_codename: ${_param:stacklight_monitor_system_codename}
single_address: ${_param:stacklight_monitor_node03_address}
keepalived_vip_priority: 101
- rabbitmq_cluster_role: slave
diff --git a/reclass/storage/system/stacklight_server_single.yml b/reclass/storage/system/stacklight_server_single.yml
index 2b397f6..dd5f6ac 100644
--- a/reclass/storage/system/stacklight_server_single.yml
+++ b/reclass/storage/system/stacklight_server_single.yml
@@ -1,6 +1,7 @@
parameters:
_param:
stacklight_monitor_node01_hostname: mon01
+ stacklight_monitor_system_codename: xenial
reclass:
storage:
node:
@@ -14,5 +15,5 @@
- system.kibana.client.single
params:
salt_master_host: ${_param:reclass_config_master}
- linux_system_codename: xenial
+ linux_system_codename: ${_param:stacklight_monitor_system_codename}
single_address: ${_param:stacklight_monitor_node01_address}
diff --git a/reclass/storage/system/stacklight_telemetry_cluster.yml b/reclass/storage/system/stacklight_telemetry_cluster.yml
index 12b1dae..b9e2640 100644
--- a/reclass/storage/system/stacklight_telemetry_cluster.yml
+++ b/reclass/storage/system/stacklight_telemetry_cluster.yml
@@ -3,6 +3,7 @@
stacklight_telemetry_node01_hostname: mtr01
stacklight_telemetry_node02_hostname: mtr02
stacklight_telemetry_node03_hostname: mtr03
+ stacklight_telemetry_system_codename: xenial
reclass:
storage:
node:
@@ -13,7 +14,7 @@
- cluster.${_param:cluster_name}.stacklight.telemetry
params:
salt_master_host: ${_param:reclass_config_master}
- linux_system_codename: xenial
+ linux_system_codename: ${_param:stacklight_telemetry_system_codename}
single_address: ${_param:stacklight_telemetry_node01_address}
keepalived_vip_priority: 103
stacklight_telemetry_node02:
@@ -23,7 +24,7 @@
- cluster.${_param:cluster_name}.stacklight.telemetry
params:
salt_master_host: ${_param:reclass_config_master}
- linux_system_codename: xenial
+ linux_system_codename: ${_param:stacklight_telemetry_system_codename}
single_address: ${_param:stacklight_telemetry_node02_address}
keepalived_vip_priority: 102
stacklight_telemetry_node03:
@@ -33,6 +34,6 @@
- cluster.${_param:cluster_name}.stacklight.telemetry
params:
salt_master_host: ${_param:reclass_config_master}
- linux_system_codename: xenial
+ linux_system_codename: ${_param:stacklight_telemetry_system_codename}
single_address: ${_param:stacklight_telemetry_node03_address}
keepalived_vip_priority: 101
diff --git a/reclass/storage/system/stacklight_telemetry_single.yml b/reclass/storage/system/stacklight_telemetry_single.yml
index bc51b30..239ae0f 100644
--- a/reclass/storage/system/stacklight_telemetry_single.yml
+++ b/reclass/storage/system/stacklight_telemetry_single.yml
@@ -1,6 +1,7 @@
parameters:
_param:
stacklight_telemetry_node01_hostname: mtr01
+ stacklight_telemetry_system_codename: xenial
reclass:
storage:
node:
@@ -11,6 +12,6 @@
- cluster.${_param:cluster_name}.stacklight.telemetry
params:
salt_master_host: ${_param:reclass_config_master}
- linux_system_codename: xenial
+ linux_system_codename: ${_param:stacklight_telemetry_system_codename}
single_address: ${_param:stacklight_telemetry_node01_address}
- keepalived_vip_priority: 103
\ No newline at end of file
+ keepalived_vip_priority: 103
diff --git a/reclass/storage/system/stacklightv2_server_cluster.yml b/reclass/storage/system/stacklightv2_server_cluster.yml
index c72ac2c..81bf22a 100644
--- a/reclass/storage/system/stacklightv2_server_cluster.yml
+++ b/reclass/storage/system/stacklightv2_server_cluster.yml
@@ -3,6 +3,7 @@
stacklight_monitor_node01_hostname: mon01
stacklight_monitor_node02_hostname: mon02
stacklight_monitor_node03_hostname: mon03
+ stacklight_monitor_system_codename: xenial
reclass:
storage:
node:
@@ -15,7 +16,7 @@
- cluster.${_param:cluster_name}.stacklight.client
params:
salt_master_host: ${_param:reclass_config_master}
- linux_system_codename: xenial
+ linux_system_codename: ${_param:stacklight_monitor_system_codename}
single_address: ${_param:stacklight_monitor_node01_address}
keepalived_vip_priority: 103
stacklight_server_node02:
@@ -26,7 +27,7 @@
- cluster.${_param:cluster_name}.stacklight.server
params:
salt_master_host: ${_param:reclass_config_master}
- linux_system_codename: xenial
+ linux_system_codename: ${_param:stacklight_monitor_system_codename}
single_address: ${_param:stacklight_monitor_node02_address}
keepalived_vip_priority: 102
stacklight_server_node03:
@@ -37,6 +38,6 @@
- cluster.${_param:cluster_name}.stacklight.server
params:
salt_master_host: ${_param:reclass_config_master}
- linux_system_codename: xenial
+ linux_system_codename: ${_param:stacklight_monitor_system_codename}
single_address: ${_param:stacklight_monitor_node03_address}
keepalived_vip_priority: 101
diff --git a/rundeck/client/project/cicd.yml b/rundeck/client/project/cicd.yml
index cb427d8..ed8b256 100644
--- a/rundeck/client/project/cicd.yml
+++ b/rundeck/client/project/cicd.yml
@@ -1,14 +1,17 @@
parameters:
_param:
- rundeck_cis_os_auth_url: none
- rundeck_cis_os_username: admin
- rundeck_cis_os_password: password
- rundeck_cis_os_project_name: admin
- rundeck_cis_os_domain_id: default
rundeck_cis_jobs_repository: https://gerrit.mcp.mirantis.net/oss/rundeck-cis-jobs
rundeck_cis_jobs_revision: master
- rundeck_cis_elasticsearch_url: none
+ rundeck_cis_elasticsearch_url: yourelastic:9200
rundeck_cis_os_docker_image: docker-prod-local.artifactory.mirantis.com/mirantis/oss/cis-openstack:latest
+ rundeck_cis_openstack:
+ auth_url: http://yourcloud.com:5000/v3/auth/tokens
+ username: admin
+ password: password
+ cert: plain-certificate
+ ssl_cert_file: cert.pem
+ project_name: admin
+ domain_id: default
rundeck:
client:
project:
@@ -38,21 +41,27 @@
cis/elasticsearch/url:
type: password
content: ${_param:rundeck_cis_elasticsearch_url}
- cis/openstack/auth_url:
- type: password
- content: ${_param:rundeck_cis_os_auth_url}
- cis/openstack/username:
- type: password
- content: ${_param:rundeck_cis_os_username}
- cis/openstack/password:
- type: password
- content: ${_param:rundeck_cis_os_password}
- cis/openstack/project_name:
- type: password
- content: ${_param:rundeck_cis_os_project_name}
- cis/openstack/domain_id:
- type: password
- content: ${_param:rundeck_cis_os_domain_id}
cis/openstack/image:
type: password
content: ${_param:rundeck_cis_os_docker_image}
+ cis/openstack/auth_url:
+ type: password
+ content: ${_param:rundeck_cis_openstack:auth_url}
+ cis/openstack/username:
+ type: password
+ content: ${_param:rundeck_cis_openstack:username}
+ cis/openstack/password:
+ type: password
+ content: ${_param:rundeck_cis_openstack:password}
+ cis/openstack/project_name:
+ type: password
+ content: ${_param:rundeck_cis_openstack:project_name}
+ cis/openstack/domain_id:
+ type: password
+ content: ${_param:rundeck_cis_openstack:domain_id}
+ cis/openstack/cert.pem:
+ type: password
+ content: ${_param:rundeck_cis_openstack:cert}
+ cis/openstack/cert_file:
+ type: password
+ content: ${_param:rundeck_cis_openstack:ssl_cert_file}
diff --git a/rundeck/server/docker.yml b/rundeck/server/docker.yml
index 1c89f4f..492d135 100644
--- a/rundeck/server/docker.yml
+++ b/rundeck/server/docker.yml
@@ -8,6 +8,7 @@
rundeck_postgresql_database: rundeck
rundeck_postgresql_host: ${_param:control_vip_address}
rundeck_postgresql_port: 5432
+ rundeck_server_ssh_timeout: 300000
rundeck:
server:
user:
@@ -30,3 +31,4 @@
user: ${_param:rundeck_runbook_user}
private_key: ${_param:rundeck_runbook_private_key}
public_key: ${_param:rundeck_runbook_public_key}
+ timeout: ${_param:rundeck_server_ssh_timeout}
diff --git a/salt/master/formula/git/ceph.yml b/salt/master/formula/git/ceph.yml
new file mode 100644
index 0000000..10c3ca0
--- /dev/null
+++ b/salt/master/formula/git/ceph.yml
@@ -0,0 +1,10 @@
+parameters:
+ salt:
+ master:
+ environment:
+ dev:
+ formula:
+ ceph:
+ source: git
+ address: '${_param:salt_master_environment_repository}/salt-formula-ceph.git'
+ revision: ${_param:salt_master_environment_revision}
diff --git a/salt/master/formula/git/helm.yml b/salt/master/formula/git/helm.yml
new file mode 100644
index 0000000..c25358f
--- /dev/null
+++ b/salt/master/formula/git/helm.yml
@@ -0,0 +1,16 @@
+parameters:
+ salt:
+ master:
+ environment:
+ prd:
+ formula:
+ helm:
+ source: git
+ address: '${_param:salt_master_environment_repository}/salt-formula-helm.git'
+ revision: ${_param:salt_master_environment_revision}
+ module:
+ helm.py:
+ enabled: true
+ state:
+ helm_release.py:
+ enabled: true
diff --git a/salt/master/formula/git/kubernetes.yml b/salt/master/formula/git/kubernetes.yml
index fe8ad5d..3d9d89e 100644
--- a/salt/master/formula/git/kubernetes.yml
+++ b/salt/master/formula/git/kubernetes.yml
@@ -12,11 +12,7 @@
source: git
address: '${_param:salt_master_environment_repository}/salt-formula-etcd.git'
revision: ${_param:salt_master_environment_revision}
- bird:
- source: git
- address: '${_param:salt_master_environment_repository}/salt-formula-bird.git'
- revision: ${_param:salt_master_environment_revision}
docker:
source: git
address: '${_param:salt_master_environment_repository}/salt-formula-docker.git'
- revision: ${_param:salt_master_environment_revision}
\ No newline at end of file
+ revision: ${_param:salt_master_environment_revision}
diff --git a/salt/master/formula/git/saltstack.yml b/salt/master/formula/git/saltstack.yml
index ebcf96f..fde03ef 100644
--- a/salt/master/formula/git/saltstack.yml
+++ b/salt/master/formula/git/saltstack.yml
@@ -39,10 +39,21 @@
source: git
address: '${_param:salt_master_environment_repository}/salt-formula-reclass.git'
revision: ${_param:salt_master_environment_revision}
+ module:
+ reclass.py:
+ enabled: true
+ state:
+ reclass.py:
+ enabled: true
salt:
source: git
address: '${_param:salt_master_environment_repository}/salt-formula-salt.git'
revision: ${_param:salt_master_environment_revision}
+ module:
+ seedng.py:
+ enabled: true
+ virtng.py:
+ enabled: true
sphinx:
source: git
address: '${_param:salt_master_environment_repository}/salt-formula-sphinx.git'
diff --git a/salt/master/formula/pkg/ceph.yml b/salt/master/formula/pkg/ceph.yml
new file mode 100644
index 0000000..461f5c5
--- /dev/null
+++ b/salt/master/formula/pkg/ceph.yml
@@ -0,0 +1,9 @@
+parameters:
+ salt:
+ master:
+ environment:
+ prd:
+ formula:
+ ceph:
+ source: pkg
+ name: salt-formula-ceph
diff --git a/salt/master/formula/pkg/helm.yml b/salt/master/formula/pkg/helm.yml
new file mode 100644
index 0000000..8b68bfe
--- /dev/null
+++ b/salt/master/formula/pkg/helm.yml
@@ -0,0 +1,9 @@
+parameters:
+ salt:
+ master:
+ environment:
+ prd:
+ formula:
+ helm:
+ source: pkg
+ name: salt-formula-helm
diff --git a/salt/master/formula/pkg/kubernetes.yml b/salt/master/formula/pkg/kubernetes.yml
index 7b3af30..d442ab0 100644
--- a/salt/master/formula/pkg/kubernetes.yml
+++ b/salt/master/formula/pkg/kubernetes.yml
@@ -10,9 +10,6 @@
etcd:
source: pkg
name: salt-formula-etcd
- bird:
- source: pkg
- name: salt-formula-bird
docker:
source: pkg
- name: salt-formula-docker
\ No newline at end of file
+ name: salt-formula-docker
diff --git a/salt/master/git.yml b/salt/master/git.yml
index 267bdb1..7f09ed9 100644
--- a/salt/master/git.yml
+++ b/salt/master/git.yml
@@ -8,6 +8,8 @@
- system.salt.master.formula.git.saltstack
- system.salt.master.formula.git.stacklight
- system.salt.master.formula.git.monitoring
+- system.salt.master.formula.git.helm
+- system.salt.master.formula.git.ceph
parameters:
_param:
salt_master_environment_repository: "https://github.com/salt-formulas"
diff --git a/salt/master/pkg.yml b/salt/master/pkg.yml
index 1001d49..dba30d0 100644
--- a/salt/master/pkg.yml
+++ b/salt/master/pkg.yml
@@ -8,4 +8,6 @@
- system.salt.master.formula.pkg.saltstack
- system.salt.master.formula.pkg.stacklight
- system.salt.master.formula.pkg.monitoring
+- system.salt.master.formula.pkg.helm
+- system.salt.master.formula.pkg.ceph
- system.linux.system.repo.mcp.salt
diff --git a/salt/minion/ca/octavia_ca.yml b/salt/minion/ca/octavia_ca.yml
index ac66bec..453c450 100644
--- a/salt/minion/ca/octavia_ca.yml
+++ b/salt/minion/ca/octavia_ca.yml
@@ -27,3 +27,7 @@
days_valid:
authority: ${_param:octavia_ca_days_valid_authority}
certificate: ${_param:octavia_ca_days_valid_certificate}
+ ca_file: ${octavia:manager:certificates:ca_certificate}
+ ca_key_file: ${octavia:manager:certificates:ca_private_key}
+ user: octavia
+ group: octavia
diff --git a/salt/minion/cert/etcd_client_single.yml b/salt/minion/cert/etcd_client_single.yml
new file mode 100644
index 0000000..a14e106
--- /dev/null
+++ b/salt/minion/cert/etcd_client_single.yml
@@ -0,0 +1,18 @@
+parameters:
+ salt:
+ minion:
+ cert:
+ etcd_client:
+ host: ${_param:salt_minion_ca_host}
+ authority: ${_param:salt_minion_ca_authority}
+ common_name: ${linux:system:name}
+ signing_policy: cert_open
+ alternative_names: DNS:${linux:system:name},DNS:${linux:network:fqdn}
+ extended_key_usage: clientAuth
+ key_usage: "digitalSignature,nonRepudiation,keyEncipherment"
+ key_file: /var/lib/etcd/etcd-client.key
+ cert_file: /var/lib/etcd/etcd-client.crt
+ all_file: /var/lib/etcd/etcd-client.pem
+ ca_file: /var/lib/etcd/ca.pem
+ user: etcd
+ group: etcd
diff --git a/salt/minion/cert/etcd_server_single.yml b/salt/minion/cert/etcd_server_single.yml
new file mode 100644
index 0000000..f9fc585
--- /dev/null
+++ b/salt/minion/cert/etcd_server_single.yml
@@ -0,0 +1,18 @@
+parameters:
+ salt:
+ minion:
+ cert:
+ etcd_server:
+ host: ${_param:salt_minion_ca_host}
+ authority: ${_param:salt_minion_ca_authority}
+ common_name: ${linux:system:name}
+ signing_policy: cert_open
+ alternative_names: IP:127.0.0.1,DNS:${linux:system:name},DNS:${linux:network:fqdn}
+ extended_key_usage: serverAuth,clientAuth
+ key_usage: "digitalSignature,nonRepudiation,keyEncipherment"
+ key_file: /var/lib/etcd/etcd-server.key
+ cert_file: /var/lib/etcd/etcd-server.crt
+ all_file: /var/lib/etcd/etcd-server.pem
+ ca_file: /var/lib/etcd/ca.pem
+ user: etcd
+ group: etcd
diff --git a/salt/minion/cert/octavia/amphora_client.yml b/salt/minion/cert/octavia/amphora_client.yml
new file mode 100644
index 0000000..fd8f465
--- /dev/null
+++ b/salt/minion/cert/octavia/amphora_client.yml
@@ -0,0 +1,12 @@
+classes:
+- system.salt.minion.cert.octavia
+parameters:
+ salt:
+ minion:
+ cert:
+ octavia_amp_client:
+ ca_file: ${octavia:manager:certificates:ca_certificate}
+ ca_key_file: ${octavia:manager:certificates:ca_private_key}
+ key_file: ${octavia:manager:haproxy_amphora:client_cert_key}
+ cert_file: ${octavia:manager:haproxy_amphora:client_cert}
+ all_file: ${octavia:manager:haproxy_amphora:client_cert_all}
diff --git a/salt/minion/cert/octavia_amp_client.yml b/salt/minion/cert/octavia/init.yml
similarity index 60%
rename from salt/minion/cert/octavia_amp_client.yml
rename to salt/minion/cert/octavia/init.yml
index 5219450..25d3ee4 100644
--- a/salt/minion/cert/octavia_amp_client.yml
+++ b/salt/minion/cert/octavia/init.yml
@@ -12,10 +12,5 @@
common_name: octavia_amp_client
signing_policy: cert_open
key_usage: "digitalSignature,nonRepudiation,keyEncipherment"
- ca_file: ${octavia:manager:certificates:ca_certificate}
- ca_key_file: ${octavia:manager:certificates:ca_private_key}
- key_file: ${octavia:manager:haproxy_amphora:client_cert_key}
- cert_file: ${octavia:manager:haproxy_amphora:client_cert}
- all_file: ${octavia:manager:haproxy_amphora:client_cert_all}
user: octavia
group: octavia
diff --git a/salt/minion/cert/opencontrail/tor.yml b/salt/minion/cert/opencontrail/tor.yml
new file mode 100644
index 0000000..eb9c704
--- /dev/null
+++ b/salt/minion/cert/opencontrail/tor.yml
@@ -0,0 +1,14 @@
+parameters:
+ _param:
+ salt_minion_ca_authority: salt_master_ca
+ salt:
+ minion:
+ cert:
+ opencontrail_tor:
+ host: ${_param:salt_minion_ca_host}
+ authority: ${_param:salt_minion_ca_authority}
+ common_name: opencontrail_tor
+ key_file: /etc/contrail/ssl/certs/tor.key
+ cert_file: /etc/contrail/ssl/certs/tor.crt
+ ca_file: /etc/contrail/ssl/certs/ca.crt
+ signing_policy: cert_open
diff --git a/salt/minion/cert/prometheus_server.yml b/salt/minion/cert/prometheus_server.yml
index 30a0711..154009b 100644
--- a/salt/minion/cert/prometheus_server.yml
+++ b/salt/minion/cert/prometheus_server.yml
@@ -9,5 +9,4 @@
cert_file: ${prometheus:server:dir:config}/prometheus-server.crt
common_name: prometheus-server
signing_policy: cert_client
- alternative_names: IP:${_param:cluster_vip_address},IP:${_param:cluster_node01_address},IP:${_param:cluster_node02_address},IP:${_param:cluster_node03_address},IP:${_param:kubernetes_internal_api_address}
mode: '0444'
diff --git a/salt/minion/cert/salt_api.yml b/salt/minion/cert/salt_api.yml
new file mode 100644
index 0000000..acd9bba
--- /dev/null
+++ b/salt/minion/cert/salt_api.yml
@@ -0,0 +1,11 @@
+parameters:
+ salt:
+ minion:
+ cert:
+ salt_api:
+ host: ${_param:salt_minion_ca_host}
+ authority: ${_param:salt_minion_ca_authority}
+ common_name: salt_api
+ signing_policy: cert_server
+ alternative_names: IP:${_param:salt_master_host},IP:127.0.0.1,DNS:${_param:infra_config_hostname}.${_param:cluster_domain}
+ mode: '0644'