Merge "Remove obsolete logging section"
diff --git a/.releasenotes/notes/dop-proxy-2427ec3814c4b467.yaml b/.releasenotes/notes/dop-proxy-2427ec3814c4b467.yaml
new file mode 100644
index 0000000..9ce4d3b
--- /dev/null
+++ b/.releasenotes/notes/dop-proxy-2427ec3814c4b467.yaml
@@ -0,0 +1,15 @@
+---
+prelude: >
+ Default proxy configuration for Devops Portal Dasboard and Rundeck Service added
+features:
+ - |
+ In case of using OSS through proxy configurations,
+ need to define following classes for proxy nodes on cluster level 'cluster_name/stacklight/proxy.yml' or 'cluster_name/openstack/proxy.yml':
+
+ .. code-block:: yaml
+ - system.nginx.server.proxy.oss.devops_portal
+ - system.nginx.server.proxy.oss.rundeck
+
+fixes:
+ - |
+ https://mirantis.jira.com/browse/PROD-14376
diff --git a/.releasenotes/notes/new-classes-es-kibana-59e86910979d52a4.yaml b/.releasenotes/notes/new-classes-es-kibana-59e86910979d52a4.yaml
new file mode 100644
index 0000000..d6e2ecd
--- /dev/null
+++ b/.releasenotes/notes/new-classes-es-kibana-59e86910979d52a4.yaml
@@ -0,0 +1,21 @@
+---
+summary: >
+ Added two new classes for Elasticsearch and Kibana
+
+features:
+ - |
+ Added two new classes to support Elasticsearch v2 and v5 and Kibana
+ v4 and v5.
+ Update the Elasticsearch and Kibana classes in the
+ ``classes/cluster/<cluster_name>/stacklight/server.yml`` file of
+ the Reclass model of your MCP deployment according to the required
+ versions:
+
+ #. For Elasticsearch, change the ``linux.system.repo.elasticsearch`` class
+ to ``linux.system.repo.elasticsearch.2`` or ``linux.system.repo.elasticsearch.5``.
+ To deploy Elasticsearch version 2, specify the ``elasticsearch_version: 2``
+ parameter in the same file.
+ #. For Kibana, change the ``linux.system.repo.kibana`` class to
+ ``linux.system.repo.kibana.4`` or ``linux.system.repo.kibana.5``.
+ To deploy Kibana version 4, specify the ``kibana_version: 4``
+ parameter in the same file.
diff --git a/.releasenotes/notes/prometheus-2.0-2a7b3bc4ad76e118.yaml b/.releasenotes/notes/prometheus-2.0-2a7b3bc4ad76e118.yaml
new file mode 100644
index 0000000..af017f5
--- /dev/null
+++ b/.releasenotes/notes/prometheus-2.0-2a7b3bc4ad76e118.yaml
@@ -0,0 +1,48 @@
+---
+summary: >
+ Updated the StackLight components to newer versions
+
+upgrade:
+ - |
+ Updated the following StackLight components:
+
+ - Prometheus server to version 2.0.0
+ - Alertmanager to version 0.11.0
+ - Pushgateway to version 0.4.0
+
+ .. important::
+
+ The new version of Prometheus is not backward compatible
+ with previous versions. Therefore, you must upgrade the
+ monitoring stack as described in the MCP Operations Guide.
+
+ To continue using Prometheus v1.7, add the following snippet
+ to the Reclass model of your MCP deployment. However, Mirantis
+ recommends that you update your monitoring stack to obtain new
+ features such as performance improvements.
+
+
+ .. code-block:: yaml
+
+ _param:
+ docker_image_alertmanager: docker-prod-virtual.docker.mirantis.net/openstack-docker/alertmanager:20171222124606
+ docker_image_pushgateway: docker-prod-virtual.docker.mirantis.net/openstack-docker/pushgateway:20171222124606
+ docker_image_prometheus: docker-prod-virtual.docker.mirantis.net/openstack-docker/prometheus:20171222124606
+ docker_image_remote_storage_adapter: docker-prod-virtual.docker.mirantis.net/openstack-docker/remote_storage_adapter:20171222124606
+ docker:
+ client:
+ stack:
+ monitoring:
+ service:
+ server:
+ environment:
+ PROMETHEUS_STORAGE_LOCAL_ENGINE: persisted
+ PROMETHEUS_STORAGE_LOCAL_TARGET_HEAP_SIZE: 3221225472
+ PROMETHEUS_STORAGE_LOCAL_NUM_FINGERPRINT_MUTEXES: 4096
+
+ prometheus:
+ server:
+ version: 1.7
+
+
+ .. TODO: Add a link to the upgrade procedure.
diff --git a/.releasenotes/notes/psql-issues-16cb5e030ef7dac5.yaml b/.releasenotes/notes/psql-issues-16cb5e030ef7dac5.yaml
index 7c1c805..9d0410e 100644
--- a/.releasenotes/notes/psql-issues-16cb5e030ef7dac5.yaml
+++ b/.releasenotes/notes/psql-issues-16cb5e030ef7dac5.yaml
@@ -1,10 +1,14 @@
---
summary: >
- Configure Rundeck datasource through salt metadata.
+ Enabled the Runbooks automation service to use an external datasource
features:
- |
- Rundeck service support using postgresql database as external source for datastore.
-
- .. code-block:: text
- Default configuration supports PostgresqlDB driver, pointed on OSS Postgresql stack and disabled.
+ Enabled the Runbooks automation service to use an external datasource.
+ Now, you can configure the service to use the PostgreSQL database as an
+ external source for the datastore.
+
+ .. seealso::
+
+ * `MCP Operations Guide: Configure an external datasource <https://docs.mirantis.com/mcp/latest/mcp-operations-guide/devops-portal/use-runbooks-automation/configure-rundeck/configure-external-datasource.html>`__
+
diff --git a/.releasenotes/notes/raise-telegraf-version-a3e797a577b7e555.yaml b/.releasenotes/notes/raise-telegraf-version-a3e797a577b7e555.yaml
new file mode 100644
index 0000000..129681a
--- /dev/null
+++ b/.releasenotes/notes/raise-telegraf-version-a3e797a577b7e555.yaml
@@ -0,0 +1,9 @@
+---
+summary: >
+ Updated Telegraf to version 1.5
+
+upgrades:
+ - |
+ Changed the branch for building of the Telegraf package from v1.2 to
+ v1.5. The new branch includes the upstream release 1.5 branch and all
+ downstream improvements. By default, Telegraf v1.5 is installed.
diff --git a/.releasenotes/notes/rundeck-iframe-7b50b9185b0b27a5.yaml b/.releasenotes/notes/rundeck-iframe-7b50b9185b0b27a5.yaml
index 6cac0a7..3f67dd4 100644
--- a/.releasenotes/notes/rundeck-iframe-7b50b9185b0b27a5.yaml
+++ b/.releasenotes/notes/rundeck-iframe-7b50b9185b0b27a5.yaml
@@ -1,18 +1,18 @@
---
summary:
- - |
- Forward Rundeck main page through Proxy configurations. Default Rundeck service configuration does not allow to get access through external-proxy-address and exposed rundeck port (by default: 14440).
- In case of using Devops Portal through external proxy networks, need to define additional configuration, otherwise Rundeck tab will be unavailable.
+ - Added the possibility to configure iFrame forwarding for the Runbooks
+ Automation service
features:
- |
- * Need to define following configuration on cluster level, then follow instructions in OPS guide:
+ Added the possibility to configure iFrame forwarding for the Runbooks
+ Automation service. By default, the Rundeck service configuration does not
+ enable you to get access through an external proxy address and exposed
+ Rundeck port, which is 14440 by default. Now, you can easily forward the
+ Runbooks dashboard through a proxy endpoint in case of using the Devops
+ Portal through external proxy networks.
- .. code-block:: yaml
- rundeck_forward_iframe: True
- rundeck_iframe_host: "external-proxy-endpoint"
- rundeck_iframe_port: "external-proxy-port"
- rundeck_iframe_ssl: False
+ .. seealso::
-fixes:
- - https://mirantis.jira.com/browse/PROD-16157
+ * `MCP Operations Guide: Configure iFrame forwarding <https://docs.mirantis.com/mcp/latest/mcp-operations-guide/devops-portal/use-runbooks-automation/configure-rundeck/configure-iframe-forwarding.html>`__
+
diff --git a/.releasenotes/notes/switch-es-kibana-to-5-3ef55164a574e066.yaml b/.releasenotes/notes/switch-es-kibana-to-5-3ef55164a574e066.yaml
new file mode 100644
index 0000000..86692c7
--- /dev/null
+++ b/.releasenotes/notes/switch-es-kibana-to-5-3ef55164a574e066.yaml
@@ -0,0 +1,19 @@
+---
+summary: >
+ Updated Elasticsearch and Kibana to versions 5
+
+features:
+ - |
+ Updated Elasticsearch and Kibana to v5. Elasticsearch and Kibana v5
+ are now installed by default.
+
+ To upgrade existing Elasticsearch and Kibana installations to v5,
+ follow the procedures described in the MCP Operations Guide.
+
+ .. TODO: add a link to the upgrade procedure.
+
+ Kibana versions prior to 5.6.x are incompatible with Elasticsearch
+ 5.x. Therefore, once you upgrade Elasticsearch to v5, you must also
+ upgrade Kibana to v5 as described in the MCP Operations Guide.
+
+ .. TODO: add a link to the upgrade procedure.
diff --git a/aptly/server/mirror/debian/elasticsearch5.yml b/aptly/server/mirror/debian/elasticsearch5.yml
new file mode 100644
index 0000000..75368ba
--- /dev/null
+++ b/aptly/server/mirror/debian/elasticsearch5.yml
@@ -0,0 +1,46 @@
+parameters:
+ _param:
+ aptly_mirror_elasticsearch-5x_source: https://artifacts.elastic.co/packages/5.x/apt
+ aptly_mirror_elasticsearch-5x_distribution: stable
+ aptly_mirror_elasticsearch-5x_components: main
+ aptly_mirror_elasticsearch-5x_gpgkeys:
+ - D88E42B4
+ aptly_mirror_elasticsearch-curator-5x_source: https://packages.elastic.co/curator/5/debian
+ aptly_mirror_elasticsearch-curator-5x_distribution: stable
+ aptly_mirror_elasticsearch-curator-5x_components: main
+ aptly:
+ server:
+ mirror:
+ elasticsearch-5x:
+ source: ${_param:mirror_elasticsearch-5x_source}
+ distribution: ${_param:mirror_elasticsearch-5x_distribution}
+ components: ${_param:mirror_elasticsearch-5x_components}
+ architectures: amd64
+ gpgkeys: ${_param:mirror_elasticsearch-5x_gpgkeys}
+ publisher:
+ component: elastic
+ distributions:
+ - trusty/${_param:apt_mk_version}
+ - xenial/${_param:apt_mk_version}
+ kibana-5x:
+ source: ${_param:aptly_mirror_elasticsearch-5x_source}
+ distribution: ${_param:aptly_mirror_elasticsearch-5x_distribution}
+ components: ${_param:aptly_mirror_elasticsearch-5x_components}
+ architectures: amd64
+ gpgkeys: ${_param:aptly_mirror_elasticsearch-5x_gpgkeys}
+ publisher:
+ component: elastic
+ distributions:
+ - trusty/${_param:apt_mk_version}
+ - xenial/${_param:apt_mk_version}
+ elasticsearch-curator-5x:
+ source: ${_param:aptly_mirror_elasticsearch-curator-5x_source}
+ distribution: ${_param:aptly_mirror_elasticsearch-curator-5x_distribution}
+ components: ${_param:aptly_mirror_elasticsearch-curator-5x_components}
+ architectures: amd64
+ gpgkeys: ${_param:aptly_mirror_elasticsearch-5x_gpgkeys}
+ publisher:
+ component: elastic
+ distributions:
+ - trusty/${_param:apt_mk_version}
+ - xenial/${_param:apt_mk_version}
diff --git a/aptly/server/mirror/ubuntu/trusty/mcp/apt_mk/cassandra.yml b/aptly/server/mirror/ubuntu/trusty/mcp/apt_mk/cassandra.yml
new file mode 100644
index 0000000..938fc7b
--- /dev/null
+++ b/aptly/server/mirror/ubuntu/trusty/mcp/apt_mk/cassandra.yml
@@ -0,0 +1,23 @@
+parameters:
+ _param:
+ apt_mk_version: stable
+ mirror_mirantis_openstack_trusty_cassandra_source: http://apt.mirantis.com/trusty/cassandra/
+ mirror_mirantis_openstack_trusty_cassandra_distribution: ${_param:apt_mk_version}
+ mirror_mirantis_openstack_trusty_cassandra_components: 21x
+ mirror_mirantis_openstack_trusty_cassandra_key_url: "http://apt.mirantis.com/public.gpg"
+ mirror_mirantis_openstack_trusty_cassandra_gpgkeys:
+ - A76882D3
+ aptly:
+ server:
+ mirror:
+ mirantis_openstack_trusty_cassandra:
+ source: ${_param:mirror_mirantis_openstack_trusty_cassandra_source}
+ distribution: ${_param:mirror_mirantis_openstack_trusty_cassandra_distribution}
+ components: ${_param:mirror_mirantis_openstack_trusty_cassandra_components}
+ architectures: amd64
+ key_url: ${_param:mirror_mirantis_openstack_trusty_cassandra_key_url}
+ gpgkeys: ${_param:mirror_mirantis_openstack_trusty_cassandra_gpgkeys}
+ publisher:
+ component: ${_param:mirror_mirantis_openstack_trusty_cassandra_components}
+ distributions:
+ - ubuntu-trusty/cassandra/${_param:apt_mk_version}/
\ No newline at end of file
diff --git a/aptly/server/mirror/ubuntu/trusty/mcp/apt_mk/grafana.yml b/aptly/server/mirror/ubuntu/trusty/mcp/apt_mk/grafana.yml
new file mode 100644
index 0000000..197e58c
--- /dev/null
+++ b/aptly/server/mirror/ubuntu/trusty/mcp/apt_mk/grafana.yml
@@ -0,0 +1,23 @@
+parameters:
+ _param:
+ apt_mk_version: stable
+ mirror_mirantis_openstack_trusty_grafana_source: http://apt.mirantis.com/trusty/grafana/
+ mirror_mirantis_openstack_trusty_grafana_distribution: ${_param:apt_mk_version}
+ mirror_mirantis_openstack_trusty_grafana_components: main
+ mirror_mirantis_openstack_trusty_grafana_key_url: "http://apt.mirantis.com/public.gpg"
+ mirror_mirantis_openstack_trusty_grafana_gpgkeys:
+ - A76882D3
+ aptly:
+ server:
+ mirror:
+ mirantis_openstack_trusty_grafana:
+ source: ${_param:mirror_mirantis_openstack_trusty_grafana_source}
+ distribution: ${_param:mirror_mirantis_openstack_trusty_grafana_distribution}
+ components: ${_param:mirror_mirantis_openstack_trusty_grafana_components}
+ architectures: amd64
+ key_url: ${_param:mirror_mirantis_openstack_trusty_grafana_key_url}
+ gpgkeys: ${_param:mirror_mirantis_openstack_trusty_grafana_gpgkeys}
+ publisher:
+ component: ${_param:mirror_mirantis_openstack_trusty_grafana_components}
+ distributions:
+ - ubuntu-trusty/grafana/${_param:apt_mk_version}
\ No newline at end of file
diff --git a/aptly/server/mirror/ubuntu/trusty/mcp/apt_mk/openstack/mitaka.yml b/aptly/server/mirror/ubuntu/trusty/mcp/apt_mk/openstack/mitaka.yml
new file mode 100644
index 0000000..556e1a3
--- /dev/null
+++ b/aptly/server/mirror/ubuntu/trusty/mcp/apt_mk/openstack/mitaka.yml
@@ -0,0 +1,103 @@
+parameters:
+ _param:
+ apt_mk_version: stable
+
+ mirror_mirantis_openstack_mitaka_trusty_source: http://apt.mirantis.com/trusty/openstack/mitaka/
+ mirror_mirantis_openstack_mitaka_trusty_distribution: ${_param:apt_mk_version}
+ mirror_mirantis_openstack_mitaka_trusty_components: main restricted
+ mirror_mirantis_openstack_mitaka_trusty_key_url: "http://apt.mirantis.com/public.gpg"
+ mirror_mirantis_openstack_mitaka_trusty_gpgkeys:
+ - A76882D3
+
+ mirror_mirantis_openstack_mitaka_hotfix_trusty_source: http://apt.mirantis.com/trusty/openstack/mitaka/hotfix/
+ mirror_mirantis_openstack_mitaka_hotfix_trusty_distribution: ${_param:apt_mk_version}
+ mirror_mirantis_openstack_mitaka_hotfix_trusty_components: main restricted
+ mirror_mirantis_openstack_mitaka_hotfix_trusty_key_url: "http://apt.mirantis.com/public.gpg"
+ mirror_mirantis_openstack_mitaka_hotfix_trusty_gpgkeys:
+ - A76882D3
+
+ mirror_mirantis_openstack_mitaka_security_trusty_source: http://apt.mirantis.com/trusty/openstack/mitaka/security/
+ mirror_mirantis_openstack_mitaka_security_trusty_distribution: ${_param:apt_mk_version}
+ mirror_mirantis_openstack_mitaka_security_trusty_components: main restricted
+ mirror_mirantis_openstack_mitaka_security_trusty_key_url: "http://apt.mirantis.com/public.gpg"
+ mirror_mirantis_openstack_mitaka_security_trusty_gpgkeys:
+ - A76882D3
+
+ mirror_mirantis_openstack_mitaka_updates_trusty_source: http://apt.mirantis.com/trusty/openstack/mitaka/updates/
+ mirror_mirantis_openstack_mitaka_updates_trusty_distribution: ${_param:apt_mk_version}
+ mirror_mirantis_openstack_mitaka_updates_trusty_components: main restricted
+ mirror_mirantis_openstack_mitaka_updates_trusty_key_url: "http://apt.mirantis.com/public.gpg"
+ mirror_mirantis_openstack_mitaka_updates_trusty_gpgkeys:
+ - A76882D3
+
+ mirror_mirantis_openstack_mitaka_holdback_trusty_source: http://apt.mirantis.com/trusty/openstack/mitaka/holdback/
+ mirror_mirantis_openstack_mitaka_holdback_trusty_distribution: ${_param:apt_mk_version}
+ mirror_mirantis_openstack_mitaka_holdback_trusty_components: main restricted
+ mirror_mirantis_openstack_mitaka_holdback_trusty_key_url: "http://apt.mirantis.com/public.gpg"
+ mirror_mirantis_openstack_mitaka_holdback_trusty_gpgkeys:
+ - A76882D3
+ aptly:
+ server:
+ mirror:
+ mirantis_openstack_mitaka_trusty:
+ source: ${_param:mirror_mirantis_openstack_mitaka_trusty_source}
+ distribution: ${_param:mirror_mirantis_openstack_mitaka_trusty_distribution}
+ components: ${_param:mirror_mirantis_openstack_mitaka_trusty_components}
+ architectures: amd64
+ key_url: ${_param:mirror_mirantis_openstack_mitaka_trusty_key_url}
+ gpgkeys: ${_param:mirror_mirantis_openstack_mitaka_trusty_gpgkeys}
+ publisher:
+ component: main
+ distributions:
+ - ubuntu-trusty/openstack/mitaka/${_param:apt_mk_version}
+
+ mirantis_openstack_mitaka_hotfix_trusty:
+ source: ${_param:mirror_mirantis_openstack_mitaka_hotfix_trusty_source}
+ distribution: ${_param:mirror_mirantis_openstack_mitaka_hotfix_trusty_distribution}
+ components: ${_param:mirror_mirantis_openstack_mitaka_hotfix_trusty_components}
+ architectures: amd64
+ key_url: ${_param:mirror_mirantis_openstack_mitaka_hotfix_trusty_key_url}
+ gpgkeys: ${_param:mirror_mirantis_openstack_mitaka_hotfix_trusty_gpgkeys}
+ publisher:
+ component: main
+ distributions:
+ - ubuntu-trusty/openstack/mitaka/hotfix/${_param:apt_mk_version}
+
+ mirantis_openstack_mitaka_security_trusty:
+ source: ${_param:mirror_mirantis_openstack_mitaka_security_trusty_source}
+ distribution: ${_param:mirror_mirantis_openstack_mitaka_security_trusty_distribution}
+ components: ${_param:mirror_mirantis_openstack_mitaka_security_trusty_components}
+ architectures: amd64
+ key_url: ${_param:mirror_mirantis_openstack_mitaka_security_trusty_key_url}
+ gpgkeys: ${_param:mirror_mirantis_openstack_mitaka_security_trusty_gpgkeys}
+ publisher:
+ component: main
+ distributions:
+ - ubuntu-trusty/openstack/mitaka/security/${_param:apt_mk_version}
+
+ # required for alternative horizon plugins/etc..
+ mirantis_openstack_mitaka_updates_trusty:
+ source: ${_param:mirror_mirantis_openstack_mitaka_updates_trusty_source}
+ distribution: ${_param:mirror_mirantis_openstack_mitaka_updates_trusty_distribution}
+ components: ${_param:mirror_mirantis_openstack_mitaka_updates_trusty_components}
+ architectures: amd64
+ key_url: ${_param:mirror_mirantis_openstack_mitaka_updates_trusty_key_url}
+ gpgkeys: ${_param:mirror_mirantis_openstack_mitaka_updates_trusty_gpgkeys}
+ publisher:
+ component: main
+ distributions:
+ - ubuntu-trusty/openstack/mitaka/updates/${_param:apt_mk_version}
+
+ # required for salt formulas
+ mirantis_openstack_mitaka_holdback_trusty:
+ source: ${_param:mirror_mirantis_openstack_mitaka_holdback_trusty_source}
+ distribution: ${_param:mirror_mirantis_openstack_mitaka_holdback_trusty_distribution}
+ components: ${_param:mirror_mirantis_openstack_mitaka_holdback_trusty_components}
+ architectures: amd64
+ key_url: ${_param:mirror_mirantis_openstack_mitaka_holdback_trusty_key_url}
+ gpgkeys: ${_param:mirror_mirantis_openstack_mitaka_holdback_trusty_gpgkeys}
+ publisher:
+ component: main
+ distributions:
+ - ubuntu-trusty/openstack/mitaka/holdback/${_param:apt_mk_version}
+
diff --git a/aptly/server/mirror/ubuntu/trusty/mcp/apt_mk/openstack/newton.yml b/aptly/server/mirror/ubuntu/trusty/mcp/apt_mk/openstack/newton.yml
new file mode 100644
index 0000000..ad867c3
--- /dev/null
+++ b/aptly/server/mirror/ubuntu/trusty/mcp/apt_mk/openstack/newton.yml
@@ -0,0 +1,103 @@
+parameters:
+ _param:
+ apt_mk_version: stable
+
+ mirror_mirantis_openstack_newton_trusty_source: http://apt.mirantis.com/trusty/openstack/newton/
+ mirror_mirantis_openstack_newton_trusty_distribution: ${_param:apt_mk_version}
+ mirror_mirantis_openstack_newton_trusty_components: main restricted
+ mirror_mirantis_openstack_newton_trusty_key_url: "http://apt.mirantis.com/public.gpg"
+ mirror_mirantis_openstack_newton_trusty_gpgkeys:
+ - A76882D3
+
+ mirror_mirantis_openstack_newton_hotfix_trusty_source: http://apt.mirantis.com/trusty/openstack/newton/hotfix/
+ mirror_mirantis_openstack_newton_hotfix_trusty_distribution: ${_param:apt_mk_version}
+ mirror_mirantis_openstack_newton_hotfix_trusty_components: main restricted
+ mirror_mirantis_openstack_newton_hotfix_trusty_key_url: "http://apt.mirantis.com/public.gpg"
+ mirror_mirantis_openstack_newton_hotfix_trusty_gpgkeys:
+ - A76882D3
+
+ mirror_mirantis_openstack_newton_security_trusty_source: http://apt.mirantis.com/trusty/openstack/newton/security/
+ mirror_mirantis_openstack_newton_security_trusty_distribution: ${_param:apt_mk_version}
+ mirror_mirantis_openstack_newton_security_trusty_components: main restricted
+ mirror_mirantis_openstack_newton_security_trusty_key_url: "http://apt.mirantis.com/public.gpg"
+ mirror_mirantis_openstack_newton_security_trusty_gpgkeys:
+ - A76882D3
+
+ mirror_mirantis_openstack_newton_updates_trusty_source: http://apt.mirantis.com/trusty/openstack/newton/updates/
+ mirror_mirantis_openstack_newton_updates_trusty_distribution: ${_param:apt_mk_version}
+ mirror_mirantis_openstack_newton_updates_trusty_components: main restricted
+ mirror_mirantis_openstack_newton_updates_trusty_key_url: "http://apt.mirantis.com/public.gpg"
+ mirror_mirantis_openstack_newton_updates_trusty_gpgkeys:
+ - A76882D3
+
+ mirror_mirantis_openstack_newton_holdback_trusty_source: http://apt.mirantis.com/trusty/openstack/newton/holdback/
+ mirror_mirantis_openstack_newton_holdback_trusty_distribution: ${_param:apt_mk_version}
+ mirror_mirantis_openstack_newton_holdback_trusty_components: main restricted
+ mirror_mirantis_openstack_newton_holdback_trusty_key_url: "http://apt.mirantis.com/public.gpg"
+ mirror_mirantis_openstack_newton_holdback_trusty_gpgkeys:
+ - A76882D3
+ aptly:
+ server:
+ mirror:
+ mirantis_openstack_newton_trusty:
+ source: ${_param:mirror_mirantis_openstack_newton_trusty_source}
+ distribution: ${_param:mirror_mirantis_openstack_newton_trusty_distribution}
+ components: ${_param:mirror_mirantis_openstack_newton_trusty_components}
+ architectures: amd64
+ key_url: ${_param:mirror_mirantis_openstack_newton_trusty_key_url}
+ gpgkeys: ${_param:mirror_mirantis_openstack_newton_trusty_gpgkeys}
+ publisher:
+ component: main
+ distributions:
+ - ubuntu-trusty/openstack/newton/${_param:apt_mk_version}
+
+ mirantis_openstack_newton_hotfix_trusty:
+ source: ${_param:mirror_mirantis_openstack_newton_hotfix_trusty_source}
+ distribution: ${_param:mirror_mirantis_openstack_newton_hotfix_trusty_distribution}
+ components: ${_param:mirror_mirantis_openstack_newton_hotfix_trusty_components}
+ architectures: amd64
+ key_url: ${_param:mirror_mirantis_openstack_newton_hotfix_trusty_key_url}
+ gpgkeys: ${_param:mirror_mirantis_openstack_newton_hotfix_trusty_gpgkeys}
+ publisher:
+ component: main
+ distributions:
+ - ubuntu-trusty/openstack/newton/hotfix/${_param:apt_mk_version}
+
+ mirantis_openstack_newton_security_trusty:
+ source: ${_param:mirror_mirantis_openstack_newton_security_trusty_source}
+ distribution: ${_param:mirror_mirantis_openstack_newton_security_trusty_distribution}
+ components: ${_param:mirror_mirantis_openstack_newton_security_trusty_components}
+ architectures: amd64
+ key_url: ${_param:mirror_mirantis_openstack_newton_security_trusty_key_url}
+ gpgkeys: ${_param:mirror_mirantis_openstack_newton_security_trusty_gpgkeys}
+ publisher:
+ component: main
+ distributions:
+ - ubuntu-trusty/openstack/newton/security/${_param:apt_mk_version}
+
+ # required for alternative horizon plugins/etc..
+ mirantis_openstack_newton_updates_trusty:
+ source: ${_param:mirror_mirantis_openstack_newton_updates_trusty_source}
+ distribution: ${_param:mirror_mirantis_openstack_newton_updates_trusty_distribution}
+ components: ${_param:mirror_mirantis_openstack_newton_updates_trusty_components}
+ architectures: amd64
+ key_url: ${_param:mirror_mirantis_openstack_newton_updates_trusty_key_url}
+ gpgkeys: ${_param:mirror_mirantis_openstack_newton_updates_trusty_gpgkeys}
+ publisher:
+ component: main
+ distributions:
+ - ubuntu-trusty/openstack/newton/updates/${_param:apt_mk_version}
+
+ # required for salt formulas
+ mirantis_openstack_newton_holdback_trusty:
+ source: ${_param:mirror_mirantis_openstack_newton_holdback_trusty_source}
+ distribution: ${_param:mirror_mirantis_openstack_newton_holdback_trusty_distribution}
+ components: ${_param:mirror_mirantis_openstack_newton_holdback_trusty_components}
+ architectures: amd64
+ key_url: ${_param:mirror_mirantis_openstack_newton_holdback_trusty_key_url}
+ gpgkeys: ${_param:mirror_mirantis_openstack_newton_holdback_trusty_gpgkeys}
+ publisher:
+ component: main
+ distributions:
+ - ubuntu-trusty/openstack/newton/holdback/${_param:apt_mk_version}
+
diff --git a/aptly/server/mirror/ubuntu/trusty/mcp/apt_mk/openstack/ocata.yml b/aptly/server/mirror/ubuntu/trusty/mcp/apt_mk/openstack/ocata.yml
new file mode 100644
index 0000000..c01b864
--- /dev/null
+++ b/aptly/server/mirror/ubuntu/trusty/mcp/apt_mk/openstack/ocata.yml
@@ -0,0 +1,103 @@
+parameters:
+ _param:
+ apt_mk_version: stable
+
+ mirror_mirantis_openstack_ocata_trusty_source: http://apt.mirantis.com/trusty/openstack/ocata/
+ mirror_mirantis_openstack_ocata_trusty_distribution: ${_param:apt_mk_version}
+ mirror_mirantis_openstack_ocata_trusty_components: main restricted
+ mirror_mirantis_openstack_ocata_trusty_key_url: "http://apt.mirantis.com/public.gpg"
+ mirror_mirantis_openstack_ocata_trusty_gpgkeys:
+ - A76882D3
+
+ mirror_mirantis_openstack_ocata_hotfix_trusty_source: http://apt.mirantis.com/trusty/openstack/ocata/hotfix/
+ mirror_mirantis_openstack_ocata_hotfix_trusty_distribution: ${_param:apt_mk_version}
+ mirror_mirantis_openstack_ocata_hotfix_trusty_components: main restricted
+ mirror_mirantis_openstack_ocata_hotfix_trusty_key_url: "http://apt.mirantis.com/public.gpg"
+ mirror_mirantis_openstack_ocata_hotfix_trusty_gpgkeys:
+ - A76882D3
+
+ mirror_mirantis_openstack_ocata_security_trusty_source: http://apt.mirantis.com/trusty/openstack/ocata/security/
+ mirror_mirantis_openstack_ocata_security_trusty_distribution: ${_param:apt_mk_version}
+ mirror_mirantis_openstack_ocata_security_trusty_components: main restricted
+ mirror_mirantis_openstack_ocata_security_trusty_key_url: "http://apt.mirantis.com/public.gpg"
+ mirror_mirantis_openstack_ocata_security_trusty_gpgkeys:
+ - A76882D3
+
+ mirror_mirantis_openstack_ocata_updates_trusty_source: http://apt.mirantis.com/trusty/openstack/ocata/updates/
+ mirror_mirantis_openstack_ocata_updates_trusty_distribution: ${_param:apt_mk_version}
+ mirror_mirantis_openstack_ocata_updates_trusty_components: main restricted
+ mirror_mirantis_openstack_ocata_updates_trusty_key_url: "http://apt.mirantis.com/public.gpg"
+ mirror_mirantis_openstack_ocata_updates_trusty_gpgkeys:
+ - A76882D3
+
+ mirror_mirantis_openstack_ocata_holdback_trusty_source: http://apt.mirantis.com/trusty/openstack/ocata/holdback/
+ mirror_mirantis_openstack_ocata_holdback_trusty_distribution: ${_param:apt_mk_version}
+ mirror_mirantis_openstack_ocata_holdback_trusty_components: main restricted
+ mirror_mirantis_openstack_ocata_holdback_trusty_key_url: "http://apt.mirantis.com/public.gpg"
+ mirror_mirantis_openstack_ocata_holdback_trusty_gpgkeys:
+ - A76882D3
+ aptly:
+ server:
+ mirror:
+ mirantis_openstack_ocata_trusty:
+ source: ${_param:mirror_mirantis_openstack_ocata_trusty_source}
+ distribution: ${_param:mirror_mirantis_openstack_ocata_trusty_distribution}
+ components: ${_param:mirror_mirantis_openstack_ocata_trusty_components}
+ architectures: amd64
+ key_url: ${_param:mirror_mirantis_openstack_ocata_trusty_key_url}
+ gpgkeys: ${_param:mirror_mirantis_openstack_ocata_trusty_gpgkeys}
+ publisher:
+ component: main
+ distributions:
+ - ubuntu-trusty/openstack/ocata/${_param:apt_mk_version}
+
+ mirantis_openstack_ocata_hotfix_trusty:
+ source: ${_param:mirror_mirantis_openstack_ocata_hotfix_trusty_source}
+ distribution: ${_param:mirror_mirantis_openstack_ocata_hotfix_trusty_distribution}
+ components: ${_param:mirror_mirantis_openstack_ocata_hotfix_trusty_components}
+ architectures: amd64
+ key_url: ${_param:mirror_mirantis_openstack_ocata_hotfix_trusty_key_url}
+ gpgkeys: ${_param:mirror_mirantis_openstack_ocata_hotfix_trusty_gpgkeys}
+ publisher:
+ component: main
+ distributions:
+ - ubuntu-trusty/openstack/ocata/hotfix/${_param:apt_mk_version}
+
+ mirantis_openstack_ocata_security_trusty:
+ source: ${_param:mirror_mirantis_openstack_ocata_security_trusty_source}
+ distribution: ${_param:mirror_mirantis_openstack_ocata_security_trusty_distribution}
+ components: ${_param:mirror_mirantis_openstack_ocata_security_trusty_components}
+ architectures: amd64
+ key_url: ${_param:mirror_mirantis_openstack_ocata_security_trusty_key_url}
+ gpgkeys: ${_param:mirror_mirantis_openstack_ocata_security_trusty_gpgkeys}
+ publisher:
+ component: main
+ distributions:
+ - ubuntu-trusty/openstack/ocata/security/${_param:apt_mk_version}
+
+ # required for alternative horizon plugins/etc..
+ mirantis_openstack_ocata_updates_trusty:
+ source: ${_param:mirror_mirantis_openstack_ocata_updates_trusty_source}
+ distribution: ${_param:mirror_mirantis_openstack_ocata_updates_trusty_distribution}
+ components: ${_param:mirror_mirantis_openstack_ocata_updates_trusty_components}
+ architectures: amd64
+ key_url: ${_param:mirror_mirantis_openstack_ocata_updates_trusty_key_url}
+ gpgkeys: ${_param:mirror_mirantis_openstack_ocata_updates_trusty_gpgkeys}
+ publisher:
+ component: main
+ distributions:
+ - ubuntu-trusty/openstack/ocata/updates/${_param:apt_mk_version}
+
+ # required for salt formulas
+ mirantis_openstack_ocata_holdback_trusty:
+ source: ${_param:mirror_mirantis_openstack_ocata_holdback_trusty_source}
+ distribution: ${_param:mirror_mirantis_openstack_ocata_holdback_trusty_distribution}
+ components: ${_param:mirror_mirantis_openstack_ocata_holdback_trusty_components}
+ architectures: amd64
+ key_url: ${_param:mirror_mirantis_openstack_ocata_holdback_trusty_key_url}
+ gpgkeys: ${_param:mirror_mirantis_openstack_ocata_holdback_trusty_gpgkeys}
+ publisher:
+ component: main
+ distributions:
+ - ubuntu-trusty/openstack/ocata/holdback/${_param:apt_mk_version}
+
diff --git a/aptly/server/mirror/ubuntu/trusty/mcp/apt_mk/saltstack/init.yml b/aptly/server/mirror/ubuntu/trusty/mcp/apt_mk/saltstack/init.yml
new file mode 100644
index 0000000..8dfe2cd
--- /dev/null
+++ b/aptly/server/mirror/ubuntu/trusty/mcp/apt_mk/saltstack/init.yml
@@ -0,0 +1,3 @@
+classes:
+- system.aptly.server.mirror.ubuntu.trusty.mcp.apt_mk.saltstack.salt-2016-3
+- system.aptly.server.mirror.ubuntu.trusty.mcp.apt_mk.saltstack.salt-2017-7
\ No newline at end of file
diff --git a/aptly/server/mirror/ubuntu/trusty/mcp/apt_mk/saltstack/salt-2016-3.yml b/aptly/server/mirror/ubuntu/trusty/mcp/apt_mk/saltstack/salt-2016-3.yml
new file mode 100644
index 0000000..19b002a
--- /dev/null
+++ b/aptly/server/mirror/ubuntu/trusty/mcp/apt_mk/saltstack/salt-2016-3.yml
@@ -0,0 +1,23 @@
+parameters:
+ _param:
+ apt_mk_version: stable
+ mirror_mirantis_openstack_trusty_saltstack_2016_3_source: http://apt.mirantis.com/trusty/salt/2016.3/
+ mirror_mirantis_openstack_trusty_saltstack_2016_3_distribution: ${_param:apt_mk_version}
+ mirror_mirantis_openstack_trusty_saltstack_2016_3_components: main
+ mirror_mirantis_openstack_trusty_saltstack_2016_3_key_url: "http://apt.mirantis.com/public.gpg"
+ mirror_mirantis_openstack_trusty_saltstack_2016_3_gpgkeys:
+ - A76882D3
+ aptly:
+ server:
+ mirror:
+ mirantis_openstack_trusty_saltstack_2016_3:
+ source: ${_param:mirror_mirantis_openstack_trusty_saltstack_2016_3_source}
+ distribution: ${_param:mirror_mirantis_openstack_trusty_saltstack_2016_3_distribution}
+ components: ${_param:mirror_mirantis_openstack_trusty_saltstack_2016_3_components}
+ architectures: amd64
+ key_url: ${_param:mirror_mirantis_openstack_trusty_saltstack_2016_3_key_url}
+ gpgkeys: ${_param:mirror_mirantis_openstack_trusty_saltstack_2016_3_gpgkeys}
+ publisher:
+ component: ${_param:mirror_mirantis_openstack_trusty_saltstack_2016_3_components}
+ distributions:
+ - ubuntu-trusty/salt/2016.3/${_param:apt_mk_version}
\ No newline at end of file
diff --git a/aptly/server/mirror/ubuntu/trusty/mcp/apt_mk/saltstack/salt-2017-7.yml b/aptly/server/mirror/ubuntu/trusty/mcp/apt_mk/saltstack/salt-2017-7.yml
new file mode 100644
index 0000000..703d0bf
--- /dev/null
+++ b/aptly/server/mirror/ubuntu/trusty/mcp/apt_mk/saltstack/salt-2017-7.yml
@@ -0,0 +1,23 @@
+parameters:
+ _param:
+ apt_mk_version: stable
+ mirror_mirantis_openstack_trusty_saltstack_2017_7_source: http://apt.mirantis.com/trusty/salt/2017.7/
+ mirror_mirantis_openstack_trusty_saltstack_2017_7_distribution: ${_param:apt_mk_version}
+ mirror_mirantis_openstack_trusty_saltstack_2017_7_components: main
+ mirror_mirantis_openstack_trusty_saltstack_2017_7_key_url: "http://apt.mirantis.com/public.gpg"
+ mirror_mirantis_openstack_trusty_saltstack_2017_7_gpgkeys:
+ - A76882D3
+ aptly:
+ server:
+ mirror:
+ mirantis_openstack_trusty_saltstack_2017_7:
+ source: ${_param:mirror_mirantis_openstack_trusty_saltstack_2017_7_source}
+ distribution: ${_param:mirror_mirantis_openstack_trusty_saltstack_2017_7_distribution}
+ components: ${_param:mirror_mirantis_openstack_trusty_saltstack_2017_7_components}
+ architectures: amd64
+ key_url: ${_param:mirror_mirantis_openstack_trusty_saltstack_2017_7_key_url}
+ gpgkeys: ${_param:mirror_mirantis_openstack_trusty_saltstack_2017_7_gpgkeys}
+ publisher:
+ component: ${_param:mirror_mirantis_openstack_trusty_saltstack_2017_7_components}
+ distributions:
+ - ubuntu-trusty/salt/2017.7/${_param:apt_mk_version}
\ No newline at end of file
diff --git a/aptly/server/mirror/ubuntu/xenial/mcp/apt_mk/aptly.yml b/aptly/server/mirror/ubuntu/xenial/mcp/apt_mk/aptly.yml
new file mode 100644
index 0000000..507ed5e
--- /dev/null
+++ b/aptly/server/mirror/ubuntu/xenial/mcp/apt_mk/aptly.yml
@@ -0,0 +1,23 @@
+parameters:
+ _param:
+ apt_mk_version: stable
+ mirror_mirantis_openstack_xenial_aptly_source: http://apt.mirantis.com/xenial/aptly/
+ mirror_mirantis_openstack_xenial_aptly_distribution: ${_param:apt_mk_version}
+ mirror_mirantis_openstack_xenial_aptly_components: main
+ mirror_mirantis_openstack_xenial_aptly_key_url: "http://apt.mirantis.com/public.gpg"
+ mirror_mirantis_openstack_xenial_aptly_gpgkeys:
+ - A76882D3
+ aptly:
+ server:
+ mirror:
+ mirantis_openstack_xenial_aptly:
+ source: ${_param:mirror_mirantis_openstack_xenial_aptly_source}
+ distribution: ${_param:mirror_mirantis_openstack_xenial_aptly_distribution}
+ components: ${_param:mirror_mirantis_openstack_xenial_aptly_components}
+ architectures: amd64
+ key_url: ${_param:mirror_mirantis_openstack_xenial_aptly_key_url}
+ gpgkeys: ${_param:mirror_mirantis_openstack_xenial_aptly_gpgkeys}
+ publisher:
+ component: ${_param:mirror_mirantis_openstack_xenial_aptly_components}
+ distributions:
+ - ubuntu-xenial/aptly/${_param:apt_mk_version}
\ No newline at end of file
diff --git a/aptly/server/mirror/ubuntu/xenial/mcp/apt_mk/cassandra.yml b/aptly/server/mirror/ubuntu/xenial/mcp/apt_mk/cassandra.yml
new file mode 100644
index 0000000..5afbf77
--- /dev/null
+++ b/aptly/server/mirror/ubuntu/xenial/mcp/apt_mk/cassandra.yml
@@ -0,0 +1,23 @@
+parameters:
+ _param:
+ apt_mk_version: stable
+ mirror_mirantis_openstack_xenial_cassandra_source: http://apt.mirantis.com/xenial/cassandra/
+ mirror_mirantis_openstack_xenial_cassandra_distribution: ${_param:apt_mk_version}
+ mirror_mirantis_openstack_xenial_cassandra_components: 21x
+ mirror_mirantis_openstack_xenial_cassandra_key_url: "http://apt.mirantis.com/public.gpg"
+ mirror_mirantis_openstack_xenial_cassandra_gpgkeys:
+ - A76882D3
+ aptly:
+ server:
+ mirror:
+ mirantis_openstack_xenial_cassandra:
+ source: ${_param:mirror_mirantis_openstack_xenial_cassandra_source}
+ distribution: ${_param:mirror_mirantis_openstack_xenial_cassandra_distribution}
+ components: ${_param:mirror_mirantis_openstack_xenial_cassandra_components}
+ architectures: amd64
+ key_url: ${_param:mirror_mirantis_openstack_xenial_cassandra_key_url}
+ gpgkeys: ${_param:mirror_mirantis_openstack_xenial_cassandra_gpgkeys}
+ publisher:
+ component: ${_param:mirror_mirantis_openstack_xenial_cassandra_components}
+ distributions:
+ - ubuntu-xenial/cassandra/${_param:apt_mk_version}
\ No newline at end of file
diff --git a/aptly/server/mirror/ubuntu/xenial/mcp/apt_mk/ceph.yml b/aptly/server/mirror/ubuntu/xenial/mcp/apt_mk/ceph.yml
new file mode 100644
index 0000000..a0b1293
--- /dev/null
+++ b/aptly/server/mirror/ubuntu/xenial/mcp/apt_mk/ceph.yml
@@ -0,0 +1,23 @@
+parameters:
+ _param:
+ apt_mk_version: stable
+ mirror_mirantis_openstack_xenial_ceph_source: http://apt.mirantis.com/xenial/ceph/
+ mirror_mirantis_openstack_xenial_ceph_distribution: ${_param:apt_mk_version}
+ mirror_mirantis_openstack_xenial_ceph_components: luminous
+ mirror_mirantis_openstack_xenial_ceph_key_url: "http://apt.mirantis.com/public.gpg"
+ mirror_mirantis_openstack_xenial_ceph_gpgkeys:
+ - A76882D3
+ aptly:
+ server:
+ mirror:
+ mirantis_openstack_xenial_ceph:
+ source: ${_param:mirror_mirantis_openstack_xenial_ceph_source}
+ distribution: ${_param:mirror_mirantis_openstack_xenial_ceph_distribution}
+ components: ${_param:mirror_mirantis_openstack_xenial_ceph_components}
+ architectures: amd64
+ key_url: ${_param:mirror_mirantis_openstack_xenial_ceph_key_url}
+ gpgkeys: ${_param:mirror_mirantis_openstack_xenial_ceph_gpgkeys}
+ publisher:
+ component: ${_param:mirror_mirantis_openstack_xenial_ceph_components}
+ distributions:
+ - ubuntu-xenial/ceph/${_param:apt_mk_version}
\ No newline at end of file
diff --git a/aptly/server/mirror/ubuntu/xenial/mcp/apt_mk/docker-legacy.yml b/aptly/server/mirror/ubuntu/xenial/mcp/apt_mk/docker-legacy.yml
new file mode 100644
index 0000000..c71c543
--- /dev/null
+++ b/aptly/server/mirror/ubuntu/xenial/mcp/apt_mk/docker-legacy.yml
@@ -0,0 +1,23 @@
+parameters:
+ _param:
+ apt_mk_version: stable
+ mirror_mirantis_openstack_xenial_docker_legacy_source: http://apt.mirantis.com/xenial/docker/
+ mirror_mirantis_openstack_xenial_docker_legacy_distribution: ${_param:apt_mk_version}
+ mirror_mirantis_openstack_xenial_docker_legacy_components: legacy
+ mirror_mirantis_openstack_xenial_docker_legacy_key_url: "http://apt.mirantis.com/public.gpg"
+ mirror_mirantis_openstack_xenial_docker_legacy_gpgkeys:
+ - A76882D3
+ aptly:
+ server:
+ mirror:
+ mirantis_openstack_xenial_docker_legacy:
+ source: ${_param:mirror_mirantis_openstack_xenial_docker_legacy_source}
+ distribution: ${_param:mirror_mirantis_openstack_xenial_docker_legacy_distribution}
+ components: ${_param:mirror_mirantis_openstack_xenial_docker_legacy_components}
+ architectures: amd64
+ key_url: ${_param:mirror_mirantis_openstack_xenial_docker_legacy_key_url}
+ gpgkeys: ${_param:mirror_mirantis_openstack_xenial_docker_legacy_gpgkeys}
+ publisher:
+ component: ${_param:mirror_mirantis_openstack_xenial_docker_legacy_components}
+ distributions:
+ - ubuntu-xenial/docker/${_param:apt_mk_version}
\ No newline at end of file
diff --git a/aptly/server/mirror/ubuntu/xenial/mcp/apt_mk/docker.yml b/aptly/server/mirror/ubuntu/xenial/mcp/apt_mk/docker.yml
new file mode 100644
index 0000000..703d202
--- /dev/null
+++ b/aptly/server/mirror/ubuntu/xenial/mcp/apt_mk/docker.yml
@@ -0,0 +1,23 @@
+parameters:
+ _param:
+ apt_mk_version: stable
+ mirror_mirantis_openstack_xenial_docker_source: http://apt.mirantis.com/xenial/docker/
+ mirror_mirantis_openstack_xenial_docker_distribution: ${_param:apt_mk_version}
+ mirror_mirantis_openstack_xenial_docker_components: stable
+ mirror_mirantis_openstack_xenial_docker_key_url: "http://apt.mirantis.com/public.gpg"
+ mirror_mirantis_openstack_xenial_docker_gpgkeys:
+ - A76882D3
+ aptly:
+ server:
+ mirror:
+ mirantis_openstack_xenial_docker:
+ source: ${_param:mirror_mirantis_openstack_xenial_docker_source}
+ distribution: ${_param:mirror_mirantis_openstack_xenial_docker_distribution}
+ components: ${_param:mirror_mirantis_openstack_xenial_docker_components}
+ architectures: amd64
+ key_url: ${_param:mirror_mirantis_openstack_xenial_docker_key_url}
+ gpgkeys: ${_param:mirror_mirantis_openstack_xenial_docker_gpgkeys}
+ publisher:
+ component: ${_param:mirror_mirantis_openstack_xenial_docker_components}
+ distributions:
+ - ubuntu-xenial/docker/${_param:apt_mk_version}
\ No newline at end of file
diff --git a/aptly/server/mirror/ubuntu/xenial/mcp/apt_mk/elastic/2x.yml b/aptly/server/mirror/ubuntu/xenial/mcp/apt_mk/elastic/2x.yml
new file mode 100644
index 0000000..6b1c006
--- /dev/null
+++ b/aptly/server/mirror/ubuntu/xenial/mcp/apt_mk/elastic/2x.yml
@@ -0,0 +1,23 @@
+parameters:
+ _param:
+ apt_mk_version: stable
+ mirror_mirantis_openstack_xenial_elastic_2x_source: http://apt.mirantis.com/xenial/elastic/2.x/
+ mirror_mirantis_openstack_xenial_elastic_2x_distribution: ${_param:apt_mk_version}
+ mirror_mirantis_openstack_xenial_elastic_2x_components: main
+ mirror_mirantis_openstack_xenial_elastic_2x_key_url: "http://apt.mirantis.com/public.gpg"
+ mirror_mirantis_openstack_xenial_elastic_2x_gpgkeys:
+ - A76882D3
+ aptly:
+ server:
+ mirror:
+ mirantis_openstack_xenial_elastic_2x:
+ source: ${_param:mirror_mirantis_openstack_xenial_elastic_2x_source}
+ distribution: ${_param:mirror_mirantis_openstack_xenial_elastic_2x_distribution}
+ components: ${_param:mirror_mirantis_openstack_xenial_elastic_2x_components}
+ architectures: amd64
+ key_url: ${_param:mirror_mirantis_openstack_xenial_elastic_2x_key_url}
+ gpgkeys: ${_param:mirror_mirantis_openstack_xenial_elastic_2x_gpgkeys}
+ publisher:
+ component: ${_param:mirror_mirantis_openstack_xenial_elastic_2x_components}
+ distributions:
+ - ubuntu-xenial/elastic/2.x/${_param:apt_mk_version}
\ No newline at end of file
diff --git a/aptly/server/mirror/ubuntu/xenial/mcp/apt_mk/elastic/5x.yml b/aptly/server/mirror/ubuntu/xenial/mcp/apt_mk/elastic/5x.yml
new file mode 100644
index 0000000..d7e92c6
--- /dev/null
+++ b/aptly/server/mirror/ubuntu/xenial/mcp/apt_mk/elastic/5x.yml
@@ -0,0 +1,23 @@
+parameters:
+ _param:
+ apt_mk_version: stable
+ mirror_mirantis_openstack_xenial_elastic_5x_source: http://apt.mirantis.com/xenial/elastic/5.x/
+ mirror_mirantis_openstack_xenial_elastic_5x_distribution: ${_param:apt_mk_version}
+ mirror_mirantis_openstack_xenial_elastic_5x_components: main
+ mirror_mirantis_openstack_xenial_elastic_5x_key_url: "http://apt.mirantis.com/public.gpg"
+ mirror_mirantis_openstack_xenial_elastic_5x_gpgkeys:
+ - A76882D3
+ aptly:
+ server:
+ mirror:
+ mirantis_openstack_xenial_elastic_5x:
+ source: ${_param:mirror_mirantis_openstack_xenial_elastic_5x_source}
+ distribution: ${_param:mirror_mirantis_openstack_xenial_elastic_5x_distribution}
+ components: ${_param:mirror_mirantis_openstack_xenial_elastic_5x_components}
+ architectures: amd64
+ key_url: ${_param:mirror_mirantis_openstack_xenial_elastic_5x_key_url}
+ gpgkeys: ${_param:mirror_mirantis_openstack_xenial_elastic_5x_gpgkeys}
+ publisher:
+ component: ${_param:mirror_mirantis_openstack_xenial_elastic_5x_components}
+ distributions:
+ - ubuntu-xenial/elastic/5.x/${_param:apt_mk_version}
diff --git a/aptly/server/mirror/ubuntu/xenial/mcp/apt_mk/elastic/init.yml b/aptly/server/mirror/ubuntu/xenial/mcp/apt_mk/elastic/init.yml
new file mode 100644
index 0000000..f214330
--- /dev/null
+++ b/aptly/server/mirror/ubuntu/xenial/mcp/apt_mk/elastic/init.yml
@@ -0,0 +1,3 @@
+classes:
+- system.aptly.server.mirror.ubuntu.xenial.mcp.apt_mk.elastic.2x
+- system.aptly.server.mirror.ubuntu.xenial.mcp.apt_mk.elastic.5x
\ No newline at end of file
diff --git a/aptly/server/mirror/ubuntu/xenial/mcp/apt_mk/glusterfs.yml b/aptly/server/mirror/ubuntu/xenial/mcp/apt_mk/glusterfs.yml
new file mode 100644
index 0000000..cfec221
--- /dev/null
+++ b/aptly/server/mirror/ubuntu/xenial/mcp/apt_mk/glusterfs.yml
@@ -0,0 +1,23 @@
+parameters:
+ _param:
+ apt_mk_version: stable
+ mirror_mirantis_openstack_xenial_glusterfs_source: http://apt.mirantis.com/xenial/glusterfs/
+ mirror_mirantis_openstack_xenial_glusterfs_distribution: ${_param:apt_mk_version}
+ mirror_mirantis_openstack_xenial_glusterfs_components: '"3.12"'
+ mirror_mirantis_openstack_xenial_glusterfs_key_url: "http://apt.mirantis.com/public.gpg"
+ mirror_mirantis_openstack_xenial_glusterfs_gpgkeys:
+ - A76882D3
+ aptly:
+ server:
+ mirror:
+ mirantis_openstack_xenial_glusterfs:
+ source: ${_param:mirror_mirantis_openstack_xenial_glusterfs_source}
+ distribution: ${_param:mirror_mirantis_openstack_xenial_glusterfs_distribution}
+ components: ${_param:mirror_mirantis_openstack_xenial_glusterfs_components}
+ architectures: amd64
+ key_url: ${_param:mirror_mirantis_openstack_xenial_glusterfs_key_url}
+ gpgkeys: ${_param:mirror_mirantis_openstack_xenial_glusterfs_gpgkeys}
+ publisher:
+ component: ${_param:mirror_mirantis_openstack_xenial_glusterfs_components}
+ distributions:
+ - ubuntu-xenial/glusterfs/${_param:apt_mk_version}
\ No newline at end of file
diff --git a/aptly/server/mirror/ubuntu/xenial/mcp/apt_mk/grafana.yml b/aptly/server/mirror/ubuntu/xenial/mcp/apt_mk/grafana.yml
new file mode 100644
index 0000000..e09ba61
--- /dev/null
+++ b/aptly/server/mirror/ubuntu/xenial/mcp/apt_mk/grafana.yml
@@ -0,0 +1,23 @@
+parameters:
+ _param:
+ apt_mk_version: stable
+ mirror_mirantis_openstack_xenial_grafana_source: http://apt.mirantis.com/xenial/grafana/
+ mirror_mirantis_openstack_xenial_grafana_distribution: ${_param:apt_mk_version}
+ mirror_mirantis_openstack_xenial_grafana_components: main
+ mirror_mirantis_openstack_xenial_grafana_key_url: "http://apt.mirantis.com/public.gpg"
+ mirror_mirantis_openstack_xenial_grafana_gpgkeys:
+ - A76882D3
+ aptly:
+ server:
+ mirror:
+ mirantis_openstack_xenial_grafana:
+ source: ${_param:mirror_mirantis_openstack_xenial_grafana_source}
+ distribution: ${_param:mirror_mirantis_openstack_xenial_grafana_distribution}
+ components: ${_param:mirror_mirantis_openstack_xenial_grafana_components}
+ architectures: amd64
+ key_url: ${_param:mirror_mirantis_openstack_xenial_grafana_key_url}
+ gpgkeys: ${_param:mirror_mirantis_openstack_xenial_grafana_gpgkeys}
+ publisher:
+ component: ${_param:mirror_mirantis_openstack_xenial_grafana_components}
+ distributions:
+ - ubuntu-xenial/grafana/${_param:apt_mk_version}
\ No newline at end of file
diff --git a/aptly/server/mirror/ubuntu/xenial/mcp/apt_mk/influxdb.yml b/aptly/server/mirror/ubuntu/xenial/mcp/apt_mk/influxdb.yml
new file mode 100644
index 0000000..01093fe
--- /dev/null
+++ b/aptly/server/mirror/ubuntu/xenial/mcp/apt_mk/influxdb.yml
@@ -0,0 +1,23 @@
+parameters:
+ _param:
+ apt_mk_version: stable
+ mirror_mirantis_openstack_xenial_influxdb_source: http://apt.mirantis.com/xenial/influxdb/
+ mirror_mirantis_openstack_xenial_influxdb_distribution: ${_param:apt_mk_version}
+ mirror_mirantis_openstack_xenial_influxdb_components: main
+ mirror_mirantis_openstack_xenial_influxdb_key_url: "http://apt.mirantis.com/public.gpg"
+ mirror_mirantis_openstack_xenial_influxdb_gpgkeys:
+ - A76882D3
+ aptly:
+ server:
+ mirror:
+ mirantis_openstack_xenial_influxdb:
+ source: ${_param:mirror_mirantis_openstack_xenial_influxdb_source}
+ distribution: ${_param:mirror_mirantis_openstack_xenial_influxdb_distribution}
+ components: ${_param:mirror_mirantis_openstack_xenial_influxdb_components}
+ architectures: amd64
+ key_url: ${_param:mirror_mirantis_openstack_xenial_influxdb_key_url}
+ gpgkeys: ${_param:mirror_mirantis_openstack_xenial_influxdb_gpgkeys}
+ publisher:
+ component: ${_param:mirror_mirantis_openstack_xenial_influxdb_components}
+ distributions:
+ - ubuntu-xenial/influxdb/${_param:apt_mk_version}
\ No newline at end of file
diff --git a/aptly/server/mirror/ubuntu/xenial/mcp/apt_mk/kibana/46.yml b/aptly/server/mirror/ubuntu/xenial/mcp/apt_mk/kibana/46.yml
new file mode 100644
index 0000000..815185b
--- /dev/null
+++ b/aptly/server/mirror/ubuntu/xenial/mcp/apt_mk/kibana/46.yml
@@ -0,0 +1,23 @@
+parameters:
+ _param:
+ apt_mk_version: stable
+ mirror_mirantis_openstack_xenial_kibana_46_source: http://apt.mirantis.com/xenial/kibana/4.6/
+ mirror_mirantis_openstack_xenial_kibana_46_distribution: ${_param:apt_mk_version}
+ mirror_mirantis_openstack_xenial_kibana_46_components: "kibana-46"
+ mirror_mirantis_openstack_xenial_kibana_46_key_url: "http://apt.mirantis.com/public.gpg"
+ mirror_mirantis_openstack_xenial_kibana_46_gpgkeys:
+ - A76882D3
+ aptly:
+ server:
+ mirror:
+ mirantis_openstack_xenial_kibana_46:
+ source: ${_param:mirror_mirantis_openstack_xenial_kibana_46_source}
+ distribution: ${_param:mirror_mirantis_openstack_xenial_kibana_46_distribution}
+ components: ${_param:mirror_mirantis_openstack_xenial_kibana_46_components}
+ architectures: amd64
+ key_url: ${_param:mirror_mirantis_openstack_xenial_kibana_46_key_url}
+ gpgkeys: ${_param:mirror_mirantis_openstack_xenial_kibana_46_gpgkeys}
+ publisher:
+ component: ${_param:mirror_mirantis_openstack_xenial_kibana_46_components}
+ distributions:
+ - ubuntu-xenial/kibana/4.6/${_param:apt_mk_version}
\ No newline at end of file
diff --git a/aptly/server/mirror/ubuntu/xenial/mcp/apt_mk/kibana/5x.yml b/aptly/server/mirror/ubuntu/xenial/mcp/apt_mk/kibana/5x.yml
new file mode 100644
index 0000000..c1b061e
--- /dev/null
+++ b/aptly/server/mirror/ubuntu/xenial/mcp/apt_mk/kibana/5x.yml
@@ -0,0 +1,23 @@
+parameters:
+ _param:
+ apt_mk_version: stable
+ mirror_mirantis_openstack_xenial_kibana_5x_source: http://apt.mirantis.com/xenial/kibana/5.x/
+ mirror_mirantis_openstack_xenial_kibana_5x_distribution: ${_param:apt_mk_version}
+ mirror_mirantis_openstack_xenial_kibana_5x_components: "kibana-5x"
+ mirror_mirantis_openstack_xenial_kibana_5x_key_url: "http://apt.mirantis.com/public.gpg"
+ mirror_mirantis_openstack_xenial_kibana_5x_gpgkeys:
+ - A76882D3
+ aptly:
+ server:
+ mirror:
+ mirantis_openstack_xenial_kibana_5x:
+ source: ${_param:mirror_mirantis_openstack_xenial_kibana_5x_source}
+ distribution: ${_param:mirror_mirantis_openstack_xenial_kibana_5x_distribution}
+ components: ${_param:mirror_mirantis_openstack_xenial_kibana_5x_components}
+ architectures: amd64
+ key_url: ${_param:mirror_mirantis_openstack_xenial_kibana_5x_key_url}
+ gpgkeys: ${_param:mirror_mirantis_openstack_xenial_kibana_5x_gpgkeys}
+ publisher:
+ component: ${_param:mirror_mirantis_openstack_xenial_kibana_5x_components}
+ distributions:
+ - ubuntu-xenial/kibana/5.x/${_param:apt_mk_version}
\ No newline at end of file
diff --git a/aptly/server/mirror/ubuntu/xenial/mcp/apt_mk/kibana/init.yml b/aptly/server/mirror/ubuntu/xenial/mcp/apt_mk/kibana/init.yml
new file mode 100644
index 0000000..dfd93bb
--- /dev/null
+++ b/aptly/server/mirror/ubuntu/xenial/mcp/apt_mk/kibana/init.yml
@@ -0,0 +1,3 @@
+classes:
+- system.aptly.server.mirror.ubuntu.xenial.mcp.apt_mk.kibana.46
+- system.aptly.server.mirror.ubuntu.xenial.mcp.apt_mk.kibana.5x
\ No newline at end of file
diff --git a/aptly/server/mirror/ubuntu/xenial/mcp/apt_mk/maas.yml b/aptly/server/mirror/ubuntu/xenial/mcp/apt_mk/maas.yml
new file mode 100644
index 0000000..3d63b00
--- /dev/null
+++ b/aptly/server/mirror/ubuntu/xenial/mcp/apt_mk/maas.yml
@@ -0,0 +1,23 @@
+parameters:
+ _param:
+ apt_mk_version: stable
+ mirror_mirantis_openstack_xenial_maas_source: http://apt.mirantis.com/xenial/maas/
+ mirror_mirantis_openstack_xenial_maas_distribution: ${_param:apt_mk_version}
+ mirror_mirantis_openstack_xenial_maas_components: main
+ mirror_mirantis_openstack_xenial_maas_key_url: "http://apt.mirantis.com/public.gpg"
+ mirror_mirantis_openstack_xenial_maas_gpgkeys:
+ - A76882D3
+ aptly:
+ server:
+ mirror:
+ mirantis_openstack_xenial_maas:
+ source: ${_param:mirror_mirantis_openstack_xenial_maas_source}
+ distribution: ${_param:mirror_mirantis_openstack_xenial_maas_distribution}
+ components: ${_param:mirror_mirantis_openstack_xenial_maas_components}
+ architectures: amd64
+ key_url: ${_param:mirror_mirantis_openstack_xenial_maas_key_url}
+ gpgkeys: ${_param:mirror_mirantis_openstack_xenial_maas_gpgkeys}
+ publisher:
+ component: ${_param:mirror_mirantis_openstack_xenial_maas_components}
+ distributions:
+ - ubuntu-xenial/maas/${_param:apt_mk_version}
\ No newline at end of file
diff --git a/aptly/server/mirror/ubuntu/xenial/mcp/apt_mk/openstack/mitaka.yml b/aptly/server/mirror/ubuntu/xenial/mcp/apt_mk/openstack/mitaka.yml
new file mode 100644
index 0000000..d50b2ca
--- /dev/null
+++ b/aptly/server/mirror/ubuntu/xenial/mcp/apt_mk/openstack/mitaka.yml
@@ -0,0 +1,103 @@
+parameters:
+ _param:
+ apt_mk_version: stable
+
+ mirror_mirantis_openstack_mitaka_xenial_source: http://apt.mirantis.com/xenial/openstack/mitaka/
+ mirror_mirantis_openstack_mitaka_xenial_distribution: ${_param:apt_mk_version}
+ mirror_mirantis_openstack_mitaka_xenial_components: main restricted
+ mirror_mirantis_openstack_mitaka_xenial_key_url: "http://apt.mirantis.com/public.gpg"
+ mirror_mirantis_openstack_mitaka_xenial_gpgkeys:
+ - A76882D3
+
+ mirror_mirantis_openstack_mitaka_hotfix_xenial_source: http://apt.mirantis.com/xenial/openstack/mitaka/hotfix/
+ mirror_mirantis_openstack_mitaka_hotfix_xenial_distribution: ${_param:apt_mk_version}
+ mirror_mirantis_openstack_mitaka_hotfix_xenial_components: main restricted
+ mirror_mirantis_openstack_mitaka_hotfix_xenial_key_url: "http://apt.mirantis.com/public.gpg"
+ mirror_mirantis_openstack_mitaka_hotfix_xenial_gpgkeys:
+ - A76882D3
+
+ mirror_mirantis_openstack_mitaka_security_xenial_source: http://apt.mirantis.com/xenial/openstack/mitaka/security/
+ mirror_mirantis_openstack_mitaka_security_xenial_distribution: ${_param:apt_mk_version}
+ mirror_mirantis_openstack_mitaka_security_xenial_components: main restricted
+ mirror_mirantis_openstack_mitaka_security_xenial_key_url: "http://apt.mirantis.com/public.gpg"
+ mirror_mirantis_openstack_mitaka_security_xenial_gpgkeys:
+ - A76882D3
+
+ mirror_mirantis_openstack_mitaka_updates_xenial_source: http://apt.mirantis.com/xenial/openstack/mitaka/updates/
+ mirror_mirantis_openstack_mitaka_updates_xenial_distribution: ${_param:apt_mk_version}
+ mirror_mirantis_openstack_mitaka_updates_xenial_components: main restricted
+ mirror_mirantis_openstack_mitaka_updates_xenial_key_url: "http://apt.mirantis.com/public.gpg"
+ mirror_mirantis_openstack_mitaka_updates_xenial_gpgkeys:
+ - A76882D3
+
+ mirror_mirantis_openstack_mitaka_holdback_xenial_source: http://apt.mirantis.com/xenial/openstack/mitaka/holdback/
+ mirror_mirantis_openstack_mitaka_holdback_xenial_distribution: ${_param:apt_mk_version}
+ mirror_mirantis_openstack_mitaka_holdback_xenial_components: main restricted
+ mirror_mirantis_openstack_mitaka_holdback_xenial_key_url: "http://apt.mirantis.com/public.gpg"
+ mirror_mirantis_openstack_mitaka_holdback_xenial_gpgkeys:
+ - A76882D3
+ aptly:
+ server:
+ mirror:
+ mirantis_openstack_mitaka_xenial:
+ source: ${_param:mirror_mirantis_openstack_mitaka_xenial_source}
+ distribution: ${_param:mirror_mirantis_openstack_mitaka_xenial_distribution}
+ components: ${_param:mirror_mirantis_openstack_mitaka_xenial_components}
+ architectures: amd64
+ key_url: ${_param:mirror_mirantis_openstack_mitaka_xenial_key_url}
+ gpgkeys: ${_param:mirror_mirantis_openstack_mitaka_xenial_gpgkeys}
+ publisher:
+ component: main
+ distributions:
+ - ubuntu-xenial/openstack/mitaka/${_param:apt_mk_version}
+
+ mirantis_openstack_mitaka_hotfix_xenial:
+ source: ${_param:mirror_mirantis_openstack_mitaka_hotfix_xenial_source}
+ distribution: ${_param:mirror_mirantis_openstack_mitaka_hotfix_xenial_distribution}
+ components: ${_param:mirror_mirantis_openstack_mitaka_hotfix_xenial_components}
+ architectures: amd64
+ key_url: ${_param:mirror_mirantis_openstack_mitaka_hotfix_xenial_key_url}
+ gpgkeys: ${_param:mirror_mirantis_openstack_mitaka_hotfix_xenial_gpgkeys}
+ publisher:
+ component: main
+ distributions:
+ - ubuntu-xenial/openstack/mitaka/hotfix/${_param:apt_mk_version}
+
+ mirantis_openstack_mitaka_security_xenial:
+ source: ${_param:mirror_mirantis_openstack_mitaka_security_xenial_source}
+ distribution: ${_param:mirror_mirantis_openstack_mitaka_security_xenial_distribution}
+ components: ${_param:mirror_mirantis_openstack_mitaka_security_xenial_components}
+ architectures: amd64
+ key_url: ${_param:mirror_mirantis_openstack_mitaka_security_xenial_key_url}
+ gpgkeys: ${_param:mirror_mirantis_openstack_mitaka_security_xenial_gpgkeys}
+ publisher:
+ component: main
+ distributions:
+ - ubuntu-xenial/openstack/mitaka/security/${_param:apt_mk_version}
+
+ # required for alternative horizon plugins/etc..
+ mirantis_openstack_mitaka_updates_xenial:
+ source: ${_param:mirror_mirantis_openstack_mitaka_updates_xenial_source}
+ distribution: ${_param:mirror_mirantis_openstack_mitaka_updates_xenial_distribution}
+ components: ${_param:mirror_mirantis_openstack_mitaka_updates_xenial_components}
+ architectures: amd64
+ key_url: ${_param:mirror_mirantis_openstack_mitaka_updates_xenial_key_url}
+ gpgkeys: ${_param:mirror_mirantis_openstack_mitaka_updates_xenial_gpgkeys}
+ publisher:
+ component: main
+ distributions:
+ - ubuntu-xenial/openstack/mitaka/updates/${_param:apt_mk_version}
+
+ # required for salt formulas
+ mirantis_openstack_mitaka_holdback_xenial:
+ source: ${_param:mirror_mirantis_openstack_mitaka_holdback_xenial_source}
+ distribution: ${_param:mirror_mirantis_openstack_mitaka_holdback_xenial_distribution}
+ components: ${_param:mirror_mirantis_openstack_mitaka_holdback_xenial_components}
+ architectures: amd64
+ key_url: ${_param:mirror_mirantis_openstack_mitaka_holdback_xenial_key_url}
+ gpgkeys: ${_param:mirror_mirantis_openstack_mitaka_holdback_xenial_gpgkeys}
+ publisher:
+ component: main
+ distributions:
+ - ubuntu-xenial/openstack/mitaka/holdback/${_param:apt_mk_version}
+
diff --git a/aptly/server/mirror/ubuntu/xenial/mcp/apt_mk/openstack/newton.yml b/aptly/server/mirror/ubuntu/xenial/mcp/apt_mk/openstack/newton.yml
new file mode 100644
index 0000000..95eb192
--- /dev/null
+++ b/aptly/server/mirror/ubuntu/xenial/mcp/apt_mk/openstack/newton.yml
@@ -0,0 +1,103 @@
+parameters:
+ _param:
+ apt_mk_version: stable
+
+ mirror_mirantis_openstack_newton_xenial_source: http://apt.mirantis.com/xenial/openstack/newton/
+ mirror_mirantis_openstack_newton_xenial_distribution: ${_param:apt_mk_version}
+ mirror_mirantis_openstack_newton_xenial_components: main restricted
+ mirror_mirantis_openstack_newton_xenial_key_url: "http://apt.mirantis.com/public.gpg"
+ mirror_mirantis_openstack_newton_xenial_gpgkeys:
+ - A76882D3
+
+ mirror_mirantis_openstack_newton_hotfix_xenial_source: http://apt.mirantis.com/xenial/openstack/newton/hotfix/
+ mirror_mirantis_openstack_newton_hotfix_xenial_distribution: ${_param:apt_mk_version}
+ mirror_mirantis_openstack_newton_hotfix_xenial_components: main restricted
+ mirror_mirantis_openstack_newton_hotfix_xenial_key_url: "http://apt.mirantis.com/public.gpg"
+ mirror_mirantis_openstack_newton_hotfix_xenial_gpgkeys:
+ - A76882D3
+
+ mirror_mirantis_openstack_newton_security_xenial_source: http://apt.mirantis.com/xenial/openstack/newton/security/
+ mirror_mirantis_openstack_newton_security_xenial_distribution: ${_param:apt_mk_version}
+ mirror_mirantis_openstack_newton_security_xenial_components: main restricted
+ mirror_mirantis_openstack_newton_security_xenial_key_url: "http://apt.mirantis.com/public.gpg"
+ mirror_mirantis_openstack_newton_security_xenial_gpgkeys:
+ - A76882D3
+
+ mirror_mirantis_openstack_newton_updates_xenial_source: http://apt.mirantis.com/xenial/openstack/newton/updates/
+ mirror_mirantis_openstack_newton_updates_xenial_distribution: ${_param:apt_mk_version}
+ mirror_mirantis_openstack_newton_updates_xenial_components: main restricted
+ mirror_mirantis_openstack_newton_updates_xenial_key_url: "http://apt.mirantis.com/public.gpg"
+ mirror_mirantis_openstack_newton_updates_xenial_gpgkeys:
+ - A76882D3
+
+ mirror_mirantis_openstack_newton_holdback_xenial_source: http://apt.mirantis.com/xenial/openstack/newton/holdback/
+ mirror_mirantis_openstack_newton_holdback_xenial_distribution: ${_param:apt_mk_version}
+ mirror_mirantis_openstack_newton_holdback_xenial_components: main restricted
+ mirror_mirantis_openstack_newton_holdback_xenial_key_url: "http://apt.mirantis.com/public.gpg"
+ mirror_mirantis_openstack_newton_holdback_xenial_gpgkeys:
+ - A76882D3
+ aptly:
+ server:
+ mirror:
+ mirantis_openstack_newton_xenial:
+ source: ${_param:mirror_mirantis_openstack_newton_xenial_source}
+ distribution: ${_param:mirror_mirantis_openstack_newton_xenial_distribution}
+ components: ${_param:mirror_mirantis_openstack_newton_xenial_components}
+ architectures: amd64
+ key_url: ${_param:mirror_mirantis_openstack_newton_xenial_key_url}
+ gpgkeys: ${_param:mirror_mirantis_openstack_newton_xenial_gpgkeys}
+ publisher:
+ component: main
+ distributions:
+ - ubuntu-xenial/openstack/newton/${_param:apt_mk_version}
+
+ mirantis_openstack_newton_hotfix_xenial:
+ source: ${_param:mirror_mirantis_openstack_newton_hotfix_xenial_source}
+ distribution: ${_param:mirror_mirantis_openstack_newton_hotfix_xenial_distribution}
+ components: ${_param:mirror_mirantis_openstack_newton_hotfix_xenial_components}
+ architectures: amd64
+ key_url: ${_param:mirror_mirantis_openstack_newton_hotfix_xenial_key_url}
+ gpgkeys: ${_param:mirror_mirantis_openstack_newton_hotfix_xenial_gpgkeys}
+ publisher:
+ component: main
+ distributions:
+ - ubuntu-xenial/openstack/newton/hotfix/${_param:apt_mk_version}
+
+ mirantis_openstack_newton_security_xenial:
+ source: ${_param:mirror_mirantis_openstack_newton_security_xenial_source}
+ distribution: ${_param:mirror_mirantis_openstack_newton_security_xenial_distribution}
+ components: ${_param:mirror_mirantis_openstack_newton_security_xenial_components}
+ architectures: amd64
+ key_url: ${_param:mirror_mirantis_openstack_newton_security_xenial_key_url}
+ gpgkeys: ${_param:mirror_mirantis_openstack_newton_security_xenial_gpgkeys}
+ publisher:
+ component: main
+ distributions:
+ - ubuntu-xenial/openstack/newton/security/${_param:apt_mk_version}
+
+ # required for alternative horizon plugins/etc..
+ mirantis_openstack_newton_updates_xenial:
+ source: ${_param:mirror_mirantis_openstack_newton_updates_xenial_source}
+ distribution: ${_param:mirror_mirantis_openstack_newton_updates_xenial_distribution}
+ components: ${_param:mirror_mirantis_openstack_newton_updates_xenial_components}
+ architectures: amd64
+ key_url: ${_param:mirror_mirantis_openstack_newton_updates_xenial_key_url}
+ gpgkeys: ${_param:mirror_mirantis_openstack_newton_updates_xenial_gpgkeys}
+ publisher:
+ component: main
+ distributions:
+ - ubuntu-xenial/openstack/newton/updates/${_param:apt_mk_version}
+
+ # required for salt formulas
+ mirantis_openstack_newton_holdback_xenial:
+ source: ${_param:mirror_mirantis_openstack_newton_holdback_xenial_source}
+ distribution: ${_param:mirror_mirantis_openstack_newton_holdback_xenial_distribution}
+ components: ${_param:mirror_mirantis_openstack_newton_holdback_xenial_components}
+ architectures: amd64
+ key_url: ${_param:mirror_mirantis_openstack_newton_holdback_xenial_key_url}
+ gpgkeys: ${_param:mirror_mirantis_openstack_newton_holdback_xenial_gpgkeys}
+ publisher:
+ component: main
+ distributions:
+ - ubuntu-xenial/openstack/newton/holdback/${_param:apt_mk_version}
+
diff --git a/aptly/server/mirror/ubuntu/xenial/mcp/apt_mk/openstack/ocata.yml b/aptly/server/mirror/ubuntu/xenial/mcp/apt_mk/openstack/ocata.yml
new file mode 100644
index 0000000..67f11c8
--- /dev/null
+++ b/aptly/server/mirror/ubuntu/xenial/mcp/apt_mk/openstack/ocata.yml
@@ -0,0 +1,103 @@
+parameters:
+ _param:
+ apt_mk_version: stable
+
+ mirror_mirantis_openstack_ocata_xenial_source: http://apt.mirantis.com/xenial/openstack/ocata/
+ mirror_mirantis_openstack_ocata_xenial_distribution: ${_param:apt_mk_version}
+ mirror_mirantis_openstack_ocata_xenial_components: main restricted
+ mirror_mirantis_openstack_ocata_xenial_key_url: "http://apt.mirantis.com/public.gpg"
+ mirror_mirantis_openstack_ocata_xenial_gpgkeys:
+ - A76882D3
+
+ mirror_mirantis_openstack_ocata_hotfix_xenial_source: http://apt.mirantis.com/xenial/openstack/ocata/hotfix/
+ mirror_mirantis_openstack_ocata_hotfix_xenial_distribution: ${_param:apt_mk_version}
+ mirror_mirantis_openstack_ocata_hotfix_xenial_components: main restricted
+ mirror_mirantis_openstack_ocata_hotfix_xenial_key_url: "http://apt.mirantis.com/public.gpg"
+ mirror_mirantis_openstack_ocata_hotfix_xenial_gpgkeys:
+ - A76882D3
+
+ mirror_mirantis_openstack_ocata_security_xenial_source: http://apt.mirantis.com/xenial/openstack/ocata/security/
+ mirror_mirantis_openstack_ocata_security_xenial_distribution: ${_param:apt_mk_version}
+ mirror_mirantis_openstack_ocata_security_xenial_components: main restricted
+ mirror_mirantis_openstack_ocata_security_xenial_key_url: "http://apt.mirantis.com/public.gpg"
+ mirror_mirantis_openstack_ocata_security_xenial_gpgkeys:
+ - A76882D3
+
+ mirror_mirantis_openstack_ocata_updates_xenial_source: http://apt.mirantis.com/xenial/openstack/ocata/updates/
+ mirror_mirantis_openstack_ocata_updates_xenial_distribution: ${_param:apt_mk_version}
+ mirror_mirantis_openstack_ocata_updates_xenial_components: main restricted
+ mirror_mirantis_openstack_ocata_updates_xenial_key_url: "http://apt.mirantis.com/public.gpg"
+ mirror_mirantis_openstack_ocata_updates_xenial_gpgkeys:
+ - A76882D3
+
+ mirror_mirantis_openstack_ocata_holdback_xenial_source: http://apt.mirantis.com/xenial/openstack/ocata/holdback/
+ mirror_mirantis_openstack_ocata_holdback_xenial_distribution: ${_param:apt_mk_version}
+ mirror_mirantis_openstack_ocata_holdback_xenial_components: main restricted
+ mirror_mirantis_openstack_ocata_holdback_xenial_key_url: "http://apt.mirantis.com/public.gpg"
+ mirror_mirantis_openstack_ocata_holdback_xenial_gpgkeys:
+ - A76882D3
+ aptly:
+ server:
+ mirror:
+ mirantis_openstack_ocata_xenial:
+ source: ${_param:mirror_mirantis_openstack_ocata_xenial_source}
+ distribution: ${_param:mirror_mirantis_openstack_ocata_xenial_distribution}
+ components: ${_param:mirror_mirantis_openstack_ocata_xenial_components}
+ architectures: amd64
+ key_url: ${_param:mirror_mirantis_openstack_ocata_xenial_key_url}
+ gpgkeys: ${_param:mirror_mirantis_openstack_ocata_xenial_gpgkeys}
+ publisher:
+ component: main
+ distributions:
+ - ubuntu-xenial/openstack/ocata/${_param:apt_mk_version}
+
+ mirantis_openstack_ocata_hotfix_xenial:
+ source: ${_param:mirror_mirantis_openstack_ocata_hotfix_xenial_source}
+ distribution: ${_param:mirror_mirantis_openstack_ocata_hotfix_xenial_distribution}
+ components: ${_param:mirror_mirantis_openstack_ocata_hotfix_xenial_components}
+ architectures: amd64
+ key_url: ${_param:mirror_mirantis_openstack_ocata_hotfix_xenial_key_url}
+ gpgkeys: ${_param:mirror_mirantis_openstack_ocata_hotfix_xenial_gpgkeys}
+ publisher:
+ component: main
+ distributions:
+ - ubuntu-xenial/openstack/ocata/hotfix/${_param:apt_mk_version}
+
+ mirantis_openstack_ocata_security_xenial:
+ source: ${_param:mirror_mirantis_openstack_ocata_security_xenial_source}
+ distribution: ${_param:mirror_mirantis_openstack_ocata_security_xenial_distribution}
+ components: ${_param:mirror_mirantis_openstack_ocata_security_xenial_components}
+ architectures: amd64
+ key_url: ${_param:mirror_mirantis_openstack_ocata_security_xenial_key_url}
+ gpgkeys: ${_param:mirror_mirantis_openstack_ocata_security_xenial_gpgkeys}
+ publisher:
+ component: main
+ distributions:
+ - ubuntu-xenial/openstack/ocata/security/${_param:apt_mk_version}
+
+ # required for alternative horizon plugins/etc..
+ mirantis_openstack_ocata_updates_xenial:
+ source: ${_param:mirror_mirantis_openstack_ocata_updates_xenial_source}
+ distribution: ${_param:mirror_mirantis_openstack_ocata_updates_xenial_distribution}
+ components: ${_param:mirror_mirantis_openstack_ocata_updates_xenial_components}
+ architectures: amd64
+ key_url: ${_param:mirror_mirantis_openstack_ocata_updates_xenial_key_url}
+ gpgkeys: ${_param:mirror_mirantis_openstack_ocata_updates_xenial_gpgkeys}
+ publisher:
+ component: main
+ distributions:
+ - ubuntu-xenial/openstack/ocata/updates/${_param:apt_mk_version}
+
+ # required for salt formulas
+ mirantis_openstack_ocata_holdback_xenial:
+ source: ${_param:mirror_mirantis_openstack_ocata_holdback_xenial_source}
+ distribution: ${_param:mirror_mirantis_openstack_ocata_holdback_xenial_distribution}
+ components: ${_param:mirror_mirantis_openstack_ocata_holdback_xenial_components}
+ architectures: amd64
+ key_url: ${_param:mirror_mirantis_openstack_ocata_holdback_xenial_key_url}
+ gpgkeys: ${_param:mirror_mirantis_openstack_ocata_holdback_xenial_gpgkeys}
+ publisher:
+ component: main
+ distributions:
+ - ubuntu-xenial/openstack/ocata/holdback/${_param:apt_mk_version}
+
diff --git a/aptly/server/mirror/ubuntu/xenial/mcp/apt_mk/saltstack/init.yml b/aptly/server/mirror/ubuntu/xenial/mcp/apt_mk/saltstack/init.yml
new file mode 100644
index 0000000..59952be
--- /dev/null
+++ b/aptly/server/mirror/ubuntu/xenial/mcp/apt_mk/saltstack/init.yml
@@ -0,0 +1,3 @@
+classes:
+- system.aptly.server.mirror.ubuntu.xenial.mcp.apt_mk.saltstack.salt-2016-3
+- system.aptly.server.mirror.ubuntu.xenial.mcp.apt_mk.saltstack.salt-2017-7
\ No newline at end of file
diff --git a/aptly/server/mirror/ubuntu/xenial/mcp/apt_mk/saltstack/salt-2016-3.yml b/aptly/server/mirror/ubuntu/xenial/mcp/apt_mk/saltstack/salt-2016-3.yml
new file mode 100644
index 0000000..86a33e6
--- /dev/null
+++ b/aptly/server/mirror/ubuntu/xenial/mcp/apt_mk/saltstack/salt-2016-3.yml
@@ -0,0 +1,23 @@
+parameters:
+ _param:
+ apt_mk_version: stable
+ mirror_mirantis_openstack_xenial_saltstack_2016_3_source: http://apt.mirantis.com/xenial/salt/2016.3/
+ mirror_mirantis_openstack_xenial_saltstack_2016_3_distribution: ${_param:apt_mk_version}
+ mirror_mirantis_openstack_xenial_saltstack_2016_3_components: main
+ mirror_mirantis_openstack_xenial_saltstack_2016_3_key_url: "http://apt.mirantis.com/public.gpg"
+ mirror_mirantis_openstack_xenial_saltstack_2016_3_gpgkeys:
+ - A76882D3
+ aptly:
+ server:
+ mirror:
+ mirantis_openstack_xenial_saltstack_2016_3:
+ source: ${_param:mirror_mirantis_openstack_xenial_saltstack_2016_3_source}
+ distribution: ${_param:mirror_mirantis_openstack_xenial_saltstack_2016_3_distribution}
+ components: ${_param:mirror_mirantis_openstack_xenial_saltstack_2016_3_components}
+ architectures: amd64
+ key_url: ${_param:mirror_mirantis_openstack_xenial_saltstack_2016_3_key_url}
+ gpgkeys: ${_param:mirror_mirantis_openstack_xenial_saltstack_2016_3_gpgkeys}
+ publisher:
+ component: ${_param:mirror_mirantis_openstack_xenial_saltstack_2016_3_components}
+ distributions:
+ - ubuntu-xenial/salt/2016.3/${_param:apt_mk_version}
\ No newline at end of file
diff --git a/aptly/server/mirror/ubuntu/xenial/mcp/apt_mk/saltstack/salt-2017-7.yml b/aptly/server/mirror/ubuntu/xenial/mcp/apt_mk/saltstack/salt-2017-7.yml
new file mode 100644
index 0000000..0478cde
--- /dev/null
+++ b/aptly/server/mirror/ubuntu/xenial/mcp/apt_mk/saltstack/salt-2017-7.yml
@@ -0,0 +1,23 @@
+parameters:
+ _param:
+ apt_mk_version: stable
+ mirror_mirantis_openstack_xenial_saltstack_2017_7_source: http://apt.mirantis.com/xenial/salt/2017.7/
+ mirror_mirantis_openstack_xenial_saltstack_2017_7_distribution: ${_param:apt_mk_version}
+ mirror_mirantis_openstack_xenial_saltstack_2017_7_components: main
+ mirror_mirantis_openstack_xenial_saltstack_2017_7_key_url: "http://apt.mirantis.com/public.gpg"
+ mirror_mirantis_openstack_xenial_saltstack_2017_7_gpgkeys:
+ - A76882D3
+ aptly:
+ server:
+ mirror:
+ mirantis_openstack_xenial_saltstack_2017_7:
+ source: ${_param:mirror_mirantis_openstack_xenial_saltstack_2017_7_source}
+ distribution: ${_param:mirror_mirantis_openstack_xenial_saltstack_2017_7_distribution}
+ components: ${_param:mirror_mirantis_openstack_xenial_saltstack_2017_7_components}
+ architectures: amd64
+ key_url: ${_param:mirror_mirantis_openstack_xenial_saltstack_2017_7_key_url}
+ gpgkeys: ${_param:mirror_mirantis_openstack_xenial_saltstack_2017_7_gpgkeys}
+ publisher:
+ component: ${_param:mirror_mirantis_openstack_xenial_saltstack_2017_7_components}
+ distributions:
+ - ubuntu-xenial/salt/2017.7/${_param:apt_mk_version}
\ No newline at end of file
diff --git a/aptly/server/mirror/ubuntu/xenial/mcp/apt_mk/sensu.yml b/aptly/server/mirror/ubuntu/xenial/mcp/apt_mk/sensu.yml
new file mode 100644
index 0000000..505ec97
--- /dev/null
+++ b/aptly/server/mirror/ubuntu/xenial/mcp/apt_mk/sensu.yml
@@ -0,0 +1,23 @@
+parameters:
+ _param:
+ apt_mk_version: stable
+ mirror_mirantis_openstack_xenial_sensu_source: http://apt.mirantis.com/xenial/sensu/
+ mirror_mirantis_openstack_xenial_sensu_distribution: ${_param:apt_mk_version}
+ mirror_mirantis_openstack_xenial_sensu_components: main
+ mirror_mirantis_openstack_xenial_sensu_key_url: "http://apt.mirantis.com/public.gpg"
+ mirror_mirantis_openstack_xenial_sensu_gpgkeys:
+ - A76882D3
+ aptly:
+ server:
+ mirror:
+ mirantis_openstack_xenial_sensu:
+ source: ${_param:mirror_mirantis_openstack_xenial_sensu_source}
+ distribution: ${_param:mirror_mirantis_openstack_xenial_sensu_distribution}
+ components: ${_param:mirror_mirantis_openstack_xenial_sensu_components}
+ architectures: amd64
+ key_url: ${_param:mirror_mirantis_openstack_xenial_sensu_key_url}
+ gpgkeys: ${_param:mirror_mirantis_openstack_xenial_sensu_gpgkeys}
+ publisher:
+ component: ${_param:mirror_mirantis_openstack_xenial_sensu_components}
+ distributions:
+ - ubuntu-xenial/sensu/${_param:apt_mk_version}
\ No newline at end of file
diff --git a/designate/server/cluster.yml b/designate/server/cluster.yml
index eb6a5b6..1030861 100644
--- a/designate/server/cluster.yml
+++ b/designate/server/cluster.yml
@@ -4,6 +4,8 @@
- system.haproxy.proxy.listen.openstack.designate
- service.haproxy.proxy.single
parameters:
+ _param:
+ designate_admin_api_enabled: false
linux:
system:
package:
@@ -20,6 +22,9 @@
region: ${_param:openstack_region}
domain_id: ${_param:designate_domain_id}
version: ${_param:designate_version}
+ admin_api:
+ enabled: ${_param:designate_admin_api_enabled}
+ enabled_extensions_admin: quotas
database:
engine: mysql
host: ${_param:openstack_database_address}
diff --git a/designate/server/single.yml b/designate/server/single.yml
index b658f8b..765dcf8 100644
--- a/designate/server/single.yml
+++ b/designate/server/single.yml
@@ -1,6 +1,8 @@
classes:
- service.designate.server.single
parameters:
+ _param:
+ designate_admin_api_enabled: false
linux:
system:
package:
@@ -14,6 +16,9 @@
region: ${_param:openstack_region}
domain_id: ${_param:designate_domain_id}
version: ${_param:designate_version}
+ admin_api:
+ enabled: ${_param:designate_admin_api_enabled}
+ enabled_extensions_admin: quotas
bind:
api:
address: ${_param:single_address}
diff --git a/docker/client/compose/service/gerrit.yml b/docker/client/compose/service/gerrit.yml
index 183f57d..eeb126e 100644
--- a/docker/client/compose/service/gerrit.yml
+++ b/docker/client/compose/service/gerrit.yml
@@ -65,6 +65,12 @@
- 13306:3306
volumes:
- /srv/volumes/mysql:/var/lib/mysql
+ network:
+ default:
+ ipam:
+ driver: default
+ config:
+ - subnet: 172.30.0.0/24
linux:
system:
directory:
diff --git a/docker/client/compose/service/jenkins.yml b/docker/client/compose/service/jenkins.yml
index b2f4213..7db9da5 100644
--- a/docker/client/compose/service/jenkins.yml
+++ b/docker/client/compose/service/jenkins.yml
@@ -2,7 +2,7 @@
- system.docker.client.compose
parameters:
_param:
- docker_image_jenkins: tcpcloud/jenkins:2.93
+ docker_image_jenkins: tcpcloud/jenkins:2.100
jenkins_master_extra_opts: ""
jenkins_master_executors_num: 4
jenkins_master_max_concurent_requests: 40
diff --git a/docker/swarm/manager.yml b/docker/swarm/manager.yml
index 12bfc0c..3b2d916 100644
--- a/docker/swarm/manager.yml
+++ b/docker/swarm/manager.yml
@@ -11,3 +11,7 @@
master:
host: ${_param:cluster_node01_address}
port: ${_param:docker_swarm_master_port}
+ host:
+ options:
+ log-opts:
+ labels: "com.docker.stack.namespace,com.docker.swarm.service.name,com.docker.swarm.task.name"
diff --git a/docker/swarm/master.yml b/docker/swarm/master.yml
index fba9af3..d327796 100644
--- a/docker/swarm/master.yml
+++ b/docker/swarm/master.yml
@@ -7,3 +7,7 @@
swarm:
role: master
advertise_addr: ${_param:single_address}
+ host:
+ options:
+ log-opts:
+ labels: "com.docker.stack.namespace,com.docker.swarm.service.name,com.docker.swarm.task.name"
diff --git a/docker/swarm/stack/janitor_monkey.yml b/docker/swarm/stack/janitor_monkey.yml
index 2e5698a..1152841 100644
--- a/docker/swarm/stack/janitor_monkey.yml
+++ b/docker/swarm/stack/janitor_monkey.yml
@@ -33,6 +33,7 @@
username: admin
password: password
ssl_verify: False
+ endpoint_type: public
source_credentials: /srv/volumes/rundeck/storage/content/cis/openstack
service_credentials: /opt/os_creds
docker:
@@ -56,6 +57,7 @@
simianarmy.client.cloudfire.region: ${_param:janitor_monkey_cloudfire_region}
simianarmy.client.cloudfire.cis.clustername: ${_param:janitor_monkey_cis_clustername}
simianarmy.client.cloudfire.identityEndpoint: ${_param:janitor_monkey_openstack:auth_url}
+ simianarmy.client.cloudfire.identityEndpointType: ${_param:janitor_monkey_openstack:endpoint_type}
simianarmy.client.cloudfire.accountKey: ${_param:janitor_monkey_openstack:username}
simianarmy.client.cloudfire.secretKey: ${_param:janitor_monkey_openstack:password}
simianarmy.client.cloudfire.domain: ${_param:janitor_monkey_openstack:project_domain_name}
diff --git a/docker/swarm/stack/jenkins/master.yml b/docker/swarm/stack/jenkins/master.yml
index 73a4b30..d08bf71 100644
--- a/docker/swarm/stack/jenkins/master.yml
+++ b/docker/swarm/stack/jenkins/master.yml
@@ -2,7 +2,7 @@
- system.docker
parameters:
_param:
- docker_image_jenkins: tcpcloud/jenkins:2.93
+ docker_image_jenkins: tcpcloud/jenkins:2.100
jenkins_master_extra_opts: ""
jenkins_master_executors_num: 4
jenkins_master_max_concurent_requests: 40
diff --git a/docker/swarm/stack/monitoring/init.yml b/docker/swarm/stack/monitoring/init.yml
index 6efe125..925a10a 100644
--- a/docker/swarm/stack/monitoring/init.yml
+++ b/docker/swarm/stack/monitoring/init.yml
@@ -116,8 +116,5 @@
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}
PROMETHEUS_EXTERNAL_URL: "http://${_param:stacklight_monitor_address}:15010"
diff --git a/docker/swarm/stack/rundeck.yml b/docker/swarm/stack/rundeck.yml
index 8ab0554..88693be 100644
--- a/docker/swarm/stack/rundeck.yml
+++ b/docker/swarm/stack/rundeck.yml
@@ -25,6 +25,7 @@
- /srv/volumes/rundeck/etc/realm.properties:/etc/rundeck/realm.properties
- /srv/volumes/rundeck/etc/rundeck-config.properties:/etc/rundeck/rundeck-config.properties
- /srv/volumes/rundeck/rundeck:/var/rundeck
+ - /srv/volumes/rundeck/data:/var/lib/rundeck/data
- /srv/volumes/rundeck/log:/var/log/rundeck
- /srv/volumes/rundeck/logs:/var/lib/rundeck/logs
- /srv/volumes/rundeck/plugins:/opt/rundeck-plugins
diff --git a/elasticsearch/client/index/janitor_monkey.yml b/elasticsearch/client/index/cis_openstack.yml
similarity index 92%
rename from elasticsearch/client/index/janitor_monkey.yml
rename to elasticsearch/client/index/cis_openstack.yml
index bef92ae..3136f73 100644
--- a/elasticsearch/client/index/janitor_monkey.yml
+++ b/elasticsearch/client/index/cis_openstack.yml
@@ -7,9 +7,9 @@
index:
cis-openstack:
enabled: true
- force_operation: true
+ force_operation: false
definition:
template: cis-openstack
settings:
number_of_shards: ${_param:janitor_monkey_cis_openstack_shards}
- number_of_replicas: ${_param:janitor_monkey_cis_openstack_replicas}
\ No newline at end of file
+ number_of_replicas: ${_param:janitor_monkey_cis_openstack_replicas}
diff --git a/elasticsearch/client/index/pushkin.yml b/elasticsearch/client/index/pushkin.yml
index 1d17c77..668a770 100644
--- a/elasticsearch/client/index/pushkin.yml
+++ b/elasticsearch/client/index/pushkin.yml
@@ -7,7 +7,7 @@
index:
notifications:
enabled: true
- force_operation: true
+ force_operation: false
definition:
template: notifications
settings:
@@ -39,4 +39,4 @@
fields:
keyword:
type: keyword
- ignore_above: 256
\ No newline at end of file
+ ignore_above: 256
diff --git a/elasticsearch/server/cluster.yml b/elasticsearch/server/cluster.yml
index 94b6d85..1bbe404 100644
--- a/elasticsearch/server/cluster.yml
+++ b/elasticsearch/server/cluster.yml
@@ -6,7 +6,7 @@
java_environment_version: "8"
java_environment_platform: openjdk
elasticsearch_cluster_name: elasticsearch
- elasticsearch_version: 2
+ elasticsearch_version: 5
linux:
system:
sysctl:
diff --git a/elasticsearch/server/single.yml b/elasticsearch/server/single.yml
index ce7da36..419513d 100644
--- a/elasticsearch/server/single.yml
+++ b/elasticsearch/server/single.yml
@@ -3,7 +3,7 @@
- service.elasticsearch.server.single
parameters:
_param:
- elasticsearch_version: 2
+ elasticsearch_version: 5
linux:
system:
sysctl:
diff --git a/fluentd/label/default_output/drop_event.yml b/fluentd/label/default_output/drop_event.yml
new file mode 100644
index 0000000..295862c
--- /dev/null
+++ b/fluentd/label/default_output/drop_event.yml
@@ -0,0 +1,17 @@
+agent:
+ config:
+ label:
+ default_output:
+ filter:
+ drop_event:
+ tag: '**'
+ type: grep
+ exclude:
+ - name: drop_event
+ regexp: ^.+?$
+ remove_drop_event_key:
+ require:
+ - drop_event
+ tag: '**'
+ type: record_transformer
+ remove_keys: drop_event
diff --git a/gerrit/client/init.yml b/gerrit/client/init.yml
index 5456900..8b097ee 100644
--- a/gerrit/client/init.yml
+++ b/gerrit/client/init.yml
@@ -7,8 +7,6 @@
client:
enabled: True
try_login: ${_param:gerrit_try_login}
- source:
- engine: pip
dir:
git: /srv/volumes/gerrit/git
gerrit_config: /srv/volumes/gerrit/etc/gerrit.config
diff --git a/gerrit/server/single.yml b/gerrit/server/single.yml
index 952e82e..c279f00 100644
--- a/gerrit/server/single.yml
+++ b/gerrit/server/single.yml
@@ -38,6 +38,11 @@
hash: sha256=45786a920a929c6258de6461bcf03ddec8925577bd485905f102ceb6e5e1e47c
# address: https://gerrit-ci.gerritforge.com/job/Gerrit-stable-2.13/20/artifact/buck-out/gen/gerrit.war
# hash: md5=2e17064b8742c4622815593ec496c571
+ receive_timeout: 5min
+ sshd:
+ threads: 64
+ batch_threads: 16
+ max_connections_per_user: 64
database:
engine: postgresql
host: localhost
@@ -45,6 +50,10 @@
name: gerrit
user: gerrit
password: ${_param:postgresql_gerrit_password}
+ pool_limit: 250
+ pool_max_idle: 16
+ change_cleanup:
+ abandon_after: 3months
postgresql:
server:
version: "9.5"
diff --git a/haproxy/proxy/listen/openstack/aodh.yml b/haproxy/proxy/listen/openstack/aodh.yml
index 6b024aa..acd6340 100644
--- a/haproxy/proxy/listen/openstack/aodh.yml
+++ b/haproxy/proxy/listen/openstack/aodh.yml
@@ -9,15 +9,15 @@
- address: ${_param:cluster_vip_address}
port: 8042
servers:
- - name: ctl01
+ - name: ${_param:cluster_node01_hostname}
host: ${_param:cluster_node01_address}
port: 8042
params: check inter 10s fastinter 2s downinter 3s rise 3 fall 3
- - name: ctl02
+ - name: ${_param:cluster_node02_hostname}
host: ${_param:cluster_node02_address}
port: 8042
params: check inter 10s fastinter 2s downinter 3s rise 3 fall 3
- - name: ctl03
+ - name: ${_param:cluster_node03_hostname}
host: ${_param:cluster_node03_address}
port: 8042
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/barbican.yml b/haproxy/proxy/listen/openstack/barbican.yml
index 04251d9..c1f9877 100644
--- a/haproxy/proxy/listen/openstack/barbican.yml
+++ b/haproxy/proxy/listen/openstack/barbican.yml
@@ -9,15 +9,15 @@
- address: ${_param:cluster_vip_address}
port: 9311
servers:
- - name: ctl01
+ - name: ${_param:cluster_node01_hostname}
host: ${_param:cluster_node01_address}
port: 9311
params: check inter 10s fastinter 2s downinter 3s rise 3 fall 3
- - name: ctl02
+ - name: ${_param:cluster_node02_hostname}
host: ${_param:cluster_node02_address}
port: 9311
params: check inter 10s fastinter 2s downinter 3s rise 3 fall 3
- - name: ctl03
+ - name: ${_param:cluster_node03_hostname}
host: ${_param:cluster_node03_address}
port: 9311
params: check inter 10s fastinter 2s downinter 3s rise 3 fall 3
@@ -28,15 +28,15 @@
- address: ${_param:cluster_vip_address}
port: 9312
servers:
- - name: ctl01
+ - name: ${_param:cluster_node01_hostname}
host: ${_param:cluster_node01_address}
port: 9312
params: check inter 10s fastinter 2s downinter 3s rise 3 fall 3
- - name: ctl02
+ - name: ${_param:cluster_node02_hostname}
host: ${_param:cluster_node02_address}
port: 9312
params: check inter 10s fastinter 2s downinter 3s rise 3 fall 3
- - name: ctl03
+ - name: ${_param:cluster_node03_hostname}
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/cinder.yml b/haproxy/proxy/listen/openstack/cinder.yml
index a693e6e..c0bb7be 100644
--- a/haproxy/proxy/listen/openstack/cinder.yml
+++ b/haproxy/proxy/listen/openstack/cinder.yml
@@ -9,15 +9,15 @@
- address: ${_param:cluster_vip_address}
port: 8776
servers:
- - name: ctl01
+ - name: ${_param:cluster_node01_hostname}
host: ${_param:cluster_node01_address}
port: 8776
params: check inter 10s fastinter 2s downinter 3s rise 3 fall 3
- - name: ctl02
+ - name: ${_param:cluster_node02_hostname}
host: ${_param:cluster_node02_address}
port: 8776
params: check inter 10s fastinter 2s downinter 3s rise 3 fall 3
- - name: ctl03
+ - name: ${_param:cluster_node03_hostname}
host: ${_param:cluster_node03_address}
port: 8776
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/glance.yml b/haproxy/proxy/listen/openstack/glance.yml
index 729cc5b..144fd4e 100644
--- a/haproxy/proxy/listen/openstack/glance.yml
+++ b/haproxy/proxy/listen/openstack/glance.yml
@@ -9,15 +9,15 @@
- address: ${_param:cluster_vip_address}
port: 9292
servers:
- - name: ctl01
+ - name: ${_param:cluster_node01_hostname}
host: ${_param:cluster_node01_address}
port: 9292
params: check inter 10s fastinter 2s downinter 3s rise 3 fall 3
- - name: ctl02
+ - name: ${_param:cluster_node02_hostname}
host: ${_param:cluster_node02_address}
port: 9292
params: check inter 10s fastinter 2s downinter 3s rise 3 fall 3
- - name: ctl03
+ - name: ${_param:cluster_node03_hostname}
host: ${_param:cluster_node03_address}
port: 9292
params: check inter 10s fastinter 2s downinter 3s rise 3 fall 3
@@ -28,15 +28,15 @@
- address: ${_param:cluster_vip_address}
port: 9191
servers:
- - name: ctl01
+ - name: ${_param:cluster_node01_hostname}
host: ${_param:cluster_node01_address}
port: 9191
params: check
- - name: ctl02
+ - name: ${_param:cluster_node02_hostname}
host: ${_param:cluster_node02_address}
port: 9191
params: check
- - name: ctl03
+ - name: ${_param:cluster_node03_hostname}
host: ${_param:cluster_node03_address}
port: 9191
params: check
diff --git a/haproxy/proxy/listen/openstack/glare.yml b/haproxy/proxy/listen/openstack/glare.yml
index a984275..36a6337 100644
--- a/haproxy/proxy/listen/openstack/glare.yml
+++ b/haproxy/proxy/listen/openstack/glare.yml
@@ -9,15 +9,15 @@
- address: ${_param:cluster_vip_address}
port: 9494
servers:
- - name: ctl01
+ - name: ${_param:cluster_node01_hostname}
host: ${_param:cluster_node01_address}
port: 9494
params: check inter 10s fastinter 2s downinter 3s rise 3 fall 3
- - name: ctl02
+ - name: ${_param:cluster_node02_hostname}
host: ${_param:cluster_node02_address}
port: 9494
params: check inter 10s fastinter 2s downinter 3s rise 3 fall 3
- - name: ctl03
+ - name: ${_param:cluster_node03_hostname}
host: ${_param:cluster_node03_address}
port: 9494
params: check inter 10s fastinter 2s downinter 3s rise 3 fall 3
diff --git a/haproxy/proxy/listen/openstack/heat.yml b/haproxy/proxy/listen/openstack/heat.yml
index 2e6b918..50595ea 100644
--- a/haproxy/proxy/listen/openstack/heat.yml
+++ b/haproxy/proxy/listen/openstack/heat.yml
@@ -9,15 +9,15 @@
- address: ${_param:cluster_vip_address}
port: 8003
servers:
- - name: ctl01
+ - name: ${_param:cluster_node01_hostname}
host: ${_param:cluster_node01_address}
port: 8003
params: check inter 10s fastinter 2s downinter 3s rise 3 fall 3
- - name: ctl02
+ - name: ${_param:cluster_node02_hostname}
host: ${_param:cluster_node02_address}
port: 8003
params: check inter 10s fastinter 2s downinter 3s rise 3 fall 3
- - name: ctl03
+ - name: ${_param:cluster_node03_hostname}
host: ${_param:cluster_node03_address}
port: 8003
params: check inter 10s fastinter 2s downinter 3s rise 3 fall 3
@@ -28,15 +28,15 @@
- address: ${_param:cluster_vip_address}
port: 8004
servers:
- - name: ctl01
+ - name: ${_param:cluster_node01_hostname}
host: ${_param:cluster_node01_address}
port: 8004
params: check inter 10s fastinter 2s downinter 3s rise 3 fall 3
- - name: ctl02
+ - name: ${_param:cluster_node02_hostname}
host: ${_param:cluster_node02_address}
port: 8004
params: check inter 10s fastinter 2s downinter 3s rise 3 fall 3
- - name: ctl03
+ - name: ${_param:cluster_node03_hostname}
host: ${_param:cluster_node03_address}
port: 8004
params: check inter 10s fastinter 2s downinter 3s rise 3 fall 3
@@ -47,15 +47,15 @@
- address: ${_param:cluster_vip_address}
port: 8000
servers:
- - name: ctl01
+ - name: ${_param:cluster_node01_hostname}
host: ${_param:cluster_node01_address}
port: 8000
params: check inter 10s fastinter 2s downinter 3s rise 3 fall 3
- - name: ctl02
+ - name: ${_param:cluster_node02_hostname}
host: ${_param:cluster_node02_address}
port: 8000
params: check inter 10s fastinter 2s downinter 3s rise 3 fall 3
- - name: ctl03
+ - name: ${_param:cluster_node03_hostname}
host: ${_param:cluster_node03_address}
port: 8000
params: check inter 10s fastinter 2s downinter 3s rise 3 fall 3
diff --git a/haproxy/proxy/listen/openstack/horizon.yml b/haproxy/proxy/listen/openstack/horizon.yml
index 9bf838c..14f5c2b 100644
--- a/haproxy/proxy/listen/openstack/horizon.yml
+++ b/haproxy/proxy/listen/openstack/horizon.yml
@@ -9,15 +9,15 @@
- address: ${_param:cluster_vip_address}
port: 8078
servers:
- - name: ctl01
+ - name: ${_param:cluster_node01_hostname}
host: ${_param:cluster_node01_address}
port: 8078
params: check
- - name: ctl02
+ - name: ${_param:cluster_node02_hostname}
host: ${_param:cluster_node02_address}
port: 8078
params: check
- - name: ctl03
+ - name: ${_param:cluster_node03_hostname}
host: ${_param:cluster_node03_address}
port: 8078
params: check
\ No newline at end of file
diff --git a/haproxy/proxy/listen/openstack/ironic.yml b/haproxy/proxy/listen/openstack/ironic.yml
index 221a9cc..1713085 100644
--- a/haproxy/proxy/listen/openstack/ironic.yml
+++ b/haproxy/proxy/listen/openstack/ironic.yml
@@ -10,15 +10,15 @@
- address: ${_param:cluster_vip_address}
port: 6385
servers:
- - name: ctl01
+ - name: ${_param:cluster_node01_hostname}
host: ${_param:cluster_node01_address}
port: 6385
params: check
- - name: ctl02
+ - name: ${_param:cluster_node02_hostname}
host: ${_param:cluster_node02_address}
port: 6385
params: check
- - name: ctl03
+ - name: ${_param:cluster_node03_hostname}
host: ${_param:cluster_node03_address}
port: 6385
params: check
diff --git a/haproxy/proxy/listen/openstack/keystone/init.yml b/haproxy/proxy/listen/openstack/keystone/init.yml
index 4359f60..32f776e 100644
--- a/haproxy/proxy/listen/openstack/keystone/init.yml
+++ b/haproxy/proxy/listen/openstack/keystone/init.yml
@@ -7,15 +7,15 @@
- address: ${_param:cluster_vip_address}
port: 5000
servers:
- - name: ctl01
+ - name: ${_param:cluster_node01_hostname}
host: ${_param:cluster_node01_address}
port: 5000
params: check inter 10s fastinter 2s downinter 3s rise 3 fall 3
- - name: ctl02
+ - name: ${_param:cluster_node02_hostname}
host: ${_param:cluster_node02_address}
port: 5000
params: check inter 10s fastinter 2s downinter 3s rise 3 fall 3
- - name: ctl03
+ - name: ${_param:cluster_node03_hostname}
host: ${_param:cluster_node03_address}
port: 5000
params: check inter 10s fastinter 2s downinter 3s rise 3 fall 3
@@ -24,15 +24,15 @@
- address: ${_param:cluster_vip_address}
port: 35357
servers:
- - name: ctl01
+ - name: ${_param:cluster_node01_hostname}
host: ${_param:cluster_node01_address}
port: 35357
params: check inter 10s fastinter 2s downinter 3s rise 3 fall 3
- - name: ctl02
+ - name: ${_param:cluster_node02_hostname}
host: ${_param:cluster_node02_address}
port: 35357
params: check inter 10s fastinter 2s downinter 3s rise 3 fall 3
- - name: ctl03
+ - name: ${_param:cluster_node03_hostname}
host: ${_param:cluster_node03_address}
port: 35357
params: check inter 10s fastinter 2s downinter 3s rise 3 fall 3
diff --git a/haproxy/proxy/listen/openstack/neutron.yml b/haproxy/proxy/listen/openstack/neutron.yml
index 1f8b4d5..29bd548 100644
--- a/haproxy/proxy/listen/openstack/neutron.yml
+++ b/haproxy/proxy/listen/openstack/neutron.yml
@@ -9,15 +9,15 @@
- address: ${_param:cluster_vip_address}
port: 9696
servers:
- - name: ctl01
+ - name: ${_param:cluster_node01_hostname}
host: ${_param:cluster_node01_address}
port: 9696
params: check inter 10s fastinter 2s downinter 3s rise 3 fall 3
- - name: ctl02
+ - name: ${_param:cluster_node02_hostname}
host: ${_param:cluster_node02_address}
port: 9696
params: check inter 10s fastinter 2s downinter 3s rise 3 fall 3
- - name: ctl03
+ - name: ${_param:cluster_node03_hostname}
host: ${_param:cluster_node03_address}
port: 9696
params: check inter 10s fastinter 2s downinter 3s rise 3 fall 3
\ No newline at end of file
diff --git a/haproxy/proxy/listen/openstack/nova-placement.yml b/haproxy/proxy/listen/openstack/nova-placement.yml
index e3b72b7..9fec963 100644
--- a/haproxy/proxy/listen/openstack/nova-placement.yml
+++ b/haproxy/proxy/listen/openstack/nova-placement.yml
@@ -15,15 +15,15 @@
options:
- expect status 401
servers:
- - name: ctl01
+ - name: ${_param:cluster_node01_hostname}
host: ${_param:cluster_node01_address}
port: 8778
params: check inter 10s fastinter 2s downinter 3s rise 3 fall 3
- - name: ctl02
+ - name: ${_param:cluster_node02_hostname}
host: ${_param:cluster_node02_address}
port: 8778
params: check inter 10s fastinter 2s downinter 3s rise 3 fall 3
- - name: ctl03
+ - name: ${_param:cluster_node03_hostname}
host: ${_param:cluster_node03_address}
port: 8778
params: check inter 10s fastinter 2s downinter 3s rise 3 fall 3
diff --git a/haproxy/proxy/listen/openstack/nova.yml b/haproxy/proxy/listen/openstack/nova.yml
index efffee0..1e090ef 100644
--- a/haproxy/proxy/listen/openstack/nova.yml
+++ b/haproxy/proxy/listen/openstack/nova.yml
@@ -9,15 +9,15 @@
- address: ${_param:cluster_vip_address}
port: 8774
servers:
- - name: ctl01
+ - name: ${_param:cluster_node01_hostname}
host: ${_param:cluster_node01_address}
port: 8774
params: check inter 10s fastinter 2s downinter 3s rise 3 fall 3
- - name: ctl02
+ - name: ${_param:cluster_node02_hostname}
host: ${_param:cluster_node02_address}
port: 8774
params: check inter 10s fastinter 2s downinter 3s rise 3 fall 3
- - name: ctl03
+ - name: ${_param:cluster_node03_hostname}
host: ${_param:cluster_node03_address}
port: 8774
params: check inter 10s fastinter 2s downinter 3s rise 3 fall 3
@@ -27,15 +27,15 @@
- address: ${_param:cluster_vip_address}
port: 8775
servers:
- - name: ctl01
+ - name: ${_param:cluster_node01_hostname}
host: ${_param:cluster_node01_address}
port: 8775
params: check inter 10s fastinter 2s downinter 3s rise 3 fall 3
- - name: ctl02
+ - name: ${_param:cluster_node02_hostname}
host: ${_param:cluster_node02_address}
port: 8775
params: check inter 10s fastinter 2s downinter 3s rise 3 fall 3
- - name: ctl03
+ - name: ${_param:cluster_node03_hostname}
host: ${_param:cluster_node03_address}
port: 8775
params: check inter 10s fastinter 2s downinter 3s rise 3 fall 3
diff --git a/haproxy/proxy/listen/openstack/novnc.yml b/haproxy/proxy/listen/openstack/novnc.yml
index 78b7d98..40b9d9c 100644
--- a/haproxy/proxy/listen/openstack/novnc.yml
+++ b/haproxy/proxy/listen/openstack/novnc.yml
@@ -10,15 +10,15 @@
- address: ${_param:cluster_vip_address}
port: 6080
servers:
- - name: ctl01
+ - name: ${_param:cluster_node01_hostname}
host: ${_param:cluster_node01_address}
port: 6080
params: check
- - name: ctl02
+ - name: ${_param:cluster_node02_hostname}
host: ${_param:cluster_node02_address}
port: 6080
params: check
- - name: ctl03
+ - name: ${_param:cluster_node03_hostname}
host: ${_param:cluster_node03_address}
port: 6080
params: check
diff --git a/haproxy/proxy/listen/openstack/octavia.yml b/haproxy/proxy/listen/openstack/octavia.yml
index 7360557..c2b8e6d 100644
--- a/haproxy/proxy/listen/openstack/octavia.yml
+++ b/haproxy/proxy/listen/openstack/octavia.yml
@@ -9,15 +9,15 @@
- address: ${_param:cluster_vip_address}
port: 9876
servers:
- - name: ctl01
+ - name: ${_param:cluster_node01_hostname}
host: ${_param:cluster_node01_address}
port: 9876
params: check inter 10s fastinter 2s downinter 3s rise 3 fall 3
- - name: ctl02
+ - name: ${_param:cluster_node02_hostname}
host: ${_param:cluster_node02_address}
port: 9876
params: check inter 10s fastinter 2s downinter 3s rise 3 fall 3
- - name: ctl03
+ - name: ${_param:cluster_node03_hostname}
host: ${_param:cluster_node03_address}
port: 9876
params: check inter 10s fastinter 2s downinter 3s rise 3 fall 3
diff --git a/haproxy/proxy/listen/openstack/sahara.yml b/haproxy/proxy/listen/openstack/sahara.yml
index 3bbf809..335c4f6 100644
--- a/haproxy/proxy/listen/openstack/sahara.yml
+++ b/haproxy/proxy/listen/openstack/sahara.yml
@@ -10,15 +10,15 @@
- address: ${_param:cluster_vip_address}
port: 8386
servers:
- - name: ctl01
+ - name: ${_param:cluster_node01_hostname}
host: ${_param:cluster_node01_address}
port: 8386
params: check inter 10s fastinter 2s downinter 3s rise 3 fall 3
- - name: ctl02
+ - name: ${_param:cluster_node02_hostname}
host: ${_param:cluster_node02_address}
port: 8386
params: check inter 10s fastinter 2s downinter 3s rise 3 fall 3
- - name: ctl03
+ - name: ${_param:cluster_node03_hostname}
host: ${_param:cluster_node03_address}
port: 8386
params: check inter 10s fastinter 2s downinter 3s rise 3 fall 3
diff --git a/jenkins/client/init.yml b/jenkins/client/init.yml
index 5de6055..e4a3fcd 100644
--- a/jenkins/client/init.yml
+++ b/jenkins/client/init.yml
@@ -9,6 +9,7 @@
jenkins_master_host: ${_param:control_vip_address}
jenkins_master_port: 8081
jenkins_aptly_storages: "local"
+ jenkins_pipelines_branch: "master"
jenkins:
client:
master:
diff --git a/jenkins/client/job/aptly.yml b/jenkins/client/job/aptly.yml
index 921e9bc..2ac90bb 100644
--- a/jenkins/client/job/aptly.yml
+++ b/jenkins/client/job/aptly.yml
@@ -63,6 +63,7 @@
scm:
type: git
url: "${_param:jenkins_gerrit_url}/mk/mk-pipelines"
+ branch: "${_param:jenkins_pipelines_branch}"
credentials: "gerrit"
script: aptly-promote-pipeline.groovy
param:
@@ -119,6 +120,7 @@
scm:
type: git
url: "${_param:jenkins_gerrit_url}/mk/mk-pipelines"
+ branch: "${_param:jenkins_pipelines_branch}"
credentials: "gerrit"
script: aptly-promote-pipeline.groovy
param:
diff --git a/jenkins/client/job/ceph/add-node.yml b/jenkins/client/job/ceph/add-node.yml
index 9fee51e..29af563 100644
--- a/jenkins/client/job/ceph/add-node.yml
+++ b/jenkins/client/job/ceph/add-node.yml
@@ -12,6 +12,7 @@
scm:
type: git
url: "${_param:jenkins_gerrit_url}/mk/mk-pipelines"
+ branch: "${_param:jenkins_pipelines_branch}"
credentials: "gerrit"
script: ceph-add-node.groovy
param:
diff --git a/jenkins/client/job/ceph/backend-migration.yml b/jenkins/client/job/ceph/backend-migration.yml
index a8736a2..ab3f639 100644
--- a/jenkins/client/job/ceph/backend-migration.yml
+++ b/jenkins/client/job/ceph/backend-migration.yml
@@ -12,6 +12,7 @@
scm:
type: git
url: "${_param:jenkins_gerrit_url}/mk/mk-pipelines"
+ branch: "${_param:jenkins_pipelines_branch}"
credentials: "gerrit"
script: ceph-backend-migration.groovy
param:
diff --git a/jenkins/client/job/ceph/remove-node.yml b/jenkins/client/job/ceph/remove-node.yml
index 4a5efe3..af678b5 100644
--- a/jenkins/client/job/ceph/remove-node.yml
+++ b/jenkins/client/job/ceph/remove-node.yml
@@ -12,6 +12,7 @@
scm:
type: git
url: "${_param:jenkins_gerrit_url}/mk/mk-pipelines"
+ branch: "${_param:jenkins_pipelines_branch}"
credentials: "gerrit"
script: ceph-remove-node.groovy
param:
diff --git a/jenkins/client/job/ceph/remove-osd.yml b/jenkins/client/job/ceph/remove-osd.yml
index af3b9ed..0a5801d 100644
--- a/jenkins/client/job/ceph/remove-osd.yml
+++ b/jenkins/client/job/ceph/remove-osd.yml
@@ -12,6 +12,7 @@
scm:
type: git
url: "${_param:jenkins_gerrit_url}/mk/mk-pipelines"
+ branch: "${_param:jenkins_pipelines_branch}"
credentials: "gerrit"
script: ceph-remove-osd.groovy
param:
diff --git a/jenkins/client/job/ceph/replace-failed-osd.yml b/jenkins/client/job/ceph/replace-failed-osd.yml
index 775915f..43c2f0b 100644
--- a/jenkins/client/job/ceph/replace-failed-osd.yml
+++ b/jenkins/client/job/ceph/replace-failed-osd.yml
@@ -12,6 +12,7 @@
scm:
type: git
url: "${_param:jenkins_gerrit_url}/mk/mk-pipelines"
+ branch: "${_param:jenkins_pipelines_branch}"
credentials: "gerrit"
script: ceph-replace-failed-osd.groovy
param:
diff --git a/jenkins/client/job/ceph/upgrade.yml b/jenkins/client/job/ceph/upgrade.yml
index 9b58f3b..7717761 100644
--- a/jenkins/client/job/ceph/upgrade.yml
+++ b/jenkins/client/job/ceph/upgrade.yml
@@ -12,6 +12,7 @@
scm:
type: git
url: "${_param:jenkins_gerrit_url}/mk/mk-pipelines"
+ branch: "${_param:jenkins_pipelines_branch}"
credentials: "gerrit"
script: ceph-upgrade.groovy
param:
@@ -71,4 +72,4 @@
BACKUP_ENABLED:
type: boolean
default: 'true'
- description: Set to True if disks of Ceph VMs should be copied before upgrade
+ description: Select to copy the disks of Ceph VMs before upgrade and backup Ceph directories on OSD nodes.
diff --git a/jenkins/client/job/debian/packages/extra.yml b/jenkins/client/job/debian/packages/extra.yml
index 13ee191..61d7ee2 100644
--- a/jenkins/client/job/debian/packages/extra.yml
+++ b/jenkins/client/job/debian/packages/extra.yml
@@ -148,11 +148,11 @@
- package: telegraf
dist: trusty
build: telegraf
- branch: release-1.2
+ branch: release-1.5
- package: telegraf
dist: xenial
build: telegraf
- branch: release-1.2
+ branch: release-1.5
- package: libvirt-exporter
dist: xenial
build: libvirt-exporter
@@ -189,12 +189,29 @@
dist: xenial
build: pipeline
branch: debian/xenial
+ - package: gerritlib
+ dist: xenial
+ build: pipeline
+ branch: debian/xenial
+ - package: python-pygerrit2
+ dist: xenial
+ build: pipeline
+ branch: debian/xenial
+ - package: jeepyb
+ dist: xenial
+ build: pipeline
+ branch: debian/xenial
+ - package: salt-pepper
+ dist: xenial
+ build: pipeline
+ branch: debian/xenial
template:
type: workflow-scm
concurrent: false
scm:
type: git
url: "${_param:jenkins_gerrit_url}/mk/mk-pipelines"
+ branch: "${_param:jenkins_pipelines_branch}"
credentials: "gerrit"
script: build-debian-packages-{{build}}.groovy
trigger:
diff --git a/jenkins/client/job/debian/packages/heat/resources.yml b/jenkins/client/job/debian/packages/heat/resources.yml
index 73cceb5..92bdbe0 100644
--- a/jenkins/client/job/debian/packages/heat/resources.yml
+++ b/jenkins/client/job/debian/packages/heat/resources.yml
@@ -26,6 +26,7 @@
scm:
type: git
url: "${_param:jenkins_gerrit_url}/mk/mk-pipelines"
+ branch: "${_param:jenkins_pipelines_branch}"
credentials: "gerrit"
script: build-debian-packages-pipeline.groovy
trigger:
diff --git a/jenkins/client/job/debian/packages/horizon/modules.yml b/jenkins/client/job/debian/packages/horizon/modules.yml
index 4fe4966..ebf3b21 100644
--- a/jenkins/client/job/debian/packages/horizon/modules.yml
+++ b/jenkins/client/job/debian/packages/horizon/modules.yml
@@ -160,6 +160,7 @@
scm:
type: git
url: "${_param:jenkins_gerrit_url}/mk/mk-pipelines"
+ branch: "${_param:jenkins_pipelines_branch}"
credentials: "gerrit"
script: build-debian-packages-pipeline.groovy
trigger:
diff --git a/jenkins/client/job/debian/packages/horizon/themes.yml b/jenkins/client/job/debian/packages/horizon/themes.yml
index a26977f..dbaab83 100644
--- a/jenkins/client/job/debian/packages/horizon/themes.yml
+++ b/jenkins/client/job/debian/packages/horizon/themes.yml
@@ -40,6 +40,7 @@
scm:
type: git
url: "${_param:jenkins_gerrit_url}/mk/mk-pipelines"
+ branch: "${_param:jenkins_pipelines_branch}"
credentials: "gerrit"
script: build-debian-packages-pipeline.groovy
trigger:
@@ -94,4 +95,4 @@
default: "amd64"
UPLOAD_APTLY:
type: boolean
- default: 'true'
\ No newline at end of file
+ default: 'true'
diff --git a/jenkins/client/job/debian/packages/salt-multi.yml b/jenkins/client/job/debian/packages/salt-multi.yml
index 322afde..90e6f02 100644
--- a/jenkins/client/job/debian/packages/salt-multi.yml
+++ b/jenkins/client/job/debian/packages/salt-multi.yml
@@ -56,6 +56,9 @@
- name: kubernetes
upload_source_package: true
dist: xenial
+ - name: mirascan
+ upload_source_package: true
+ dist: xenial
- name: neutron
upload_source_package: true
dist: xenial
@@ -76,6 +79,7 @@
scm:
type: git
url: "${_param:jenkins_gerrit_url}/mk/mk-pipelines"
+ branch: "${_param:jenkins_pipelines_branch}"
credentials: "gerrit"
script: build-debian-packages-pipeline.groovy
trigger:
diff --git a/jenkins/client/job/debian/packages/salt.yml b/jenkins/client/job/debian/packages/salt.yml
index 74665e7..7b0dc68 100644
--- a/jenkins/client/job/debian/packages/salt.yml
+++ b/jenkins/client/job/debian/packages/salt.yml
@@ -266,6 +266,9 @@
- name: rundeck
upload_source_package: false
dist: trusty
+ - name: runtest
+ upload_source_package: false
+ dist: trusty
- name: sahara
upload_source_package: false
dist: trusty
@@ -395,6 +398,9 @@
- name: fluentbit
upload_source_package: true
dist: xenial
+ - name: fluentd
+ upload_source_package: true
+ dist: xenial
- name: foreman
upload_source_package: true
dist: xenial
@@ -581,6 +587,9 @@
- name: rsyslog
upload_source_package: true
dist: xenial
+ - name: runtest
+ upload_source_package: true
+ dist: xenial
- name: sahara
upload_source_package: true
dist: xenial
@@ -637,6 +646,7 @@
scm:
type: git
url: "${_param:jenkins_gerrit_url}/mk/mk-pipelines"
+ branch: "${_param:jenkins_pipelines_branch}"
credentials: "gerrit"
script: build-debian-packages-pipeline.groovy
trigger:
diff --git a/jenkins/client/job/debian/packages/testing.yml b/jenkins/client/job/debian/packages/testing.yml
index c7ecf98..f150f80 100644
--- a/jenkins/client/job/debian/packages/testing.yml
+++ b/jenkins/client/job/debian/packages/testing.yml
@@ -17,6 +17,7 @@
scm:
type: git
url: "${_param:jenkins_gerrit_url}/mk/mk-pipelines"
+ branch: "${_param:jenkins_pipelines_branch}"
credentials: "gerrit"
script: build-debian-packages-{{build}}.groovy
trigger:
diff --git a/jenkins/client/job/deploy/k8s_control.yml b/jenkins/client/job/deploy/k8s_control.yml
index 7e915c2..f851176 100644
--- a/jenkins/client/job/deploy/k8s_control.yml
+++ b/jenkins/client/job/deploy/k8s_control.yml
@@ -13,6 +13,7 @@
scm:
type: git
url: "${_param:jenkins_gerrit_url}/mk/mk-pipelines"
+ branch: "${_param:jenkins_pipelines_branch}"
credentials: "gerrit"
script: deploy-k8s-deployments.groovy
param:
diff --git a/jenkins/client/job/deploy/kqueen.yml b/jenkins/client/job/deploy/kqueen.yml
new file mode 100644
index 0000000..817eb8f
--- /dev/null
+++ b/jenkins/client/job/deploy/kqueen.yml
@@ -0,0 +1,61 @@
+parameters:
+ jenkins:
+ client:
+ job:
+ deploy_aws_k8s_kqueen_job:
+ name: deploy-aws-k8s-kqueen
+ type: workflow-scm
+ discard:
+ build:
+ keep_num: 20
+ concurrent: true
+ display_name: "Deploy AWS K8S using kqueen"
+ scm:
+ type: git
+ url: "${_param:jenkins_gerrit_url}/mk/mk-pipelines"
+ branch: "${_param:jenkins_pipelines_branch}"
+ credentials: "gerrit"
+ script: deploy-aws-k8s-kqueen-pipeline.groovy
+ param:
+ # deployments
+ STACK_NAME:
+ type: string
+ description: "AWS stack name - mandatory param, will be used as is"
+ STACK_COMPUTE_COUNT:
+ type: string
+ default: '2'
+
+ STACK_TEMPLATE:
+ type: string
+ default: "k8s_ha_calico_sm"
+ STACK_TEMPLATE_URL:
+ type: string
+ default: "${_param:jenkins_gerrit_url}/mk/heat-templates"
+ STACK_TEMPLATE_CREDENTIALS:
+ type: string
+ default: "gerrit"
+ STACK_TEMPLATE_BRANCH:
+ type: string
+ default: "master"
+
+ # salt
+ SALT_MASTER_CREDENTIALS:
+ type: string
+ default: "salt-qa-credentials"
+ SALT_MASTER_URL:
+ type: string
+ default: ""
+
+ # aws api
+ AWS_STACK_REGION:
+ type: string
+ default: "eu-central-1"
+ AWS_API_CREDENTIALS:
+ type: string
+ default: "aws-credentials"
+ AWS_SSH_KEY:
+ type: string
+ default: "jenkins-mk"
+ KQUEEN_BUILD_ID:
+ type: string
+
diff --git a/jenkins/client/job/deploy/lab/cicd.yml b/jenkins/client/job/deploy/lab/cicd.yml
index 9002c9c..d524bbc 100644
--- a/jenkins/client/job/deploy/lab/cicd.yml
+++ b/jenkins/client/job/deploy/lab/cicd.yml
@@ -14,6 +14,7 @@
scm:
type: git
url: "${_param:jenkins_gerrit_url}/mk/mk-pipelines"
+ branch: "${_param:jenkins_pipelines_branch}"
credentials: "gerrit"
script: cicd-lab-pipeline.groovy
param:
diff --git a/jenkins/client/job/deploy/lab/cleanup.yml b/jenkins/client/job/deploy/lab/cleanup.yml
index 4d2a179..93a0818 100644
--- a/jenkins/client/job/deploy/lab/cleanup.yml
+++ b/jenkins/client/job/deploy/lab/cleanup.yml
@@ -12,6 +12,7 @@
scm:
type: git
url: "${_param:jenkins_gerrit_url}/mk/mk-pipelines"
+ branch: "${_param:jenkins_pipelines_branch}"
credentials: "gerrit"
script: cleanup-pipeline.groovy
param:
@@ -70,6 +71,7 @@
scm:
type: git
url: "${_param:jenkins_gerrit_url}/mk/mk-pipelines"
+ branch: "${_param:jenkins_pipelines_branch}"
credentials: "gerrit"
script: delete-broken-stacks-pipeline.groovy
trigger:
diff --git a/jenkins/client/job/deploy/lab/demo.yml b/jenkins/client/job/deploy/lab/demo.yml
index 3ea8a40..2bb6ad5 100644
--- a/jenkins/client/job/deploy/lab/demo.yml
+++ b/jenkins/client/job/deploy/lab/demo.yml
@@ -9,6 +9,7 @@
scm:
type: git
url: "${_param:jenkins_gerrit_url}/mk/mk-pipelines"
+ branch: "${_param:jenkins_pipelines_branch}"
credentials: "gerrit"
script: kafka-demo.groovy
param:
diff --git a/jenkins/client/job/deploy/lab/deploy.yml b/jenkins/client/job/deploy/lab/deploy.yml
index 308b613..b6bbc71 100644
--- a/jenkins/client/job/deploy/lab/deploy.yml
+++ b/jenkins/client/job/deploy/lab/deploy.yml
@@ -17,6 +17,7 @@
scm:
type: git
url: "${_param:jenkins_gerrit_url}/mk/mk-pipelines"
+ branch: "${_param:jenkins_pipelines_branch}"
credentials: "gerrit"
script: cloud-deploy-pipeline.groovy
trigger:
@@ -89,13 +90,21 @@
type: text
default: ""
description: "YAML with overrides for Salt deployment"
+ BOOTSTRAP_EXTRA_REPO_PARAMS:
+ type: string
+ default: ""
+ description: "Defines a list of extra repos with parameters, format: repo 1, repo priority 1, repo pin 1; repo 2, repo priority 2, repo pin 2"
FORMULA_PKG_REVISION:
type: string
default: ""
description: "Formulas revision to install on Salt Master bootstrap stage"
EXTRA_FORMULAS:
type: string
- default: "maas memcached ntp nginx collectd sensu heka sphinx mysql grafana libvirt rsyslog glusterfs postfix xtrabackup freeipa prometheus telegraf elasticsearch kibana rundeck devops-portal rsync docker keepalived aptly jenkins gerrit artifactory influxdb horizon"
+ default: "maas memcached ntp nginx collectd sensu heka sphinx mysql grafana libvirt rsyslog glusterfs postfix xtrabackup freeipa prometheus telegraf elasticsearch kibana rundeck devops-portal rsync docker keepalived aptly jenkins gerrit artifactory influxdb horizon ceph"
+ STATIC_MGMT_NETWORK:
+ type: boolean
+ default: 'false'
+ description: "Check if model contains static IP address definitions for all nodes"
# aws api
AWS_STACK_REGION:
diff --git a/jenkins/client/job/deploy/lab/ironic.yml b/jenkins/client/job/deploy/lab/ironic.yml
index 8c397cf..f0b67e8 100644
--- a/jenkins/client/job/deploy/lab/ironic.yml
+++ b/jenkins/client/job/deploy/lab/ironic.yml
@@ -76,4 +76,5 @@
script: ironic-node-provision-pipeline.groovy
type: git
url: "${_param:jenkins_gerrit_url}/mk/mk-pipelines"
+ branch: "${_param:jenkins_pipelines_branch}"
type: workflow-scm
diff --git a/jenkins/client/job/deploy/lab/release/mcp11.yml b/jenkins/client/job/deploy/lab/release/mcp11.yml
index 0a3127c..8e61e8e 100644
--- a/jenkins/client/job/deploy/lab/release/mcp11.yml
+++ b/jenkins/client/job/deploy/lab/release/mcp11.yml
@@ -3,8 +3,8 @@
parameters:
_param:
jenkins_deploy_jobs:
- - stack_name: virtual_mcp11_contrail
- stack_env: devcloud_virtual_mcp11_contrail
+ - stack_name: virtual_mcp_contrail
+ stack_env: devcloud_mcp11_contrail
stack_install: core,openstack,contrail
stack_type: heat
stack_test: ""
diff --git a/jenkins/client/job/deploy/openstack.yml b/jenkins/client/job/deploy/openstack.yml
index f316ab4..3595e01 100644
--- a/jenkins/client/job/deploy/openstack.yml
+++ b/jenkins/client/job/deploy/openstack.yml
@@ -13,6 +13,7 @@
scm:
type: git
url: "${_param:jenkins_gerrit_url}/mk/mk-pipelines"
+ branch: "${_param:jenkins_pipelines_branch}"
credentials: "gerrit"
script: cloud-deploy-pipeline.groovy
param:
@@ -34,6 +35,10 @@
ASK_ON_ERROR:
type: boolean
default: 'false'
+ STATIC_MGMT_NETWORK:
+ type: boolean
+ default: 'false'
+ description: "Check if model contains static IP address definitions for all nodes"
deploy-openstack-compute:
type: workflow-scm
concurrent: true
@@ -41,6 +46,7 @@
scm:
type: git
url: "${_param:jenkins_gerrit_url}/mk/mk-pipelines"
+ branch: "${_param:jenkins_pipelines_branch}"
credentials: "gerrit"
script: openstack-compute-install.groovy
param:
diff --git a/jenkins/client/job/deploy/rollout.yml b/jenkins/client/job/deploy/rollout.yml
index 93f5167..3b05fd6 100644
--- a/jenkins/client/job/deploy/rollout.yml
+++ b/jenkins/client/job/deploy/rollout.yml
@@ -13,6 +13,7 @@
scm:
type: git
url: "${_param:jenkins_gerrit_url}/mk/mk-pipelines"
+ branch: "${_param:jenkins_pipelines_branch}"
credentials: "gerrit"
script: rollout-config-change.groovy
param:
@@ -78,6 +79,7 @@
scm:
type: git
url: "${_param:jenkins_gerrit_url}/mk/mk-pipelines"
+ branch: "${_param:jenkins_pipelines_branch}"
credentials: "gerrit"
script: git-merge-branches-pipeline.groovy
param:
diff --git a/jenkins/client/job/deploy/test.yml b/jenkins/client/job/deploy/test.yml
index 9b99ee5..c226fbc 100644
--- a/jenkins/client/job/deploy/test.yml
+++ b/jenkins/client/job/deploy/test.yml
@@ -13,6 +13,7 @@
scm:
type: git
url: "${_param:jenkins_gerrit_url}/mk/mk-pipelines"
+ branch: "${_param:jenkins_pipelines_branch}"
credentials: "gerrit"
script: test-service.groovy
param:
diff --git a/jenkins/client/job/deploy/update/config.yml b/jenkins/client/job/deploy/update/config.yml
index e956736..7c75e5b 100644
--- a/jenkins/client/job/deploy/update/config.yml
+++ b/jenkins/client/job/deploy/update/config.yml
@@ -14,6 +14,7 @@
scm:
type: git
url: "${_param:jenkins_gerrit_url}/mk/mk-pipelines"
+ branch: "${_param:jenkins_pipelines_branch}"
credentials: "gerrit"
script: change-config.groovy
param:
diff --git a/jenkins/client/job/deploy/update/init.yml b/jenkins/client/job/deploy/update/init.yml
index 4d77c7b..4e6f460 100644
--- a/jenkins/client/job/deploy/update/init.yml
+++ b/jenkins/client/job/deploy/update/init.yml
@@ -6,8 +6,10 @@
- system.jenkins.client.job.deploy.update.update_mirror_image
- system.jenkins.client.job.deploy.update.upgrade
- system.jenkins.client.job.deploy.update.upgrade_compute
+ - system.jenkins.client.job.deploy.update.upgrade_mcp_release
- system.jenkins.client.job.deploy.update.upgrade_ovs_gateway
- system.jenkins.client.job.deploy.update.upgrade_opencontrail
+ - system.jenkins.client.job.deploy.update.upgrade_opencontrail4_0
- system.jenkins.client.job.deploy.update.restore_mysql
- system.jenkins.client.job.deploy.update.restore_cassandra
- system.jenkins.client.job.deploy.update.restore_zookeeper
diff --git a/jenkins/client/job/deploy/update/package.yml b/jenkins/client/job/deploy/update/package.yml
index 55a9ef0..b276ce4 100644
--- a/jenkins/client/job/deploy/update/package.yml
+++ b/jenkins/client/job/deploy/update/package.yml
@@ -14,6 +14,7 @@
scm:
type: git
url: "${_param:jenkins_gerrit_url}/mk/mk-pipelines"
+ branch: "${_param:jenkins_pipelines_branch}"
credentials: "gerrit"
script: update-package.groovy
param:
diff --git a/jenkins/client/job/deploy/update/restore_cassandra.yml b/jenkins/client/job/deploy/update/restore_cassandra.yml
index 7f53f80..115f7a2 100644
--- a/jenkins/client/job/deploy/update/restore_cassandra.yml
+++ b/jenkins/client/job/deploy/update/restore_cassandra.yml
@@ -14,6 +14,7 @@
scm:
type: git
url: "${_param:jenkins_gerrit_url}/mk/mk-pipelines"
+ branch: "${_param:jenkins_pipelines_branch}"
credentials: "gerrit"
script: restore-cassandra.groovy
param:
diff --git a/jenkins/client/job/deploy/update/restore_mysql.yml b/jenkins/client/job/deploy/update/restore_mysql.yml
index 9b2e4d7..2c4ce12 100644
--- a/jenkins/client/job/deploy/update/restore_mysql.yml
+++ b/jenkins/client/job/deploy/update/restore_mysql.yml
@@ -14,6 +14,7 @@
scm:
type: git
url: "${_param:jenkins_gerrit_url}/mk/mk-pipelines"
+ branch: "${_param:jenkins_pipelines_branch}"
credentials: "gerrit"
script: xtrabackup-restore-mysql-db.groovy
param:
diff --git a/jenkins/client/job/deploy/update/restore_zookeeper.yml b/jenkins/client/job/deploy/update/restore_zookeeper.yml
index f33607a..b6d044a 100644
--- a/jenkins/client/job/deploy/update/restore_zookeeper.yml
+++ b/jenkins/client/job/deploy/update/restore_zookeeper.yml
@@ -14,6 +14,7 @@
scm:
type: git
url: "${_param:jenkins_gerrit_url}/mk/mk-pipelines"
+ branch: "${_param:jenkins_pipelines_branch}"
credentials: "gerrit"
script: restore-zookeeper.groovy
param:
diff --git a/jenkins/client/job/deploy/update/update_mirror_image.yml b/jenkins/client/job/deploy/update/update_mirror_image.yml
index 3b34d12..ec812c4 100644
--- a/jenkins/client/job/deploy/update/update_mirror_image.yml
+++ b/jenkins/client/job/deploy/update/update_mirror_image.yml
@@ -14,6 +14,7 @@
scm:
type: git
url: "${_param:jenkins_gerrit_url}/mk/mk-pipelines"
+ branch: "${_param:jenkins_pipelines_branch}"
credentials: "gerrit"
script: update-mirror-image.groovy
param:
diff --git a/jenkins/client/job/deploy/update/update_salt_environment.yml b/jenkins/client/job/deploy/update/update_salt_environment.yml
index 9efd6c5..f9ea6d5 100644
--- a/jenkins/client/job/deploy/update/update_salt_environment.yml
+++ b/jenkins/client/job/deploy/update/update_salt_environment.yml
@@ -14,6 +14,7 @@
scm:
type: git
url: "${_param:jenkins_gerrit_url}/mk/mk-pipelines"
+ branch: "${_param:jenkins_pipelines_branch}"
credentials: "gerrit"
script: update-salt-environment.groovy
param:
diff --git a/jenkins/client/job/deploy/update/upgrade.yml b/jenkins/client/job/deploy/update/upgrade.yml
index 415e0b4..2c76753 100644
--- a/jenkins/client/job/deploy/update/upgrade.yml
+++ b/jenkins/client/job/deploy/update/upgrade.yml
@@ -14,6 +14,7 @@
scm:
type: git
url: "${_param:jenkins_gerrit_url}/mk/mk-pipelines"
+ branch: "${_param:jenkins_pipelines_branch}"
credentials: "gerrit"
script: openstack-control-upgrade.groovy
param:
diff --git a/jenkins/client/job/deploy/update/upgrade_compute.yml b/jenkins/client/job/deploy/update/upgrade_compute.yml
index f95e70e..90bfc76 100644
--- a/jenkins/client/job/deploy/update/upgrade_compute.yml
+++ b/jenkins/client/job/deploy/update/upgrade_compute.yml
@@ -14,6 +14,7 @@
scm:
type: git
url: "${_param:jenkins_gerrit_url}/mk/mk-pipelines"
+ branch: "${_param:jenkins_pipelines_branch}"
credentials: "gerrit"
script: openstack-compute-upgrade.groovy
param:
diff --git a/jenkins/client/job/deploy/update/upgrade_mcp_release.yml b/jenkins/client/job/deploy/update/upgrade_mcp_release.yml
new file mode 100644
index 0000000..8587140
--- /dev/null
+++ b/jenkins/client/job/deploy/update/upgrade_mcp_release.yml
@@ -0,0 +1,33 @@
+#
+# Jobs to upgrade MCP release
+#
+parameters:
+ _param:
+ jenkins_salt_api_url: "http://${_param:salt_master_host}:6969"
+ jenkins:
+ client:
+ job:
+ upgrade-mcp-release:
+ type: workflow-scm
+ concurrent: true
+ display_name: "Deploy - upgrade MCP Release"
+ scm:
+ type: git
+ url: "${_param:jenkins_gerrit_url}/mk/mk-pipelines"
+ branch: "${_param:jenkins_pipelines_branch}"
+ credentials: "gerrit"
+ script: upgrade-mcp-release.groovy
+ param:
+ SALT_MASTER_URL:
+ type: string
+ default: "${_param:jenkins_salt_api_url}"
+ SALT_MASTER_CREDENTIALS:
+ type: string
+ default: "salt"
+ MCP_VERSION:
+ type: string
+ default: ""
+ UPDATE_LOCAL_REPOS:
+ type: boolean
+ default: 'false'
+ description: "Use only when local repositories are present"
\ No newline at end of file
diff --git a/jenkins/client/job/deploy/update/upgrade_opencontrail.yml b/jenkins/client/job/deploy/update/upgrade_opencontrail.yml
index b5d1e77..de7e46f 100644
--- a/jenkins/client/job/deploy/update/upgrade_opencontrail.yml
+++ b/jenkins/client/job/deploy/update/upgrade_opencontrail.yml
@@ -14,6 +14,7 @@
scm:
type: git
url: "${_param:jenkins_gerrit_url}/mk/mk-pipelines"
+ branch: "${_param:jenkins_pipelines_branch}"
credentials: "gerrit"
script: opencontrail-upgrade.groovy
param:
diff --git a/jenkins/client/job/deploy/update/upgrade_opencontrail4_0.yml b/jenkins/client/job/deploy/update/upgrade_opencontrail4_0.yml
new file mode 100644
index 0000000..f622371
--- /dev/null
+++ b/jenkins/client/job/deploy/update/upgrade_opencontrail4_0.yml
@@ -0,0 +1,50 @@
+#
+# Jobs to update packages on given Salt master environment
+#
+parameters:
+ _param:
+ jenkins_salt_api_url: "http://${_param:salt_master_host}:6969"
+ jenkins:
+ client:
+ job:
+ deploy-upgrade-opencontrail40:
+ type: workflow-scm
+ concurrent: true
+ display_name: "Deploy - upgrade Opencontrail to 4.x"
+ scm:
+ type: git
+ url: "${_param:jenkins_gerrit_url}/mk/mk-pipelines"
+ branch: "${_param:jenkins_pipelines_branch}"
+ credentials: "gerrit"
+ script: opencontrail40-upgrade.groovy
+ param:
+ SALT_MASTER_URL:
+ type: string
+ default: "${_param:jenkins_salt_api_url}"
+ SALT_MASTER_CREDENTIALS:
+ type: string
+ default: "salt"
+ STAGE_CONTROLLERS_UPGRADE:
+ type: boolean
+ default: 'true'
+ description: "Run upgrade on Opencontrail controllers"
+ STAGE_COMPUTES_UPGRADE:
+ type: boolean
+ default: 'true'
+ description: "Run upgrade on Opencontrail compute nodes"
+ COMPUTE_TARGET_SERVERS:
+ type: string
+ default: "cmp*"
+ description: Salt compound target to match nodes to be updated [*, G@osfamily:debian].
+ COMPUTE_TARGET_SUBSET_LIVE:
+ type: string
+ default: '1'
+ description: Number of selected nodes to live apply compute upgrade.
+ STAGE_CONTROLLERS_ROLLBACK:
+ type: boolean
+ default: 'false'
+ description: "Run rollback on Opencontrail controllers"
+ STAGE_COMPUTES_ROLLBACK:
+ type: boolean
+ default: 'false'
+ description: "Run rollback on Opencontrail compute nodes"
diff --git a/jenkins/client/job/deploy/update/upgrade_ovs_gateway.yml b/jenkins/client/job/deploy/update/upgrade_ovs_gateway.yml
index 3d12796..335492d 100644
--- a/jenkins/client/job/deploy/update/upgrade_ovs_gateway.yml
+++ b/jenkins/client/job/deploy/update/upgrade_ovs_gateway.yml
@@ -14,6 +14,7 @@
scm:
type: git
url: "${_param:jenkins_gerrit_url}/mk/mk-pipelines"
+ branch: "${_param:jenkins_pipelines_branch}"
credentials: "gerrit"
script: ovs-gateway-upgrade.groovy
param:
diff --git a/jenkins/client/job/deploy/update/utils.yml b/jenkins/client/job/deploy/update/utils.yml
index fa6ce14..1a6062e 100644
--- a/jenkins/client/job/deploy/update/utils.yml
+++ b/jenkins/client/job/deploy/update/utils.yml
@@ -9,6 +9,7 @@
scm:
type: git
url: "${_param:jenkins_gerrit_url}/mk/mk-pipelines"
+ branch: "${_param:jenkins_pipelines_branch}"
credentials: "gerrit"
script: update-reclass-metadata.groovy
param:
@@ -31,6 +32,7 @@
scm:
type: git
url: "${_param:jenkins_gerrit_url}/mk/mk-pipelines"
+ branch: "${_param:jenkins_pipelines_branch}"
credentials: "gerrit"
script: update-salt-master-formulas.groovy
param:
@@ -53,6 +55,7 @@
scm:
type: git
url: "${_param:jenkins_gerrit_url}/mk/mk-pipelines"
+ branch: "${_param:jenkins_pipelines_branch}"
credentials: "gerrit"
script: update-jenkins-master-jobs.groovy
param:
diff --git a/jenkins/client/job/docker/build-images.yml b/jenkins/client/job/docker/build-images.yml
index 61f1e6d..334db19 100644
--- a/jenkins/client/job/docker/build-images.yml
+++ b/jenkins/client/job/docker/build-images.yml
@@ -7,10 +7,13 @@
jobs:
- name: aptly
repo: mk
+ build_trigger: ""
- name: ci
repo: mk
+ build_trigger: "H H(20-23) * * *"
- name: prometheus
repo: mcp
+ build_trigger: ""
template:
discard:
build:
@@ -32,6 +35,8 @@
event:
ref:
- updated: {}
+ pollscm:
+ spec: "{{build_trigger}}"
param:
IMAGE_GIT_URL:
type: string
diff --git a/jenkins/client/job/docker/cleanup.yml b/jenkins/client/job/docker/cleanup.yml
index eff5754..e1bdcd1 100644
--- a/jenkins/client/job/docker/cleanup.yml
+++ b/jenkins/client/job/docker/cleanup.yml
@@ -17,6 +17,7 @@
scm:
type: git
url: "${_param:jenkins_gerrit_url}/mk/mk-pipelines"
+ branch: "${_param:jenkins_pipelines_branch}"
credentials: "gerrit"
script: docker-cleanup-pipeline.groovy
trigger:
diff --git a/jenkins/client/job/docker/init.yml b/jenkins/client/job/docker/init.yml
index 63c3f27..c5f7d44 100644
--- a/jenkins/client/job/docker/init.yml
+++ b/jenkins/client/job/docker/init.yml
@@ -57,6 +57,7 @@
scm:
type: git
url: "${_param:jenkins_gerrit_url}/mk/mk-pipelines"
+ branch: "${_param:jenkins_pipelines_branch}"
credentials: "gerrit"
script: docker-build-image-pipeline.groovy
trigger:
diff --git a/jenkins/client/job/docker/opencontrail.yml b/jenkins/client/job/docker/opencontrail.yml
index b5a6c93..b5052de 100644
--- a/jenkins/client/job/docker/opencontrail.yml
+++ b/jenkins/client/job/docker/opencontrail.yml
@@ -6,6 +6,7 @@
name: "docker-build-images-opencontrail-{{version}}"
jobs:
- version: oc40
+ - version: oc41
template:
discard:
build:
@@ -29,29 +30,26 @@
- updated: {}
comment:
- addedContains:
- commentAddedCommentContains: '(buildcontainer)'
+ commentAddedCommentContains: '(buildcontainer|test|recheck|verify|)'
+ reverse:
+ projects:
+ - build-opencontrail-{{version}}-ubuntu-xenial
param:
IMAGE_GIT_URL:
type: string
- default: "${_param:jenkins_gerrit_url}/mk/docker-opencontrail-{{version}}"
+ default: "${_param:jenkins_gerrit_url}/mk/docker-opencontrail"
OC_VERSION:
type: string
default: "{{version}}"
IMAGE_CREDENTIALS_ID:
type: string
default: "gerrit"
- IMAGE_TAGS:
+ APT_KEY:
type: string
- default: "latest"
- REGISTRY_URL:
+ default: "${_param:jenkins_aptly_url}/public.gpg"
+ APT_REPO_URL:
type: string
- default: ""
+ default: "${_param:jenkins_aptly_url}/xenial/ nightly"
REGISTRY_CREDENTIALS_ID:
type: string
default: "dockerhub"
- DOCKER_GIT_TAG:
- type: boolean
- default: "true"
- EXTRA_REPO_URL:
- type: string
- default: "${_param:jenkins_aptly_url}"
diff --git a/jenkins/client/job/docker/oss/init.yml b/jenkins/client/job/docker/oss/init.yml
index 9b1e49b..94e138c 100644
--- a/jenkins/client/job/docker/oss/init.yml
+++ b/jenkins/client/job/docker/oss/init.yml
@@ -1,13 +1,14 @@
classes:
- system.jenkins.client.job.docker.oss.cis-collectors
- system.jenkins.client.job.docker.oss.devops-portal
+ - system.jenkins.client.job.docker.oss.hce-codebase
+ - system.jenkins.client.job.docker.oss.hce-docker
- system.jenkins.client.job.docker.oss.janitor-monkey-codebase
- system.jenkins.client.job.docker.oss.janitor-monkey-docker
- - system.jenkins.client.job.docker.oss.pushkin-docker
- system.jenkins.client.job.docker.oss.pushkin-codebase
- system.jenkins.client.job.docker.oss.pushkin-codebase-ext
- - system.jenkins.client.job.docker.oss.hce-docker
- - system.jenkins.client.job.docker.oss.hce-codebase
+ - system.jenkins.client.job.docker.oss.pushkin-docker
- system.jenkins.client.job.docker.oss.rundeck
- - system.jenkins.client.job.docker.oss.security-monkey-docker
+ - system.jenkins.client.job.docker.oss.security-monkey-codebase
- system.jenkins.client.job.docker.oss.security-monkey-codebase-openstack
+ - system.jenkins.client.job.docker.oss.security-monkey-docker
diff --git a/jenkins/client/job/docker/oss/security-monkey-codebase.yml b/jenkins/client/job/docker/oss/security-monkey-codebase.yml
new file mode 100644
index 0000000..93a79e6
--- /dev/null
+++ b/jenkins/client/job/docker/oss/security-monkey-codebase.yml
@@ -0,0 +1,73 @@
+parameters:
+ jenkins:
+ client:
+ job:
+ docker-build-images-security-monkey-codebase:
+ name: docker-build-images-security-monkey-codebase
+ discard:
+ build:
+ keep_num: 25
+ artifact:
+ keep_num: 25
+ type: workflow-scm
+ concurrent: true
+ scm:
+ type: git
+ url: "${_param:jenkins_gerrit_url}/oss/jenkins/pipelines"
+ credentials: "gerrit"
+ script: docker-build-image-security-monkey-pipeline.groovy
+ trigger:
+ gerrit:
+ project:
+ "oss/security-monkey":
+ branches:
+ - mirantis_0_9_2
+ skip_vote:
+ - successful
+ - failed
+ - unstable
+ - not_built
+ event:
+ patchset:
+ - created:
+ excludeDrafts: false
+ excludeNoCodeChange: false
+ change:
+ - merged
+ comment:
+ - addedContains:
+ commentAddedCommentContains: 'rebuild'
+ param:
+ IMAGE_NAME:
+ type: string
+ default: "security-monkey"
+ IMAGE_TAGS:
+ type: string
+ default: ""
+ CREDENTIALS_ID:
+ type: string
+ default: "gerrit"
+ DOCKER_REGISTRY:
+ type: string
+ default: "docker-dev-virtual.docker.mirantis.net"
+ PROJECT_NAMESPACE:
+ type: string
+ default: "oss"
+ DOCKERFILE_PATH:
+ type: string
+ default: "security-monkey/Dockerfile"
+ CONTEXT_PATH:
+ type: string
+ default: "."
+ CUSTOM_GERRIT_PROJECT:
+ type: string
+ default: oss/docker-security-monkey
+ CUSTOM_GERRIT_BRANCH:
+ type: string
+ default: master
+ CI_BUILD_ARG_SECURITY_MONKEY_REPO:
+ type: string
+ default: https://gerrit.mcp.mirantis.net/oss/security-monkey
+ CI_BUILD_ARG_SECURITY_MONKEY_BRANCH:
+ type: string
+ default: mirantis_0_9_2
diff --git a/jenkins/client/job/docker/testing.yml b/jenkins/client/job/docker/testing.yml
index bf65dbc..ece8e10 100644
--- a/jenkins/client/job/docker/testing.yml
+++ b/jenkins/client/job/docker/testing.yml
@@ -23,6 +23,7 @@
scm:
type: git
url: "${_param:jenkins_gerrit_url}/mk/mk-pipelines"
+ branch: "${_param:jenkins_pipelines_branch}"
credentials: "gerrit"
script: docker-build-image-pipeline.groovy
trigger:
diff --git a/jenkins/client/job/gating.yml b/jenkins/client/job/gating.yml
index db2033e..f9e9b1a 100644
--- a/jenkins/client/job/gating.yml
+++ b/jenkins/client/job/gating.yml
@@ -33,6 +33,7 @@
scm:
type: git
url: "${_param:jenkins_gerrit_url}/mk/mk-pipelines"
+ branch: "${_param:jenkins_pipelines_branch}"
credentials: "gerrit"
script: gating-pipeline.groovy
quiet_period: 60
diff --git a/jenkins/client/job/git-mirrors/2way.yml b/jenkins/client/job/git-mirrors/2way.yml
index b472fa1..3b1a62f 100644
--- a/jenkins/client/job/git-mirrors/2way.yml
+++ b/jenkins/client/job/git-mirrors/2way.yml
@@ -22,6 +22,7 @@
scm:
type: git
url: "${_param:jenkins_gerrit_url}/mk/mk-pipelines"
+ branch: "${_param:jenkins_pipelines_branch}"
credentials: "gerrit"
script: git-mirror-2way-pipeline.groovy
github:
@@ -30,6 +31,14 @@
github:
pollscm:
spec: ${_param:jenkins_pollscm_spec}
+ gerrit:
+ project:
+ "{{source}}":
+ branches:
+ - master
+ event:
+ ref:
+ - updated
param:
SOURCE_URL:
type: string
@@ -43,3 +52,4 @@
BRANCHES:
type: string
default: "{{branches}}"
+ description: "Comma-separated list of branches to mirror"
diff --git a/jenkins/client/job/git-mirrors/downstream/init.yml b/jenkins/client/job/git-mirrors/downstream/init.yml
index 0ddc0ce..6f5a66d 100644
--- a/jenkins/client/job/git-mirrors/downstream/init.yml
+++ b/jenkins/client/job/git-mirrors/downstream/init.yml
@@ -19,6 +19,7 @@
scm:
type: git
url: "${_param:jenkins_gerrit_url}/mk/mk-pipelines"
+ branch: "${_param:jenkins_pipelines_branch}"
credentials: "gerrit"
script: git-mirror-pipeline.groovy
trigger:
@@ -37,3 +38,4 @@
BRANCHES:
type: string
default: "{{branches}}"
+ description: "Comma-separated list of branches to mirror"
diff --git a/jenkins/client/job/git-mirrors/upstream/init.yml b/jenkins/client/job/git-mirrors/upstream/init.yml
index cc267d9..1707dca 100644
--- a/jenkins/client/job/git-mirrors/upstream/init.yml
+++ b/jenkins/client/job/git-mirrors/upstream/init.yml
@@ -18,6 +18,7 @@
scm:
type: git
url: "${_param:jenkins_gerrit_url}/mk/mk-pipelines"
+ branch: "${_param:jenkins_pipelines_branch}"
credentials: "gerrit"
script: git-mirror-pipeline.groovy
trigger:
@@ -47,3 +48,4 @@
BRANCHES:
type: string
default: "{{branches}}"
+ description: "Comma-separated list of branches to mirror"
diff --git a/jenkins/client/job/kill_stuck_jobs.yml b/jenkins/client/job/kill_stuck_jobs.yml
index 57f0b3f..cc69c6b 100644
--- a/jenkins/client/job/kill_stuck_jobs.yml
+++ b/jenkins/client/job/kill_stuck_jobs.yml
@@ -14,6 +14,7 @@
scm:
type: git
url: "${_param:jenkins_gerrit_url}/mk/mk-pipelines"
+ branch: "${_param:jenkins_pipelines_branch}"
credentials: "gerrit"
script: abort-long-running-jobs.groovy
trigger:
diff --git a/jenkins/client/job/opencontrail/build/dpdk-extra.yml b/jenkins/client/job/opencontrail/build/dpdk-extra.yml
index 0a152f1..2d4e4d8 100644
--- a/jenkins/client/job/opencontrail/build/dpdk-extra.yml
+++ b/jenkins/client/job/opencontrail/build/dpdk-extra.yml
@@ -54,6 +54,7 @@
scm:
type: git
url: "${_param:jenkins_gerrit_url}/mk/mk-pipelines"
+ branch: "${_param:jenkins_pipelines_branch}"
credentials: "gerrit"
script: build-extra-dpdk-pipeline.groovy
quiet_period: 120
diff --git a/jenkins/client/job/opencontrail/git-mirrors/2way.yml b/jenkins/client/job/opencontrail/git-mirrors/2way.yml
index 38d64c3..49ae2be 100644
--- a/jenkins/client/job/opencontrail/git-mirrors/2way.yml
+++ b/jenkins/client/job/opencontrail/git-mirrors/2way.yml
@@ -20,6 +20,7 @@
scm:
type: git
url: "${_param:jenkins_gerrit_url}/mk/mk-pipelines"
+ branch: "${_param:jenkins_pipelines_branch}"
credentials: "gerrit"
script: git-mirror-2way-pipeline.groovy
github:
diff --git a/jenkins/client/job/opencontrail/git-mirrors/downstream.yml b/jenkins/client/job/opencontrail/git-mirrors/downstream.yml
index 45b06b6..f92d1a7 100644
--- a/jenkins/client/job/opencontrail/git-mirrors/downstream.yml
+++ b/jenkins/client/job/opencontrail/git-mirrors/downstream.yml
@@ -58,6 +58,7 @@
scm:
type: git
url: "${_param:jenkins_gerrit_url}/mk/mk-pipelines"
+ branch: "${_param:jenkins_pipelines_branch}"
credentials: "gerrit"
script: git-mirror-pipeline.groovy
github:
@@ -91,6 +92,7 @@
scm:
type: git
url: "${_param:jenkins_gerrit_url}/mk/mk-pipelines"
+ branch: "${_param:jenkins_pipelines_branch}"
credentials: "gerrit"
script: git-mirror-pipeline.groovy
github:
diff --git a/jenkins/client/job/opencontrail/git-mirrors/upstream.yml b/jenkins/client/job/opencontrail/git-mirrors/upstream.yml
index fa9bc5b..af4c6ac 100644
--- a/jenkins/client/job/opencontrail/git-mirrors/upstream.yml
+++ b/jenkins/client/job/opencontrail/git-mirrors/upstream.yml
@@ -57,6 +57,7 @@
scm:
type: git
url: "${_param:jenkins_gerrit_url}/mk/mk-pipelines"
+ branch: "${_param:jenkins_pipelines_branch}"
credentials: "gerrit"
script: git-mirror-pipeline.groovy
github:
@@ -100,6 +101,7 @@
scm:
type: git
url: "${_param:jenkins_gerrit_url}/mk/mk-pipelines"
+ branch: "${_param:jenkins_pipelines_branch}"
credentials: "gerrit"
script: git-mirror-pipeline.groovy
github:
@@ -130,6 +132,7 @@
scm:
type: git
url: "${_param:jenkins_gerrit_url}/mk/mk-pipelines"
+ branch: "${_param:jenkins_pipelines_branch}"
credentials: "gerrit"
script: git-mirror-pipeline.groovy
github:
@@ -171,6 +174,7 @@
scm:
type: git
url: "${_param:jenkins_gerrit_url}/mk/mk-pipelines"
+ branch: "${_param:jenkins_pipelines_branch}"
credentials: "gerrit"
script: git-mirror-pipeline.groovy
github:
diff --git a/jenkins/client/job/oscore/init.yml b/jenkins/client/job/oscore/init.yml
index fc06d59..18dd008 100644
--- a/jenkins/client/job/oscore/init.yml
+++ b/jenkins/client/job/oscore/init.yml
@@ -1,4 +1,5 @@
classes:
+ - system.jenkins.client.job.oscore.security_tests
- system.jenkins.client.job.oscore.tests
- system.jenkins.client.job.oscore.qa
parameters:
diff --git a/jenkins/client/job/oscore/qa.yml b/jenkins/client/job/oscore/qa.yml
index 1fa2ab3..a8d4fae 100644
--- a/jenkins/client/job/oscore/qa.yml
+++ b/jenkins/client/job/oscore/qa.yml
@@ -46,3 +46,141 @@
DOCKER_REGISTRY:
type: string
default: "docker-prod-local.docker.mirantis.net"
+ oscore-docker-image-systest-template:
+ name: "{{job_prefix}}-{{oscore-qa-project}}-image-systest-{{model}}"
+ template:
+ discard:
+ build:
+ keep_num: 30
+ artifact:
+ keep_num: 30
+ type: workflow-scm
+ concurrent: true
+ scm:
+ type: git
+ url: "${_param:jenkins_gerrit_url}/openstack-ci/openstack-pipelines.git"
+ credentials: "gerrit"
+ branch: 'master'
+ script: test-tempest-image-pipeline.groovy
+ trigger:
+ gerrit:
+ project:
+ mcp/{{oscore-qa-project}}:
+ branches:
+ - compare_type: "PLAIN"
+ name: "master"
+ skip_vote:
+ - successful
+ - failed
+ - unstable
+ - not_built
+ event:
+ patchset:
+ - created
+ comment:
+ - addedContains:
+ commentAddedCommentContains: '^(?s:Patch Set \d+:.*(test|recheck|reverify)\s*)$'
+ custom_url: '* $JOB_NAME $BUILD_URL'
+ param:
+ # general
+ BOOTSTRAP_EXTRA_REPO_PARAMS:
+ type: string
+ description: Extra repos for bootstrap stage
+ default: ""
+ CREDENTIALS_ID:
+ type: string
+ description: gerrit creds
+ default: "gerrit"
+ GERRIT_PROJECT_URL:
+ type: string
+ description: Url to project with docker image source
+ default: ""
+ GERRIT_BRANCH:
+ type: string
+ description: Branch of project with docker image source
+ default: ""
+ HEAT_STACK_ZONE:
+ type: string
+ description: AZ
+ default: "mcp-oscore-ci"
+ STACK_TEST_JOB:
+ type: string
+ description: Job for environment deployment
+ default: "{{stack_test_job}}"
+ STACK_TYPE:
+ type: string
+ default: "heat"
+ STACK_INSTALL:
+ type: string
+ description: components to install
+ default: 'core,openstack,ovs'
+ STACK_DELETE:
+ type: boolean
+ default: 'true'
+ description: Don't enable it if you need to use the lab after
+ STACK_RECLASS_ADDRESS:
+ type: string
+ default: '{{stack_reclass_address}}'
+ description: 'Url to repository with stack salt models'
+ STACK_RECLASS_BRANCH:
+ type: string
+ default: '{{stack_reclass_branch}}'
+ description: 'Branch of repository with stack salt models'
+ STACK_CLEANUP_JOB:
+ type: string
+ default: "{{stack_cleanup_job}}"
+ # salt
+ FORMULA_PKG_REVISION:
+ type: string
+ description: Version of formulas for salt-master bootstrap
+ default: "{{formula_pkg_revision}}"
+ UPLOAD_CREDENTIALS_ID:
+ type: string
+ description: ID of credentials to connect to target host
+ default: "heat-env-ssh"
+ # openstack api
+ OPENSTACK_API_URL:
+ type: string
+ default: "https://cloud-cz.bud.mirantis.net:5000"
+ OPENSTACK_API_CREDENTIALS:
+ type: string
+ default: "openstack-devcloud-credentials"
+ OPENSTACK_API_PROJECT:
+ type: string
+ default: "mcp-oscore-ci"
+ OPENSTACK_API_PROJECT_DOMAIN:
+ type: string
+ default: "default"
+ OPENSTACK_API_PROJECT_ID:
+ type: string
+ default: ""
+ OPENSTACK_API_USER_DOMAIN:
+ type: string
+ default: "default"
+ OPENSTACK_API_CLIENT:
+ type: string
+ default: ""
+ OPENSTACK_API_VERSION:
+ type: string
+ default: "3"
+ # test
+ TEST_TEMPEST_CONF:
+ type: string
+ description: Tempest configuration file path inside container
+ default: "{{tempest_conf}}"
+ TEST_TEMPEST_TARGET:
+ type: string
+ description: Node to run tests
+ default: "{{tempest_target}}"
+ TEST_MODEL:
+ type: string
+ description: Environment salt model
+ default: "{{model}}"
+ FAIL_ON_TESTS:
+ type: boolean
+ default: 'true'
+ description: Whether to fail build on test results
+ SALT_MASTER_IP:
+ type: string
+ description: Ip of env's salt master
+ default: ""
diff --git a/jenkins/client/job/oscore/security_tests.yml b/jenkins/client/job/oscore/security_tests.yml
new file mode 100644
index 0000000..36b5441
--- /dev/null
+++ b/jenkins/client/job/oscore/security_tests.yml
@@ -0,0 +1,157 @@
+parameters:
+ jenkins:
+ client:
+ job_template:
+ bandit-scanner-template-downstream:
+ name: "{{job_prefix}}-bandit-downstream-{{project}}"
+ template:
+ discard:
+ build:
+ keep_num: 30
+ artifact:
+ keep_num: 30
+ type: workflow-scm
+ # Downstream jobs are uploading reports, so shouldn't be concurrent
+ concurrent: false
+ scm:
+ type: git
+ url: "${_param:jenkins_gerrit_url}/openstack-ci/openstack-pipelines.git"
+ credentials: "gerrit"
+ branch: 'master'
+ script: bandit-openstack-pipeline.groovy
+ trigger:
+ gerrit:
+ project:
+ packaging/sources/{{project}}:
+ branches:
+ - compare_type: "ANT"
+ name: "mcp/**"
+ skip_vote:
+ - successful
+ - failed
+ - unstable
+ - not_built
+ event:
+ change:
+ - merged
+ comment:
+ - addedContains:
+ commentAddedCommentContains: '^(?s:Patch Set \d+:.*(run bandit)\s*)$'
+ custom_url: '* $JOB_NAME $BUILD_URL'
+ param:
+ GERRIT_PROJECT_URL:
+ type: string
+ description: project url
+ default: ""
+ GERRIT_BRANCH:
+ type: string
+ description: Version of openstack to test
+ default: ""
+ GERRIT_USER:
+ type: string
+ description: user
+ default: "mcp-jenkins"
+ UPSTREAM:
+ type: boolean
+ description: whether to do upstream like testing
+ default: "false"
+ FAIL_ON_TESTS:
+ type: boolean
+ description: whether to do upstream like testing
+ default: "true"
+ SEVERITY:
+ type: string
+ description: Bandit args
+ default: "1"
+ CONFIDENCE:
+ type: string
+ description: confidence
+ default: "2"
+ CREDENTIALS_ID:
+ type: string
+ description: gerrit creds
+ default: "gerrit"
+ REPORT_FORMAT:
+ type: string
+ description: Format for generated report(csv,html,json)
+ default: "json"
+ UPLOAD_REPORT:
+ type: boolean
+ description: Whether to upload report
+ default: "true"
+ REPORT_HOST:
+ type: string
+ description: Reporting tool hostname
+ default: "cve-slave01-bud.infra.mirantis.net"
+ REPORT_USER:
+ type: string
+ description: User for uploading results to reporting tool
+ default: "bandit"
+ UPLOAD_CREDENTIALS_ID:
+ type: string
+ description: Credentials for uploading report
+ default: "bandit"
+ bandit-scanner-template-upstream:
+ name: "{{job_prefix}}-bandit-upstream-{{project}}"
+ template:
+ discard:
+ build:
+ keep_num: 30
+ artifact:
+ keep_num: 30
+ type: workflow-scm
+ concurrent: true
+ scm:
+ type: git
+ url: "${_param:jenkins_gerrit_url}/openstack-ci/openstack-pipelines.git"
+ credentials: "gerrit"
+ branch: 'master'
+ script: bandit-openstack-pipeline.groovy
+ trigger:
+ gerrit:
+ project:
+ packaging/sources/{{project}}:
+ branches:
+ - compare_type: "ANT"
+ name: "mcp/**"
+ skip_vote:
+ - successful
+ - failed
+ - unstable
+ - not_built
+ event:
+ change:
+ - merged
+ comment:
+ - addedContains:
+ commentAddedCommentContains: '^(?s:Patch Set \d+:.*(run bandit)\s*)$'
+ custom_url: '* $JOB_NAME $BUILD_URL'
+ param:
+ GERRIT_PROJECT_URL:
+ type: string
+ description: project url
+ default: ""
+ GERRIT_BRANCH:
+ type: string
+ description: Version of openstack to test
+ default: ""
+ GERRIT_USER:
+ type: string
+ description: user
+ default: "mcp-jenkins"
+ UPSTREAM:
+ type: boolean
+ description: whether to do upstream like testing
+ default: "true"
+ FAIL_ON_TESTS:
+ type: boolean
+ description: whether to do upstream like testing
+ default: "true"
+ CREDENTIALS_ID:
+ type: string
+ description: gerrit creds
+ default: "gerrit"
+ REPORT_FORMAT:
+ type: string
+ description: Format for generated report(csv,html,json)
+ default: "json"
diff --git a/jenkins/client/job/oscore/tests.yml b/jenkins/client/job/oscore/tests.yml
index 85346e1..bab8804 100644
--- a/jenkins/client/job/oscore/tests.yml
+++ b/jenkins/client/job/oscore/tests.yml
@@ -2,6 +2,129 @@
jenkins:
client:
job_template:
+ test-openstack-component-formula:
+ name: "{{job_prefix}}-formula-systest-{{model}}-{{openstack_version}}"
+ template:
+ discard:
+ build:
+ keep_num: 30
+ artifact:
+ keep_num: 30
+ type: workflow-scm
+ concurrent: true
+ scm:
+ type: git
+ url: "${_param:jenkins_gerrit_url}/openstack-ci/openstack-pipelines.git"
+ credentials: "gerrit"
+ branch: 'master'
+ script: test-openstack-component-pipeline.groovy
+ param:
+ # general
+ HEAT_STACK_ZONE:
+ type: string
+ description: AZ
+ default: "mcp-oscore-ci"
+ OPENSTACK_VERSION:
+ type: string
+ description: Version of openstack to test
+ default: "{{openstack_version}}"
+ PROJECT:
+ type: string
+ description: Project to test
+ default: "all"
+ STACK_TEST_JOB:
+ type: string
+ description: Job for environment deployment
+ default: "{{stack_test_job}}"
+ STACK_TYPE:
+ type: string
+ default: "{{stack_type}}"
+ STACK_INSTALL:
+ type: string
+ description: components to install
+ default: 'core,openstack,ovs'
+ STACK_DELETE:
+ type: boolean
+ default: 'true'
+ description: Don't enable it if you need to use the lab after
+ STACK_CLEANUP_JOB:
+ type: string
+ default: "{{stack_cleanup_job}}"
+ STACK_RECLASS_ADDRESS:
+ type: string
+ default: '{{stack_reclass_address}}'
+ description: 'Url to repository with stack salt models'
+ STACK_RECLASS_BRANCH:
+ type: string
+ default: '{{stack_reclass_branch}}'
+ description: 'Branch of repository with stack salt models'
+ # salt
+ SALT_OVERRIDES:
+ type: text
+ default: ""
+ description: YAML with overrides for Salt deployment
+ FORMULA_PKG_REVISION:
+ type: string
+ description: Version of formulas for salt-master bootstrap
+ default: "{{formula_pkg_revision}}"
+ # openstack api
+ OPENSTACK_API_URL:
+ type: string
+ default: "https://cloud-cz.bud.mirantis.net:5000"
+ OPENSTACK_API_CREDENTIALS:
+ type: string
+ default: "openstack-devcloud-credentials"
+ OPENSTACK_API_PROJECT:
+ type: string
+ default: "mcp-oscore-ci"
+ OPENSTACK_API_PROJECT_DOMAIN:
+ type: string
+ default: "default"
+ OPENSTACK_API_PROJECT_ID:
+ type: string
+ default: ""
+ OPENSTACK_API_USER_DOMAIN:
+ type: string
+ default: "default"
+ OPENSTACK_API_CLIENT:
+ type: string
+ default: ""
+ OPENSTACK_API_VERSION:
+ type: string
+ default: "3"
+ # test
+ TEST_TEMPEST_CONF:
+ type: string
+ description: Tempest configuration file path inside container
+ default: "{{tempest_conf}}"
+ TEST_TEMPEST_TARGET:
+ type: string
+ description: Node to run tests
+ default: "{{tempest_target}}"
+ TEST_TEMPEST_PATTERN:
+ type: string
+ description: Run tests matched to pattern only
+ default: "tempest"
+ TEST_MODEL:
+ type: string
+ description: Environment salt model
+ default: "{{model}}"
+ TEST_PASS_THRESHOLD:
+ type: string
+ description: Tests pass rate to consider build successful
+ default: "{{test_threshold}}"
+ TESTRAIL:
+ type: boolean
+ default: 'false'
+ description: Whether to upload results to testrail
+ FAIL_ON_TESTS:
+ type: boolean
+ default: 'true'
+ description: Whether to fail build on test results
+ BOOTSTRAP_EXTRA_REPO_PARAMS:
+ type: string
+ default: ""
+ description: "Defines a list of extra repos with parameters, format: repo 1, repo priority 1, repo pin 1; repo 2, repo priority 2, repo pin 2"
test-openstack-component-periodic:
name: "{{job_prefix}}-{{milestone}}-{{model}}-{{openstack_version}}-{{formula_pkg_revision}}"
template:
@@ -50,6 +173,14 @@
type: boolean
default: 'false'
description: Don't enable it if you need to use the lab after
+ STACK_RECLASS_ADDRESS:
+ type: string
+ default: '{{stack_reclass_address}}'
+ description: 'Url to repository with stack salt models'
+ STACK_RECLASS_BRANCH:
+ type: string
+ default: '{{stack_reclass_branch}}'
+ description: 'Branch of repository with stack salt models'
STACK_CLEANUP_JOB:
type: string
default: "{{stack_cleanup_job}}"
@@ -183,11 +314,18 @@
description: Salt target to run tests
TEST_TEMPEST_IMAGE:
type: string
- description: Node to run tests
+ description: Url to tempest docker image
default: 'docker-prod-local.artifactory.mirantis.com/mirantis/oscore/rally-tempest'
+ LOCAL_TEMPEST_IMAGE:
+ type: string
+ description: Path to local docker image
+ default: ''
TEST_TEMPEST_PATTERN:
type: string
description: Run tests matched to pattern only
+ TEST_TEMPEST_SET:
+ type: string
+ description: Run tests matched by tempest set only
TEST_TEMPEST_CONCURRENCY:
type: string
description: How much test threads to run
@@ -365,3 +503,213 @@
type: string
description: Environment salt model
default: "{{model}}"
+ oscore-oscc-ci-template:
+ name: "{{job_prefix}}-oscc-ci"
+ template:
+ discard:
+ build:
+ keep_num: 30
+ artifact:
+ keep_num: 30
+ type: workflow-scm
+ concurrent: true
+ scm:
+ type: git
+ url: "${_param:jenkins_gerrit_url}/openstack-ci/openstack-pipelines.git"
+ credentials: "gerrit"
+ branch: 'master'
+ script: oscc-ci-pipeline.groovy
+ param:
+ # general
+ DEPLOY_JOB_NAME:
+ type: string
+ description: "Job name tp deploy envs are going to be tested"
+ default: "{{job_prefix}}-{{deployJobPrefix}}"
+ DISTRIBUTION:
+ type: string
+ default: "{{distribution}}"
+ description: "Distribution for the published repo"
+ COMPONENTS:
+ type: string
+ default: "{{components}}"
+ description: "Components for repo"
+ TMP_REPO_NODE_NAME:
+ type: string
+ default: "{{tmp_repo_node_name}}"
+ description: "Node name where temp repo will be published"
+ STACK_RECLASS_ADDRESS:
+ type: string
+ default: "{{stack_reclass_address}}"
+ OPENSTACK_RELEASES:
+ type: string
+ default: "{{openstack_releases}}"
+ description: "OpenStack releases with comma delimeter which have to be testes. For example: pike,ocata"
+ SOURCE_REPO_NAME:
+ type: string
+ description: "Name of the repo where packages are stored"
+ default: "{{source_repo_name}}"
+ APTLY_API_URL:
+ type: string
+ description: URL for the aptly API
+ default: "${_param:jenkins_aptly_api_url}"
+ STACK_DELETE:
+ type: boolean
+ default: "{{stack_delete}}"
+ description: Do not enable it if you need to use the lab after
+ OPENSTACK_COMPONENTS_LIST:
+ type: string
+ description: "OpenStack related components list"
+ default: "{{openstack_components_list}}"
+ build-salt-formula-refspec-template:
+ name: "{{job_prefix}}-build-salt-formula-refspec"
+ template:
+ discard:
+ build:
+ keep_num: 30
+ artifact:
+ keep_num: 30
+ type: workflow-scm
+ concurrent: true
+ scm:
+ type: git
+ url: "${_param:jenkins_gerrit_url}/mk/mk-pipelines.git"
+ credentials: "gerrit"
+ branch: 'master'
+ script: build-debian-packages-pipeline.groovy
+ param:
+ SOURCE_URL:
+ type: string
+ default: ""
+ description: Project Git repo URL
+ SOURCE_REFSPEC:
+ type: string
+ default: ""
+ description: Refspec to checkout
+ SOURCE_BRANCH:
+ type: string
+ default: "master"
+ description: Name of local branch name for checked out refspec
+ SOURCE_CREDENTIALS:
+ type: string
+ default: "gerrit"
+ description: Credentials to Git repo
+ DEBIAN_SNAPSHOT:
+ type: boolean
+ default: 'true'
+ description: Whether to make a snapshot build
+ EXTRA_REPO_URL:
+ type: string
+ default: "deb ${_param:jenkins_aptly_url}/{{dist}}/ testing salt salt-latest"
+ description: Extra repo for building process
+ EXTRA_REPO_KEY_URL:
+ type: string
+ default: "${_param:jenkins_aptly_url}/public.gpg"
+ description: Extra repo GPG public key URL
+ OS:
+ type: string
+ default: "ubuntu"
+ description: OS name
+ DIST:
+ type: string
+ default: "{{dist}}"
+ description: OS distributive name
+ UPLOAD_PPA:
+ type: boolean
+ default: 'false'
+ description: Whether to upload to PPA
+ UPLOAD_APTLY:
+ type: boolean
+ default: 'false'
+ description: Whether to upload to Aptly
+ DEBIAN_BRANCH:
+ type: string
+ default: "debian/{{dist}}"
+ description: Source repo branch name with build spec
+ LINTIAN_CHECK:
+ type: boolean
+ default: 'false'
+ description: Whether to perform lintian check
+ test-salt-formula-refspec-template:
+ name: "{{job_prefix}}-test-salt-formula-refspec"
+ template:
+ discard:
+ build:
+ keep_num: 30
+ artifact:
+ keep_num: 30
+ type: workflow-scm
+ concurrent: false
+ scm:
+ type: git
+ url: "${_param:jenkins_gerrit_url}/openstack-ci/openstack-pipelines.git"
+ credentials: "gerrit"
+ branch: 'master'
+ script: deploy-formula-change-pipeline.groovy
+ trigger:
+ gerrit:
+ project:
+ "^salt-formulas/(nova|cinder|glance|keystone|horizon|neutron|designate|heat|ironic|barbican)$":
+ compare_type: 'REG_EXP'
+ branches:
+ - master
+ skip_vote:
+ - successful
+ - failed
+ - unstable
+ - not_built
+ event:
+ comment:
+ - addedContains:
+ commentAddedCommentContains: '^(?s:Patch Set \d+:.*(test|recheck|reverify)\s*)$'
+ param:
+ SOURCE_CREDENTIALS:
+ type: string
+ default: "gerrit"
+ UPLOAD_APTLY:
+ type: boolean
+ default: 'true'
+ description: Whether to upload to Aptly
+ APTLY_REPO:
+ type: string
+ default: ""
+ description: Aptly repo name
+ BUILD_PACKAGE:
+ type: boolean
+ default: 'true'
+ description: Whether to build package
+ APTLY_REPO_URL:
+ type: string
+ default: "${_param:jenkins_aptly_url}"
+ description: Aptly url
+ APTLY_API_URL:
+ type: string
+ default: "${_param:jenkins_aptly_api_url}"
+ description: Aptly API url
+ OPENSTACK_RELEASES:
+ type: string
+ default: "{{openstack_releases}}"
+ description: Comma separated list of OpenStack releases to perform deploy and tests.
+ SOURCES:
+ type: text
+ default: ""
+ description: Optional parameter to list Git refspecs to be build
+ STACK_RECLASS_ADDRESS:
+ type: string
+ default: "{{stack_reclass_address}}"
+ description: Git repo URL to reclass
+ PKG_BUILD_JOB_NAME:
+ type: string
+ default: "{{pkg_build_job_name}}"
+ description: Jenkins job name to build package
+ STACK_DELETE:
+ type: boolean
+ default: 'true'
+ description: Whether to delete stacks ater tests
+ APTLY_PREFIX:
+ type: string
+ default: "{{aptly_prefix}}"
+ description: Aptly prefix
+ SYSTEST_JOB_PREFIX:
+ type: string
+ default: "{{systestJobPrefix}}"
+ description: "Systest job prefix. I.e. oscore-formula-systest-virtual_mcp11_aio-"
diff --git a/jenkins/client/job/salt-formulas/git-mirrors/2way.yml b/jenkins/client/job/salt-formulas/git-mirrors/2way.yml
index 688bbed..87f1b89 100644
--- a/jenkins/client/job/salt-formulas/git-mirrors/2way.yml
+++ b/jenkins/client/job/salt-formulas/git-mirrors/2way.yml
@@ -201,6 +201,8 @@
branches: ${_param:salt_formulas_branches}
- name: rundeck
branches: ${_param:salt_formulas_branches}
+ - name: runtest
+ branches: ${_param:salt_formulas_branches}
- name: sahara
branches: ${_param:salt_formulas_branches}
- name: salt
@@ -242,6 +244,7 @@
scm:
type: git
url: "${_param:jenkins_gerrit_url}/mk/mk-pipelines"
+ branch: "${_param:jenkins_pipelines_branch}"
credentials: "gerrit"
script: git-mirror-2way-pipeline.groovy
github:
@@ -250,6 +253,14 @@
github:
pollscm:
spec: ${_param:jenkins_pollscm_spec}
+ gerrit:
+ project:
+ salt-formulas/{{name}}:
+ branches:
+ - master
+ event:
+ ref:
+ - updated
param:
SOURCE_URL:
type: string
@@ -275,6 +286,7 @@
scm:
type: git
url: "${_param:jenkins_gerrit_url}/mk/mk-pipelines"
+ branch: "${_param:jenkins_pipelines_branch}"
credentials: "gerrit"
script: git-mirror-2way-pipeline.groovy
github:
@@ -307,6 +319,7 @@
scm:
type: git
url: "${_param:jenkins_gerrit_url}/mk/mk-pipelines"
+ branch: "${_param:jenkins_pipelines_branch}"
credentials: "gerrit"
script: git-mirror-2way-pipeline.groovy
github:
@@ -321,7 +334,7 @@
default: "${_param:jenkins_gerrit_url}/salt-formulas/salt-formulas-cookiecutter.git"
TARGET_URL:
type: string
- default: "https://github.com/salt-formulas/salt-formulas-cookiecutter.git"
+ default: "git@github.com:salt-formulas/salt-formulas-cookiecutter.git"
CREDENTIALS_ID:
type: string
default: "gerrit"
diff --git a/jenkins/client/job/salt-formulas/release.yml b/jenkins/client/job/salt-formulas/release.yml
index c686e6e..fe6df5e 100644
--- a/jenkins/client/job/salt-formulas/release.yml
+++ b/jenkins/client/job/salt-formulas/release.yml
@@ -8,6 +8,7 @@
scm:
type: git
url: "${_param:jenkins_gerrit_url}/mk/mk-pipelines"
+ branch: "${_param:jenkins_pipelines_branch}"
credentials: "gerrit"
script: release-salt-formulas-pipeline.groovy
github:
diff --git a/jenkins/client/job/salt-formulas/tests.yml b/jenkins/client/job/salt-formulas/tests.yml
index 44fd4c1..3dd77bf 100644
--- a/jenkins/client/job/salt-formulas/tests.yml
+++ b/jenkins/client/job/salt-formulas/tests.yml
@@ -72,6 +72,7 @@
- name: magnum
- name: memcached
- name: midonet
+ - name: mirascan
- name: monasca
- name: mongodb
- name: murano
@@ -105,6 +106,7 @@
- name: rsync
- name: rsyslog
- name: rundeck
+ - name: runtest
- name: sahara
- name: salt
- name: sensu
@@ -132,6 +134,7 @@
scm:
type: git
url: "${_param:jenkins_gerrit_url}/mk/mk-pipelines"
+ branch: "${_param:jenkins_pipelines_branch}"
credentials: "gerrit"
script: test-salt-formulas-pipeline.groovy
trigger:
@@ -171,7 +174,7 @@
name: test-salt-formulas-env
discard:
build:
- keep_num: 500
+ keep_num: 1000
artifact:
keep_num: 10
type: workflow-scm
@@ -179,6 +182,7 @@
scm:
type: git
url: "${_param:jenkins_gerrit_url}/mk/mk-pipelines"
+ branch: "${_param:jenkins_pipelines_branch}"
credentials: "gerrit"
script: test-salt-formulas-env.groovy
param:
diff --git a/jenkins/client/job/salt-models/generate.yml b/jenkins/client/job/salt-models/generate.yml
index 491cfee..b2ef4e5 100644
--- a/jenkins/client/job/salt-models/generate.yml
+++ b/jenkins/client/job/salt-models/generate.yml
@@ -14,6 +14,7 @@
scm:
type: git
url: "${_param:jenkins_gerrit_url}/mk/mk-pipelines"
+ branch: "${_param:jenkins_pipelines_branch}"
credentials: "jenkins-mk"
script: generate-cookiecutter-products.groovy
param:
diff --git a/jenkins/client/job/salt-models/git-mirrors.yml b/jenkins/client/job/salt-models/git-mirrors.yml
index 034f8d5..a04043b 100644
--- a/jenkins/client/job/salt-models/git-mirrors.yml
+++ b/jenkins/client/job/salt-models/git-mirrors.yml
@@ -12,6 +12,7 @@
scm:
type: git
url: "${_param:jenkins_gerrit_url}/mk/mk-pipelines"
+ branch: "${_param:jenkins_pipelines_branch}"
credentials: "gerrit"
script: git-mirror-2way-pipeline.groovy
github:
diff --git a/jenkins/client/job/salt-models/tests.yml b/jenkins/client/job/salt-models/tests.yml
index 19ed2e0..879a1f1 100644
--- a/jenkins/client/job/salt-models/tests.yml
+++ b/jenkins/client/job/salt-models/tests.yml
@@ -11,6 +11,7 @@
scm:
type: git
url: "${_param:jenkins_gerrit_url}/mk/mk-pipelines"
+ branch: "${_param:jenkins_pipelines_branch}"
credentials: "gerrit"
script: test-salt-models-pipeline.groovy
concurrent: true
@@ -83,6 +84,7 @@
scm:
type: git
url: "${_param:jenkins_gerrit_url}/mk/mk-pipelines"
+ branch: "${_param:jenkins_pipelines_branch}"
credentials: "gerrit"
script: test-system-reclass-pipeline.groovy
trigger:
@@ -125,6 +127,7 @@
scm:
type: git
url: "${_param:jenkins_gerrit_url}/mk/mk-pipelines"
+ branch: "${_param:jenkins_pipelines_branch}"
credentials: "jenkins-mk"
script: test-cookiecutter-reclass.groovy
trigger:
@@ -170,7 +173,7 @@
name: test-salt-model-node
discard:
build:
- keep_num: 500
+ keep_num: 1000
artifact:
keep_num: 10
type: workflow-scm
@@ -178,6 +181,7 @@
scm:
type: git
url: "${_param:jenkins_gerrit_url}/mk/mk-pipelines"
+ branch: "${_param:jenkins_pipelines_branch}"
credentials: "gerrit"
script: test-salt-model-node.groovy
param:
diff --git a/jenkins/client/job/test_pipelines.yml b/jenkins/client/job/test_pipelines.yml
index b1b782a..c9a2442 100644
--- a/jenkins/client/job/test_pipelines.yml
+++ b/jenkins/client/job/test_pipelines.yml
@@ -22,6 +22,7 @@
scm:
type: git
url: "${_param:jenkins_gerrit_url}/mk/mk-pipelines"
+ branch: "${_param:jenkins_pipelines_branch}"
credentials: "gerrit"
script: test-groovy-pipeline.groovy
trigger:
diff --git a/jenkins/client/job/validate.yml b/jenkins/client/job/validate.yml
index 6bf4cac..ab2dd38 100644
--- a/jenkins/client/job/validate.yml
+++ b/jenkins/client/job/validate.yml
@@ -22,6 +22,7 @@
scm:
type: git
url: "${_param:jenkins_gerrit_url}/mk/mk-pipelines"
+ branch: "${_param:jenkins_pipelines_branch}"
credentials: "gerrit"
script: validate-cloud.groovy
param:
@@ -148,7 +149,7 @@
description: If chosen then previous build results will be used in the current build
cvp-sanity:
type: workflow-scm
- name: validate-cvp-sanity
+ name: cvp-sanity
display_name: "CVP - Sanity checks"
discard:
build:
@@ -159,12 +160,13 @@
scm:
type: git
url: "${_param:jenkins_gerrit_url}/mk/mk-pipelines"
+ branch: "${_param:jenkins_pipelines_branch}"
credentials: "gerrit"
script: cvp-sanity.groovy
param:
SALT_MASTER_URL:
type: string
- default: ""
+ default: "${_param:jenkins_salt_api_url}"
description: Full Salt API address [e.g. https://10.10.10.2:6969]
SALT_MASTER_CREDENTIALS:
type: string
@@ -173,6 +175,10 @@
type: string
default: "https://github.com/Mirantis/cvp-sanity-checks"
description: Url for cvp-sanity-checks
+ SANITY_TESTS_SETTINGS:
+ type: string
+ default: ""
+ description: e.g. skipped_nodes=nal01.local.com,ntw01.local.com
SANITY_TESTS_SET:
type: string
default: ""
@@ -181,3 +187,71 @@
type: string
default: ""
description: Proxy address to clone repo and install python requirements
+ cvp-ha:
+ type: workflow-scm
+ name: cvp-ha
+ display_name: "CVP - HA tests"
+ 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: cvp-ha.groovy
+ param:
+ SALT_MASTER_URL:
+ type: string
+ default: "${_param:jenkins_salt_api_url}"
+ description: Full Salt API address [e.g. https://10.10.10.2:6969]
+ SALT_MASTER_CREDENTIALS:
+ type: string
+ default: "salt"
+ description: Credentials to the Salt API
+ TEMPEST_TARGET_NODE:
+ type: string
+ default: ""
+ description: Node where container with tempest will be run
+ TEST_IMAGE:
+ type: string
+ default: "rallyforge/rally"
+ description: Docker image to use for running Rally/Tempest
+ TARGET_NODES:
+ type: string
+ default: "ctl*"
+ description: Nodes to test
+ DEBUG_MODE:
+ type: boolean
+ default: 'false'
+ description: If you need to debug (keep container after test), please enabled this
+ RETRY_CHECK_STATUS:
+ type: string
+ default: "200"
+ description: If you have any problems with timeouts (e.g. while waiting for node to be up/down), please increase this value
+ SKIP_LIST_PATH:
+ type: string
+ default: "/home/rally/cvp-configuration/tempest/skip-list.yaml"
+ description: path to skip-list file inside container
+ PROXY:
+ type: string
+ default: ""
+ description: Proxy address to clone repo and install python requirements
+ TEMPEST_TEST_PATTERN:
+ type: string
+ default: "set=smoke"
+ description: Use set=smoke (or identity,full...] or just test name
+ MANUAL_CONFIRMATION:
+ type: boolean
+ default: 'false'
+ description: Ask for confirmation before doing something destructive (reboot/shutdown node)
+ TEMPEST_REPO:
+ type: string
+ default: "https://github.com/openstack/tempest"
+ description: Can be repo url (local or remote) or path to folder (inside container) with Tempest
+ TOOLS_REPO:
+ type: string
+ default: "${_param:gerrit_public_host}/cvp-configuration"
+ description: URL of repo where testing tools, scenarios, configs are located.
diff --git a/jenkins/slave/salt-pepper.yml b/jenkins/slave/salt-pepper.yml
new file mode 100644
index 0000000..c5baf1f
--- /dev/null
+++ b/jenkins/slave/salt-pepper.yml
@@ -0,0 +1,8 @@
+ classes:
+ - system.jenkins.slave
+ parameters:
+ linux:
+ system:
+ package:
+ salt-pepper:
+ version: latest
diff --git a/keystone/client/single.yml b/keystone/client/single.yml
index 0c70390..ebf5b5f 100644
--- a/keystone/client/single.yml
+++ b/keystone/client/single.yml
@@ -6,7 +6,6 @@
- system.keystone.client.service.heat-cfn
- system.keystone.client.service.keystone
- system.keystone.client.service.neutron
-- system.keystone.client.service.nova-ec2
parameters:
linux:
system:
diff --git a/keystone/server/cluster.yml b/keystone/server/cluster.yml
index cbe89ca..0ae502b 100644
--- a/keystone/server/cluster.yml
+++ b/keystone/server/cluster.yml
@@ -12,6 +12,9 @@
python-pymysql:
fromrepo: ${_param:openstack_version}
version: latest
+ python-cryptography:
+ fromrepo: ${_param:openstack_version}
+ version: latest
keystone:
server:
enabled: true
diff --git a/kibana/server/single.yml b/kibana/server/single.yml
index e6a0a4d..745c07a 100644
--- a/kibana/server/single.yml
+++ b/kibana/server/single.yml
@@ -2,7 +2,7 @@
- service.kibana.server.single
parameters:
_param:
- kibana_version: 4
+ kibana_version: 5
kibana:
server:
enabled: true
diff --git a/kubernetes/pool/cluster.yml b/kubernetes/pool/cluster.yml
index 0f961a3..3dd0c40 100644
--- a/kubernetes/pool/cluster.yml
+++ b/kubernetes/pool/cluster.yml
@@ -22,3 +22,5 @@
host:
options:
iptables: false
+ log-opts:
+ labels: "io.kubernetes.pod.name"
diff --git a/kubernetes/pool/single.yml b/kubernetes/pool/single.yml
index 00f22b8..67363a6 100644
--- a/kubernetes/pool/single.yml
+++ b/kubernetes/pool/single.yml
@@ -20,3 +20,5 @@
host:
options:
iptables: false
+ log-opts:
+ labels: "io.kubernetes.pod.name"
diff --git a/linux/system/repo/elasticsearch/5.yml b/linux/system/repo/elasticsearch/5.yml
new file mode 100644
index 0000000..1b9e3e6
--- /dev/null
+++ b/linux/system/repo/elasticsearch/5.yml
@@ -0,0 +1,45 @@
+parameters:
+ _param:
+ elasticsearch_gpg_key: |
+ -----BEGIN PGP PUBLIC KEY BLOCK-----
+ Version: GnuPG v2.0.14 (GNU/Linux)
+
+ mQENBFI3HsoBCADXDtbNJnxbPqB1vDNtCsqhe49vFYsZN9IOZsZXgp7aHjh6CJBD
+ A+bGFOwyhbd7at35jQjWAw1O3cfYsKAmFy+Ar3LHCMkV3oZspJACTIgCrwnkic/9
+ CUliQe324qvObU2QRtP4Fl0zWcfb/S8UYzWXWIFuJqMvE9MaRY1bwUBvzoqavLGZ
+ j3SF1SPO+TB5QrHkrQHBsmX+Jda6d4Ylt8/t6CvMwgQNlrlzIO9WT+YN6zS+sqHd
+ 1YK/aY5qhoLNhp9G/HxhcSVCkLq8SStj1ZZ1S9juBPoXV1ZWNbxFNGwOh/NYGldD
+ 2kmBf3YgCqeLzHahsAEpvAm8TBa7Q9W21C8vABEBAAG0RUVsYXN0aWNzZWFyY2gg
+ KEVsYXN0aWNzZWFyY2ggU2lnbmluZyBLZXkpIDxkZXZfb3BzQGVsYXN0aWNzZWFy
+ Y2gub3JnPokBOAQTAQIAIgUCUjceygIbAwYLCQgHAwIGFQgCCQoLBBYCAwECHgEC
+ F4AACgkQ0n1mbNiOQrRzjAgAlTUQ1mgo3nK6BGXbj4XAJvuZDG0HILiUt+pPnz75
+ nsf0NWhqR4yGFlmpuctgCmTD+HzYtV9fp9qW/bwVuJCNtKXk3sdzYABY+Yl0Cez/
+ 7C2GuGCOlbn0luCNT9BxJnh4mC9h/cKI3y5jvZ7wavwe41teqG14V+EoFSn3NPKm
+ TxcDTFrV7SmVPxCBcQze00cJhprKxkuZMPPVqpBS+JfDQtzUQD/LSFfhHj9eD+Xe
+ 8d7sw+XvxB2aN4gnTlRzjL1nTRp0h2/IOGkqYfIG9rWmSLNlxhB2t+c0RsjdGM4/
+ eRlPWylFbVMc5pmDpItrkWSnzBfkmXL3vO2X3WvwmSFiQbkBDQRSNx7KAQgA5JUl
+ zcMW5/cuyZR8alSacKqhSbvoSqqbzHKcUQZmlzNMKGTABFG1yRx9r+wa/fvqP6OT
+ RzRDvVS/cycws8YX7Ddum7x8uI95b9ye1/Xy5noPEm8cD+hplnpU+PBQZJ5XJ2I+
+ 1l9Nixx47wPGXeClLqcdn0ayd+v+Rwf3/XUJrvccG2YZUiQ4jWZkoxsA07xx7Bj+
+ Lt8/FKG7sHRFvePFU0ZS6JFx9GJqjSBbHRRkam+4emW3uWgVfZxuwcUCn1ayNgRt
+ KiFv9jQrg2TIWEvzYx9tywTCxc+FFMWAlbCzi+m4WD+QUWWfDQ009U/WM0ks0Kww
+ EwSk/UDuToxGnKU2dQARAQABiQEfBBgBAgAJBQJSNx7KAhsMAAoJENJ9ZmzYjkK0
+ c3MIAIE9hAR20mqJWLcsxLtrRs6uNF1VrpB+4n/55QU7oxA1iVBO6IFu4qgsF12J
+ TavnJ5MLaETlggXY+zDef9syTPXoQctpzcaNVDmedwo1SiL03uMoblOvWpMR/Y0j
+ 6rm7IgrMWUDXDPvoPGjMl2q1iTeyHkMZEyUJ8SKsaHh4jV9wp9KmC8C+9CwMukL7
+ vM5w8cgvJoAwsp3Fn59AxWthN3XJYcnMfStkIuWgR7U2r+a210W6vnUxU4oN0PmM
+ cursYPyeV0NX/KQeUeNMwGTFB6QHS/anRaGQewijkrYYoTNtfllxIu9XYmiBERQ/
+ qPDlGRlOgVTd9xUfHFkzB52c70E=
+ =92oX
+ -----END PGP PUBLIC KEY BLOCK-----
+ linux:
+ system:
+ repo:
+ elasticsearch:
+ source: "deb https://artifacts.elastic.co/packages/5.x/apt stable main"
+ architectures: amd64
+ key: ${_param:elasticsearch_gpg_key}
+ elasticsearch_curator:
+ source: "deb https://packages.elastic.co/curator/5/debian stable main"
+ architectures: amd64
+ key: ${_param:elasticsearch_gpg_key}
diff --git a/linux/system/repo/elasticsearch.yml b/linux/system/repo/elasticsearch/init.yml
similarity index 100%
rename from linux/system/repo/elasticsearch.yml
rename to linux/system/repo/elasticsearch/init.yml
diff --git a/linux/system/repo/elasticsearch5.yml b/linux/system/repo/elasticsearch5.yml
deleted file mode 100644
index 34699e8..0000000
--- a/linux/system/repo/elasticsearch5.yml
+++ /dev/null
@@ -1,12 +0,0 @@
-parameters:
- linux:
- system:
- repo:
- elasticsearch:
- source: "deb https://artifacts.elastic.co/packages/5.x/apt stable main"
- architectures: amd64
- key_url: "https://artifacts.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/kibana/5.yml b/linux/system/repo/kibana/5.yml
new file mode 100644
index 0000000..795f7d1
--- /dev/null
+++ b/linux/system/repo/kibana/5.yml
@@ -0,0 +1,40 @@
+parameters:
+ _param:
+ kibana_gpg_key: |
+ -----BEGIN PGP PUBLIC KEY BLOCK-----
+ Version: GnuPG v2.0.14 (GNU/Linux)
+
+ mQENBFI3HsoBCADXDtbNJnxbPqB1vDNtCsqhe49vFYsZN9IOZsZXgp7aHjh6CJBD
+ A+bGFOwyhbd7at35jQjWAw1O3cfYsKAmFy+Ar3LHCMkV3oZspJACTIgCrwnkic/9
+ CUliQe324qvObU2QRtP4Fl0zWcfb/S8UYzWXWIFuJqMvE9MaRY1bwUBvzoqavLGZ
+ j3SF1SPO+TB5QrHkrQHBsmX+Jda6d4Ylt8/t6CvMwgQNlrlzIO9WT+YN6zS+sqHd
+ 1YK/aY5qhoLNhp9G/HxhcSVCkLq8SStj1ZZ1S9juBPoXV1ZWNbxFNGwOh/NYGldD
+ 2kmBf3YgCqeLzHahsAEpvAm8TBa7Q9W21C8vABEBAAG0RUVsYXN0aWNzZWFyY2gg
+ KEVsYXN0aWNzZWFyY2ggU2lnbmluZyBLZXkpIDxkZXZfb3BzQGVsYXN0aWNzZWFy
+ Y2gub3JnPokBOAQTAQIAIgUCUjceygIbAwYLCQgHAwIGFQgCCQoLBBYCAwECHgEC
+ F4AACgkQ0n1mbNiOQrRzjAgAlTUQ1mgo3nK6BGXbj4XAJvuZDG0HILiUt+pPnz75
+ nsf0NWhqR4yGFlmpuctgCmTD+HzYtV9fp9qW/bwVuJCNtKXk3sdzYABY+Yl0Cez/
+ 7C2GuGCOlbn0luCNT9BxJnh4mC9h/cKI3y5jvZ7wavwe41teqG14V+EoFSn3NPKm
+ TxcDTFrV7SmVPxCBcQze00cJhprKxkuZMPPVqpBS+JfDQtzUQD/LSFfhHj9eD+Xe
+ 8d7sw+XvxB2aN4gnTlRzjL1nTRp0h2/IOGkqYfIG9rWmSLNlxhB2t+c0RsjdGM4/
+ eRlPWylFbVMc5pmDpItrkWSnzBfkmXL3vO2X3WvwmSFiQbkBDQRSNx7KAQgA5JUl
+ zcMW5/cuyZR8alSacKqhSbvoSqqbzHKcUQZmlzNMKGTABFG1yRx9r+wa/fvqP6OT
+ RzRDvVS/cycws8YX7Ddum7x8uI95b9ye1/Xy5noPEm8cD+hplnpU+PBQZJ5XJ2I+
+ 1l9Nixx47wPGXeClLqcdn0ayd+v+Rwf3/XUJrvccG2YZUiQ4jWZkoxsA07xx7Bj+
+ Lt8/FKG7sHRFvePFU0ZS6JFx9GJqjSBbHRRkam+4emW3uWgVfZxuwcUCn1ayNgRt
+ KiFv9jQrg2TIWEvzYx9tywTCxc+FFMWAlbCzi+m4WD+QUWWfDQ009U/WM0ks0Kww
+ EwSk/UDuToxGnKU2dQARAQABiQEfBBgBAgAJBQJSNx7KAhsMAAoJENJ9ZmzYjkK0
+ c3MIAIE9hAR20mqJWLcsxLtrRs6uNF1VrpB+4n/55QU7oxA1iVBO6IFu4qgsF12J
+ TavnJ5MLaETlggXY+zDef9syTPXoQctpzcaNVDmedwo1SiL03uMoblOvWpMR/Y0j
+ 6rm7IgrMWUDXDPvoPGjMl2q1iTeyHkMZEyUJ8SKsaHh4jV9wp9KmC8C+9CwMukL7
+ vM5w8cgvJoAwsp3Fn59AxWthN3XJYcnMfStkIuWgR7U2r+a210W6vnUxU4oN0PmM
+ cursYPyeV0NX/KQeUeNMwGTFB6QHS/anRaGQewijkrYYoTNtfllxIu9XYmiBERQ/
+ qPDlGRlOgVTd9xUfHFkzB52c70E=
+ =92oX
+ -----END PGP PUBLIC KEY BLOCK-----
+ linux:
+ system:
+ repo:
+ kibana:
+ source: "deb https://artifacts.elastic.co/packages/5.x/apt stable main"
+ key: ${_param:kibana_gpg_key}
diff --git a/linux/system/repo/kibana.yml b/linux/system/repo/kibana/init.yml
similarity index 100%
rename from linux/system/repo/kibana.yml
rename to linux/system/repo/kibana/init.yml
diff --git a/linux/system/repo/kibana5.yml b/linux/system/repo/kibana5.yml
deleted file mode 100644
index 0d6235b..0000000
--- a/linux/system/repo/kibana5.yml
+++ /dev/null
@@ -1,7 +0,0 @@
-parameters:
- linux:
- system:
- repo:
- kibana:
- source: "deb https://artifacts.elastic.co/packages/5.x/apt stable main"
- key_url: "https://artifacts.elastic.co/GPG-KEY-elasticsearch"
\ No newline at end of file
diff --git a/linux/system/repo/mcp/apt_mirantis/aptly.yml b/linux/system/repo/mcp/apt_mirantis/aptly.yml
new file mode 100644
index 0000000..b0cf536
--- /dev/null
+++ b/linux/system/repo/mcp/apt_mirantis/aptly.yml
@@ -0,0 +1,16 @@
+parameters:
+ _param:
+ apt_mk_version: stable
+ linux_system_repo_mcp_aptly_version: ${_param:apt_mk_version}
+ linux:
+ system:
+ repo:
+ mcp_aptly:
+ source: "deb [arch=amd64] http://apt.mirantis.com/${_param:linux_system_codename}/aptly/ ${_param:linux_system_repo_mcp_aptly_version} main"
+ architectures: amd64
+ key_url: "http://apt.mirantis.com/public.gpg"
+ clean_file: true
+ pin:
+ - pin: 'release a=${_param:linux_system_repo_mcp_aptly_version}'
+ priority: 1100
+ package: '*'
diff --git a/linux/system/repo/mcp/apt_mirantis/cassandra.yml b/linux/system/repo/mcp/apt_mirantis/cassandra.yml
new file mode 100644
index 0000000..308f555
--- /dev/null
+++ b/linux/system/repo/mcp/apt_mirantis/cassandra.yml
@@ -0,0 +1,17 @@
+parameters:
+ _param:
+ apt_mk_version: stable
+ linux_system_repo_mcp_cassandra_version: ${_param:apt_mk_version}
+ linux_system_repo_mcp_cassandra_version_number: "21x"
+ linux:
+ system:
+ repo:
+ mcp_cassandra:
+ source: "deb [arch=amd64] http://apt.mirantis.com/${_param:linux_system_codename}/cassandra/ ${_param:linux_system_repo_mcp_cassandra_version} ${_param:linux_system_repo_mcp_cassandra_version_number}"
+ architectures: amd64
+ key_url: "http://apt.mirantis.com/public.gpg"
+ clean_file: true
+ pin:
+ - pin: 'release a=${_param:linux_system_repo_mcp_cassandra_version}'
+ priority: 1100
+ package: '*'
diff --git a/linux/system/repo/mcp/apt_mirantis/ceph.yml b/linux/system/repo/mcp/apt_mirantis/ceph.yml
new file mode 100644
index 0000000..2532f86
--- /dev/null
+++ b/linux/system/repo/mcp/apt_mirantis/ceph.yml
@@ -0,0 +1,17 @@
+parameters:
+ _param:
+ apt_mk_version: stable
+ linux_system_repo_mcp_ceph_version: ${_param:apt_mk_version}
+ linux_system_repo_mcp_ceph_codename: luminous
+ linux:
+ system:
+ repo:
+ mcp_ceph:
+ source: "deb [arch=amd64] http://apt.mirantis.com/${_param:linux_system_codename}/ceph/ ${_param:linux_system_repo_mcp_ceph_version} ${_param:linux_system_repo_mcp_ceph_codename}"
+ architectures: amd64
+ key_url: "http://apt.mirantis.com/public.gpg"
+ clean_file: true
+ pin:
+ - pin: 'release a=${_param:linux_system_repo_mcp_ceph_version}'
+ priority: 1100
+ package: '*'
\ No newline at end of file
diff --git a/linux/system/repo/mcp/apt_mirantis/docker.yml b/linux/system/repo/mcp/apt_mirantis/docker.yml
new file mode 100644
index 0000000..cbd3097
--- /dev/null
+++ b/linux/system/repo/mcp/apt_mirantis/docker.yml
@@ -0,0 +1,16 @@
+parameters:
+ _param:
+ apt_mk_version: stable
+ linux_system_repo_mcp_docker_version: ${_param:apt_mk_version}
+ linux:
+ system:
+ repo:
+ mcp_docker:
+ source: "deb [arch=amd64] http://apt.mirantis.com/${_param:linux_system_codename}/docker/ ${_param:linux_system_repo_mcp_docker_version} stable"
+ architectures: amd64
+ key_url: "http://apt.mirantis.com/public.gpg"
+ clean_file: true
+ pin:
+ - pin: 'release a=${_param:linux_system_repo_mcp_docker_version}'
+ priority: 1100
+ package: '*'
diff --git a/linux/system/repo/mcp/apt_mirantis/docker_legacy.yml b/linux/system/repo/mcp/apt_mirantis/docker_legacy.yml
new file mode 100644
index 0000000..86c6426
--- /dev/null
+++ b/linux/system/repo/mcp/apt_mirantis/docker_legacy.yml
@@ -0,0 +1,16 @@
+parameters:
+ _param:
+ apt_mk_version: stable
+ linux_system_repo_mcp_docker_legacy_version: ${_param:apt_mk_version}
+ linux:
+ system:
+ repo:
+ mcp_docker_legacy:
+ source: "deb [arch=amd64] http://apt.mirantis.com/${_param:linux_system_codename}/docker/ ${_param:linux_system_repo_mcp_docker_legacy_version} legacy"
+ architectures: amd64
+ key_url: "http://apt.mirantis.com/public.gpg"
+ clean_file: true
+ pin:
+ - pin: 'release a=${_param:linux_system_repo_mcp_docker_legacy_version}'
+ priority: 1100
+ package: '*'
diff --git a/linux/system/repo/mcp/apt_mirantis/elastic/2x.yml b/linux/system/repo/mcp/apt_mirantis/elastic/2x.yml
new file mode 100644
index 0000000..4add81e
--- /dev/null
+++ b/linux/system/repo/mcp/apt_mirantis/elastic/2x.yml
@@ -0,0 +1,16 @@
+parameters:
+ _param:
+ apt_mk_version: stable
+ linux_system_repo_mcp_elastic_2x_version: ${_param:apt_mk_version}
+ linux:
+ system:
+ repo:
+ mcp_elastic_2x:
+ source: "deb [arch=amd64] http://apt.mirantis.com/${_param:linux_system_codename}/elastic/2.x/ ${_param:linux_system_repo_mcp_elastic_2x_version} main"
+ architectures: amd64
+ key_url: "http://apt.mirantis.com/public.gpg"
+ clean_file: true
+ pin:
+ - pin: 'release a=${_param:linux_system_repo_mcp_elastic_2x_version}'
+ priority: 1100
+ package: '*'
diff --git a/linux/system/repo/mcp/apt_mirantis/elastic/5x.yml b/linux/system/repo/mcp/apt_mirantis/elastic/5x.yml
new file mode 100644
index 0000000..8876c51
--- /dev/null
+++ b/linux/system/repo/mcp/apt_mirantis/elastic/5x.yml
@@ -0,0 +1,16 @@
+parameters:
+ _param:
+ apt_mk_version: stable
+ linux_system_repo_mcp_elastic_5x_version: ${_param:apt_mk_version}
+ linux:
+ system:
+ repo:
+ mcp_elastic_5x:
+ source: "deb [arch=amd64] http://apt.mirantis.com/${_param:linux_system_codename}/elastic/5.x/ ${_param:linux_system_repo_mcp_elastic_5x_version} main"
+ architectures: amd64
+ key_url: "http://apt.mirantis.com/public.gpg"
+ clean_file: true
+ pin:
+ - pin: 'release a=${_param:linux_system_repo_mcp_elastic_5x_version}'
+ priority: 1100
+ package: '*'
diff --git a/linux/system/repo/mcp/apt_mirantis/elastic/init.yml b/linux/system/repo/mcp/apt_mirantis/elastic/init.yml
new file mode 100644
index 0000000..a66b757
--- /dev/null
+++ b/linux/system/repo/mcp/apt_mirantis/elastic/init.yml
@@ -0,0 +1,3 @@
+classes:
+- system.linux.system.repo.mcp.apt_mirantis.elastic.2x
+- system.linux.system.repo.mcp.apt_mirantis.elastic.5x
\ No newline at end of file
diff --git a/linux/system/repo/mcp/apt_mirantis/fluentd.yml b/linux/system/repo/mcp/apt_mirantis/fluentd.yml
new file mode 100644
index 0000000..da7d3ca
--- /dev/null
+++ b/linux/system/repo/mcp/apt_mirantis/fluentd.yml
@@ -0,0 +1,16 @@
+parameters:
+ _param:
+ apt_mk_version: stable
+ linux_system_repo_mcp_fluentd_version: ${_param:apt_mk_version}
+ linux:
+ system:
+ repo:
+ mcp_fluentd:
+ source: "deb [arch=amd64] http://apt.mirantis.com/${_param:linux_system_codename}/fluentd/ ${_param:linux_system_repo_mcp_fluentd_version} main"
+ architectures: amd64
+ key_url: "http://apt.mirantis.com/public.gpg"
+ clean_file: true
+ pin:
+ - pin: 'release a=${_param:linux_system_repo_mcp_fluentd_version}'
+ priority: 1100
+ package: '*'
diff --git a/linux/system/repo/mcp/apt_mirantis/glusterfs.yml b/linux/system/repo/mcp/apt_mirantis/glusterfs.yml
new file mode 100644
index 0000000..1f5dd0e
--- /dev/null
+++ b/linux/system/repo/mcp/apt_mirantis/glusterfs.yml
@@ -0,0 +1,17 @@
+parameters:
+ _param:
+ apt_mk_version: stable
+ linux_system_repo_mcp_glusterfs_version: ${_param:apt_mk_version}
+ linux_system_repo_mcp_glusterfs_version_number: "3.12"
+ linux:
+ system:
+ repo:
+ mcp_glusterfs:
+ source: "deb [arch=amd64] http://apt.mirantis.com/${_param:linux_system_codename}/glusterfs/ ${_param:linux_system_repo_mcp_glusterfs_version} ${_param:linux_system_repo_mcp_glusterfs_version_number}"
+ architectures: amd64
+ key_url: "http://apt.mirantis.com/public.gpg"
+ clean_file: true
+ pin:
+ - pin: 'release a=${_param:linux_system_repo_mcp_glusterfs_version}'
+ priority: 1100
+ package: '*'
diff --git a/linux/system/repo/mcp/apt_mirantis/grafana.yml b/linux/system/repo/mcp/apt_mirantis/grafana.yml
new file mode 100644
index 0000000..2d71740
--- /dev/null
+++ b/linux/system/repo/mcp/apt_mirantis/grafana.yml
@@ -0,0 +1,16 @@
+parameters:
+ _param:
+ apt_mk_version: stable
+ linux_system_repo_mcp_grafana_version: ${_param:apt_mk_version}
+ linux:
+ system:
+ repo:
+ mcp_grafana:
+ source: "deb [arch=amd64] http://apt.mirantis.com/${_param:linux_system_codename}/grafana/ ${_param:linux_system_repo_mcp_grafana_version} main"
+ architectures: amd64
+ key_url: "http://apt.mirantis.com/public.gpg"
+ clean_file: true
+ pin:
+ - pin: 'release a=${_param:linux_system_repo_mcp_grafana_version}'
+ priority: 1100
+ package: '*'
diff --git a/linux/system/repo/mcp/apt_mirantis/influxdb.yml b/linux/system/repo/mcp/apt_mirantis/influxdb.yml
new file mode 100644
index 0000000..f3c1fec
--- /dev/null
+++ b/linux/system/repo/mcp/apt_mirantis/influxdb.yml
@@ -0,0 +1,16 @@
+parameters:
+ _param:
+ apt_mk_version: stable
+ linux_system_repo_mcp_influxdb_version: ${_param:apt_mk_version}
+ linux:
+ system:
+ repo:
+ mcp_influxdb:
+ source: "deb [arch=amd64] http://apt.mirantis.com/${_param:linux_system_codename}/influxdb/ ${_param:linux_system_repo_mcp_influxdb_version} main"
+ architectures: amd64
+ key_url: "http://apt.mirantis.com/public.gpg"
+ clean_file: true
+ pin:
+ - pin: 'release a=${_param:linux_system_repo_mcp_influxdb_version}'
+ priority: 1100
+ package: '*'
diff --git a/linux/system/repo/mcp/apt_mirantis/kibana/46.yml b/linux/system/repo/mcp/apt_mirantis/kibana/46.yml
new file mode 100644
index 0000000..f3795ad
--- /dev/null
+++ b/linux/system/repo/mcp/apt_mirantis/kibana/46.yml
@@ -0,0 +1,16 @@
+parameters:
+ _param:
+ apt_mk_version: stable
+ linux_system_repo_mcp_kibana_46_version: ${_param:apt_mk_version}
+ linux:
+ system:
+ repo:
+ mcp_kibana_46:
+ source: "deb [arch=amd64] http://apt.mirantis.com/${_param:linux_system_codename}/kibana/4.6/ ${_param:linux_system_repo_mcp_kibana_46_version} kibana-46"
+ architectures: amd64
+ key_url: "http://apt.mirantis.com/public.gpg"
+ clean_file: true
+ pin:
+ - pin: 'release a=${_param:linux_system_repo_mcp_kibana_46_version}'
+ priority: 1100
+ package: '*'
diff --git a/linux/system/repo/mcp/apt_mirantis/kibana/5x.yml b/linux/system/repo/mcp/apt_mirantis/kibana/5x.yml
new file mode 100644
index 0000000..e2f4795
--- /dev/null
+++ b/linux/system/repo/mcp/apt_mirantis/kibana/5x.yml
@@ -0,0 +1,16 @@
+parameters:
+ _param:
+ apt_mk_version: stable
+ linux_system_repo_mcp_kibana_5x_version: ${_param:apt_mk_version}
+ linux:
+ system:
+ repo:
+ mcp_kibana_5x:
+ source: "deb [arch=amd64] http://apt.mirantis.com/${_param:linux_system_codename}/kibana/5.x/ ${_param:linux_system_repo_mcp_kibana_5x_version} kibana-5x"
+ architectures: amd64
+ key_url: "http://apt.mirantis.com/public.gpg"
+ clean_file: true
+ pin:
+ - pin: 'release a=${_param:linux_system_repo_mcp_kibana_5x_version}'
+ priority: 1100
+ package: '*'
diff --git a/linux/system/repo/mcp/apt_mirantis/kibana/init.yml b/linux/system/repo/mcp/apt_mirantis/kibana/init.yml
new file mode 100644
index 0000000..daaf7ab
--- /dev/null
+++ b/linux/system/repo/mcp/apt_mirantis/kibana/init.yml
@@ -0,0 +1,3 @@
+classes:
+- system.linux.system.repo.mcp.apt_mirantis.kibana.46
+- system.linux.system.repo.mcp.apt_mirantis.kibana.5x
\ No newline at end of file
diff --git a/linux/system/repo/mcp/apt_mirantis/maas.yml b/linux/system/repo/mcp/apt_mirantis/maas.yml
new file mode 100644
index 0000000..b18bf65
--- /dev/null
+++ b/linux/system/repo/mcp/apt_mirantis/maas.yml
@@ -0,0 +1,16 @@
+parameters:
+ _param:
+ apt_mk_version: stable
+ linux_system_repo_mcp_maas_version: ${_param:apt_mk_version}
+ linux:
+ system:
+ repo:
+ mcp_maas:
+ source: "deb [arch=amd64] http://apt.mirantis.com/${_param:linux_system_codename}/maas/ ${_param:linux_system_repo_mcp_maas_version} main"
+ architectures: amd64
+ key_url: "http://apt.mirantis.com/public.gpg"
+ clean_file: true
+ pin:
+ - pin: 'release a=${_param:linux_system_repo_mcp_maas_version}'
+ priority: 1100
+ package: '*'
diff --git a/linux/system/repo/mcp/apt_mirantis/openstack.yml b/linux/system/repo/mcp/apt_mirantis/openstack.yml
new file mode 100644
index 0000000..5d11e59
--- /dev/null
+++ b/linux/system/repo/mcp/apt_mirantis/openstack.yml
@@ -0,0 +1,23 @@
+parameters:
+ _param:
+ apt_mk_version: stable
+ linux_system_repo_mk_openstack_version: ${_param:apt_mk_version}
+ linux:
+ system:
+ repo:
+ mirantis_openstack:
+ source: "deb [arch=amd64] http://apt.mirantis.com/${_param:linux_system_codename}/openstack/${_param:openstack_version} ${_param:linux_system_repo_mk_openstack_version} main"
+ architectures: amd64
+ key_url: "http://apt.mirantis.com/public.gpg"
+ pin:
+ - pin: 'release l=${_param:openstack_version}'
+ priority: 1100
+ package: '*'
+ mk_openstack:
+ source: "deb [arch=amd64] http://apt.mirantis.com/${_param:linux_system_codename}/ ${_param:linux_system_repo_mk_openstack_version} ${_param:openstack_version}"
+ architectures: amd64
+ key_url: "http://apt.mirantis.com/public.gpg"
+ pin:
+ - pin: 'release l=${_param:linux_system_repo_mk_openstack_version}'
+ priority: 1100
+ package: '*'
diff --git a/linux/system/repo/mcp/apt_mirantis/saltstack_2016_3.yml b/linux/system/repo/mcp/apt_mirantis/saltstack_2016_3.yml
new file mode 100644
index 0000000..bec95cd
--- /dev/null
+++ b/linux/system/repo/mcp/apt_mirantis/saltstack_2016_3.yml
@@ -0,0 +1,16 @@
+parameters:
+ _param:
+ apt_mk_version: stable
+ linux_system_repo_mcp_saltstack_version: ${_param:apt_mk_version}
+ linux:
+ system:
+ repo:
+ mcp_saltstack:
+ source: "deb [arch=amd64] http://apt.mirantis.com/${_param:linux_system_codename}/salt/2016.3/ ${_param:linux_system_repo_mcp_saltstack_version} main"
+ architectures: amd64
+ key_url: "http://apt.mirantis.com/public.gpg"
+ clean_file: true
+ pin:
+ - pin: 'release a=${_param:linux_system_repo_mcp_saltstack_version}'
+ priority: 1100
+ package: '*'
\ No newline at end of file
diff --git a/linux/system/repo/mcp/apt_mirantis/sensu.yml b/linux/system/repo/mcp/apt_mirantis/sensu.yml
new file mode 100644
index 0000000..f86b88a
--- /dev/null
+++ b/linux/system/repo/mcp/apt_mirantis/sensu.yml
@@ -0,0 +1,16 @@
+parameters:
+ _param:
+ apt_mk_version: stable
+ linux_system_repo_mcp_extra_version: ${_param:apt_mk_version}
+ linux:
+ system:
+ repo:
+ mcp_extra:
+ source: "deb [arch=amd64] http://apt.mirantis.com/${_param:linux_system_codename}/sensu/ ${_param:linux_system_repo_mcp_extra_version} main"
+ architectures: amd64
+ key_url: "http://apt.mirantis.com/public.gpg"
+ clean_file: true
+ pin:
+ - pin: 'release a=${_param:linux_system_repo_mcp_extra_version}'
+ priority: 1100
+ package: '*'
diff --git a/linux/system/repo/mcp/apt_mirantis/ubuntu.yml b/linux/system/repo/mcp/apt_mirantis/ubuntu.yml
new file mode 100644
index 0000000..e254ed6
--- /dev/null
+++ b/linux/system/repo/mcp/apt_mirantis/ubuntu.yml
@@ -0,0 +1,24 @@
+parameters:
+ _param:
+ apt_mk_version: stable
+ linux:
+ system:
+ repo:
+ ubuntu:
+ source: "deb [arch=amd64] http://mirror.mirantis.com/${_param:apt_mk_version}/ubuntu/ ${_param:linux_system_codename} main restricted universe"
+ architectures: amd64
+ default: true
+ key_id: 437D05B5
+ key_server: keyserver.ubuntu.com
+ ubuntu_updates:
+ source: "deb [arch=amd64] http://mirror.mirantis.com/${_param:apt_mk_version}/ubuntu/ ${_param:linux_system_codename}-updates main restricted universe"
+ architectures: amd64
+ default: true
+ key_id: 437D05B5
+ key_server: keyserver.ubuntu.com
+ ubuntu_security:
+ source: "deb [arch=amd64] http://mirror.mirantis.com/${_param:apt_mk_version}/ubuntu/ ${_param:linux_system_codename}-security main restricted universe"
+ architectures: amd64
+ default: true
+ key_id: 437D05B5
+ key_server: keyserver.ubuntu.com
\ No newline at end of file
diff --git a/linux/system/repo_local/mcp/apt_mirantis/aptly.yml b/linux/system/repo_local/mcp/apt_mirantis/aptly.yml
new file mode 100644
index 0000000..cc9e7d4
--- /dev/null
+++ b/linux/system/repo_local/mcp/apt_mirantis/aptly.yml
@@ -0,0 +1,16 @@
+parameters:
+ _param:
+ apt_mk_version: stable
+ linux_system_repo_mcp_aptly_version: ${_param:apt_mk_version}
+ linux:
+ system:
+ repo:
+ mcp_aptly:
+ source: "deb [arch=amd64] http://${_param:local_repo_url}/ubuntu-${_param:linux_system_codename}/aptly/ ${_param:linux_system_repo_mcp_aptly_version} main"
+ architectures: amd64
+ key_url: "http://${_param:local_repo_url}/public.gpg"
+ clean_file: true
+ pin:
+ - pin: 'release a=${_param:linux_system_repo_mcp_aptly_version}'
+ priority: 1100
+ package: '*'
diff --git a/linux/system/repo_local/mcp/apt_mirantis/cassandra.yml b/linux/system/repo_local/mcp/apt_mirantis/cassandra.yml
new file mode 100644
index 0000000..ed767ab
--- /dev/null
+++ b/linux/system/repo_local/mcp/apt_mirantis/cassandra.yml
@@ -0,0 +1,17 @@
+parameters:
+ _param:
+ apt_mk_version: stable
+ linux_system_repo_mcp_cassandra_version: ${_param:apt_mk_version}
+ linux_system_repo_mcp_cassandra_version_number: "21x"
+ linux:
+ system:
+ repo:
+ mcp_cassandra:
+ source: "deb [arch=amd64] http://${_param:local_repo_url}/ubuntu-${_param:linux_system_codename}/cassandra/ ${_param:linux_system_repo_mcp_cassandra_version} ${_param:linux_system_repo_mcp_cassandra_version_number}"
+ architectures: amd64
+ key_url: "http://${_param:local_repo_url}/public.gpg"
+ clean_file: true
+ pin:
+ - pin: 'release a=${_param:linux_system_repo_mcp_cassandra_version}'
+ priority: 1100
+ package: '*'
diff --git a/linux/system/repo_local/mcp/apt_mirantis/ceph.yml b/linux/system/repo_local/mcp/apt_mirantis/ceph.yml
new file mode 100644
index 0000000..05f4957
--- /dev/null
+++ b/linux/system/repo_local/mcp/apt_mirantis/ceph.yml
@@ -0,0 +1,17 @@
+parameters:
+ _param:
+ apt_mk_version: stable
+ linux_system_repo_mcp_ceph_version: ${_param:apt_mk_version}
+ linux_system_repo_mcp_ceph_codename: luminous
+ linux:
+ system:
+ repo:
+ mcp_ceph:
+ source: "deb [arch=amd64] http://${_param:local_repo_url}/ubuntu-${_param:linux_system_codename}/ceph/ ${_param:linux_system_repo_mcp_ceph_version} ${_param:linux_system_repo_mcp_ceph_codename}"
+ architectures: amd64
+ key_url: "http://${_param:local_repo_url}/public.gpg"
+ clean_file: true
+ pin:
+ - pin: 'release a=${_param:linux_system_repo_mcp_ceph_version}'
+ priority: 1100
+ package: '*'
diff --git a/linux/system/repo_local/mcp/apt_mirantis/docker.yml b/linux/system/repo_local/mcp/apt_mirantis/docker.yml
new file mode 100644
index 0000000..84fed9f
--- /dev/null
+++ b/linux/system/repo_local/mcp/apt_mirantis/docker.yml
@@ -0,0 +1,16 @@
+parameters:
+ _param:
+ apt_mk_version: stable
+ linux_system_repo_mcp_docker_version: ${_param:apt_mk_version}
+ linux:
+ system:
+ repo:
+ mcp_docker:
+ source: "deb [arch=amd64] http://${_param:local_repo_url}/ubuntu-${_param:linux_system_codename}/docker/ ${_param:linux_system_repo_mcp_docker_version} stable"
+ architectures: amd64
+ key_url: "http://${_param:local_repo_url}/public.gpg"
+ clean_file: true
+ pin:
+ - pin: 'release a=${_param:linux_system_repo_mcp_docker_version}'
+ priority: 1100
+ package: '*'
diff --git a/linux/system/repo_local/mcp/apt_mirantis/docker_legacy.yml b/linux/system/repo_local/mcp/apt_mirantis/docker_legacy.yml
new file mode 100644
index 0000000..9b85ea2
--- /dev/null
+++ b/linux/system/repo_local/mcp/apt_mirantis/docker_legacy.yml
@@ -0,0 +1,16 @@
+parameters:
+ _param:
+ apt_mk_version: stable
+ linux_system_repo_mcp_docker_legacy_version: ${_param:apt_mk_version}
+ linux:
+ system:
+ repo:
+ mcp_docker_legacy:
+ source: "deb [arch=amd64] http://${_param:local_repo_url}/ubuntu-${_param:linux_system_codename}/docker/ ${_param:linux_system_repo_mcp_docker_legacy_version} legacy"
+ architectures: amd64
+ key_url: "http://${_param:local_repo_url}/public.gpg"
+ clean_file: true
+ pin:
+ - pin: 'release a=${_param:linux_system_repo_mcp_docker_legacy_version}'
+ priority: 1100
+ package: '*'
diff --git a/linux/system/repo_local/mcp/apt_mirantis/elastic/2x.yml b/linux/system/repo_local/mcp/apt_mirantis/elastic/2x.yml
new file mode 100644
index 0000000..3cade96
--- /dev/null
+++ b/linux/system/repo_local/mcp/apt_mirantis/elastic/2x.yml
@@ -0,0 +1,16 @@
+parameters:
+ _param:
+ apt_mk_version: stable
+ linux_system_repo_mcp_elastic_2x_version: ${_param:apt_mk_version}
+ linux:
+ system:
+ repo:
+ mcp_elastic_2x:
+ source: "deb [arch=amd64] http://${_param:local_repo_url}/ubuntu-${_param:linux_system_codename}/elastic/2.x/ ${_param:linux_system_repo_mcp_elastic_2x_version} main"
+ architectures: amd64
+ key_url: "http://${_param:local_repo_url}/public.gpg"
+ clean_file: true
+ pin:
+ - pin: 'release a=${_param:linux_system_repo_mcp_elastic_2x_version}'
+ priority: 1100
+ package: '*'
diff --git a/linux/system/repo_local/mcp/apt_mirantis/elastic/5x.yml b/linux/system/repo_local/mcp/apt_mirantis/elastic/5x.yml
new file mode 100644
index 0000000..7349f72
--- /dev/null
+++ b/linux/system/repo_local/mcp/apt_mirantis/elastic/5x.yml
@@ -0,0 +1,16 @@
+parameters:
+ _param:
+ apt_mk_version: stable
+ linux_system_repo_mcp_elastic_5x_version: ${_param:apt_mk_version}
+ linux:
+ system:
+ repo:
+ mcp_elastic_5x:
+ source: "deb [arch=amd64] http://${_param:local_repo_url}/ubuntu-${_param:linux_system_codename}/elastic/5.x/ ${_param:linux_system_repo_mcp_elastic_5x_version} main"
+ architectures: amd64
+ key_url: "http://${_param:local_repo_url}/public.gpg"
+ clean_file: true
+ pin:
+ - pin: 'release a=${_param:linux_system_repo_mcp_elastic_5x_version}'
+ priority: 1100
+ package: '*'
diff --git a/linux/system/repo_local/mcp/apt_mirantis/elastic/init.yml b/linux/system/repo_local/mcp/apt_mirantis/elastic/init.yml
new file mode 100644
index 0000000..f356aa2
--- /dev/null
+++ b/linux/system/repo_local/mcp/apt_mirantis/elastic/init.yml
@@ -0,0 +1,3 @@
+classes:
+- system.linux.system.repo_local.mcp.apt_mirantis.elastic.2x
+- system.linux.system.repo_local.mcp.apt_mirantis.elastic.5x
\ No newline at end of file
diff --git a/linux/system/repo_local/mcp/apt_mirantis/fluentd.yml b/linux/system/repo_local/mcp/apt_mirantis/fluentd.yml
new file mode 100644
index 0000000..40682d7
--- /dev/null
+++ b/linux/system/repo_local/mcp/apt_mirantis/fluentd.yml
@@ -0,0 +1,16 @@
+parameters:
+ _param:
+ apt_mk_version: stable
+ linux_system_repo_mcp_fluentd_version: ${_param:apt_mk_version}
+ linux:
+ system:
+ repo:
+ mcp_fluentd:
+ source: "deb [arch=amd64] http://${_param:local_repo_url}/ubuntu-${_param:linux_system_codename}/fluentd/ ${_param:linux_system_repo_mcp_fluentd_version} main"
+ architectures: amd64
+ key_url: "http://${_param:local_repo_url}/public.gpg"
+ clean_file: true
+ pin:
+ - pin: 'release a=${_param:linux_system_repo_mcp_fluentd_version}'
+ priority: 1100
+ package: '*'
diff --git a/linux/system/repo_local/mcp/apt_mirantis/glusterfs.yml b/linux/system/repo_local/mcp/apt_mirantis/glusterfs.yml
new file mode 100644
index 0000000..ca7e1bd
--- /dev/null
+++ b/linux/system/repo_local/mcp/apt_mirantis/glusterfs.yml
@@ -0,0 +1,17 @@
+parameters:
+ _param:
+ apt_mk_version: stable
+ linux_system_repo_mcp_glusterfs_version: ${_param:apt_mk_version}
+ linux_system_repo_mcp_glusterfs_version_number: "3.12"
+ linux:
+ system:
+ repo:
+ mcp_glusterfs:
+ source: "deb [arch=amd64] http://${_param:local_repo_url}/ubuntu-${_param:linux_system_codename}/glusterfs/ ${_param:linux_system_repo_mcp_glusterfs_version} ${_param:linux_system_repo_mcp_glusterfs_version_number}"
+ architectures: amd64
+ key_url: "http://${_param:local_repo_url}/public.gpg"
+ clean_file: true
+ pin:
+ - pin: 'release a=${_param:linux_system_repo_mcp_glusterfs_version}'
+ priority: 1100
+ package: '*'
diff --git a/linux/system/repo_local/mcp/apt_mirantis/grafana.yml b/linux/system/repo_local/mcp/apt_mirantis/grafana.yml
new file mode 100644
index 0000000..5ba6a63
--- /dev/null
+++ b/linux/system/repo_local/mcp/apt_mirantis/grafana.yml
@@ -0,0 +1,16 @@
+parameters:
+ _param:
+ apt_mk_version: stable
+ linux_system_repo_mcp_grafana_version: ${_param:apt_mk_version}
+ linux:
+ system:
+ repo:
+ mcp_grafana:
+ source: "deb [arch=amd64] http://${_param:local_repo_url}/ubuntu-${_param:linux_system_codename}/grafana/ ${_param:linux_system_repo_mcp_grafana_version} main"
+ architectures: amd64
+ key_url: "http://${_param:local_repo_url}/public.gpg"
+ clean_file: true
+ pin:
+ - pin: 'release a=${_param:linux_system_repo_mcp_grafana_version}'
+ priority: 1100
+ package: '*'
diff --git a/linux/system/repo_local/mcp/apt_mirantis/influxdb.yml b/linux/system/repo_local/mcp/apt_mirantis/influxdb.yml
new file mode 100644
index 0000000..6bd6509
--- /dev/null
+++ b/linux/system/repo_local/mcp/apt_mirantis/influxdb.yml
@@ -0,0 +1,16 @@
+parameters:
+ _param:
+ apt_mk_version: stable
+ linux_system_repo_mcp_influxdb_version: ${_param:apt_mk_version}
+ linux:
+ system:
+ repo:
+ mcp_influxdb:
+ source: "deb [arch=amd64] http://${_param:local_repo_url}/ubuntu-${_param:linux_system_codename}/influxdb/ ${_param:linux_system_repo_mcp_influxdb_version} main"
+ architectures: amd64
+ key_url: "http://${_param:local_repo_url}/public.gpg"
+ clean_file: true
+ pin:
+ - pin: 'release a=${_param:linux_system_repo_mcp_influxdb_version}'
+ priority: 1100
+ package: '*'
diff --git a/linux/system/repo_local/mcp/apt_mirantis/kibana/46.yml b/linux/system/repo_local/mcp/apt_mirantis/kibana/46.yml
new file mode 100644
index 0000000..7fa87a0
--- /dev/null
+++ b/linux/system/repo_local/mcp/apt_mirantis/kibana/46.yml
@@ -0,0 +1,16 @@
+parameters:
+ _param:
+ apt_mk_version: stable
+ linux_system_repo_mcp_kibana_46_version: ${_param:apt_mk_version}
+ linux:
+ system:
+ repo:
+ mcp_kibana_46:
+ source: "deb [arch=amd64] http://${_param:local_repo_url}/ubuntu-${_param:linux_system_codename}/kibana/4.6/ ${_param:linux_system_repo_mcp_kibana_46_version} kibana-46"
+ architectures: amd64
+ key_url: "http://${_param:local_repo_url}/public.gpg"
+ clean_file: true
+ pin:
+ - pin: 'release a=${_param:linux_system_repo_mcp_kibana_46_version}'
+ priority: 1100
+ package: '*'
diff --git a/linux/system/repo_local/mcp/apt_mirantis/kibana/5x.yml b/linux/system/repo_local/mcp/apt_mirantis/kibana/5x.yml
new file mode 100644
index 0000000..2441568
--- /dev/null
+++ b/linux/system/repo_local/mcp/apt_mirantis/kibana/5x.yml
@@ -0,0 +1,16 @@
+parameters:
+ _param:
+ apt_mk_version: stable
+ linux_system_repo_mcp_kibana_5x_version: ${_param:apt_mk_version}
+ linux:
+ system:
+ repo:
+ mcp_kibana_5x:
+ source: "deb [arch=amd64] http://${_param:local_repo_url}/ubuntu-${_param:linux_system_codename}/kibana/5.x/ ${_param:linux_system_repo_mcp_kibana_5x_version} kibana-5x"
+ architectures: amd64
+ key_url: "http://${_param:local_repo_url}/public.gpg"
+ clean_file: true
+ pin:
+ - pin: 'release a=${_param:linux_system_repo_mcp_kibana_5x_version}'
+ priority: 1100
+ package: '*'
diff --git a/linux/system/repo_local/mcp/apt_mirantis/kibana/init.yml b/linux/system/repo_local/mcp/apt_mirantis/kibana/init.yml
new file mode 100644
index 0000000..fe9ec2e
--- /dev/null
+++ b/linux/system/repo_local/mcp/apt_mirantis/kibana/init.yml
@@ -0,0 +1,3 @@
+classes:
+- system.linux.system.repo_local.mcp.apt_mirantis.kibana.46
+- system.linux.system.repo_local.mcp.apt_mirantis.kibana.5x
\ No newline at end of file
diff --git a/linux/system/repo_local/mcp/apt_mirantis/maas.yml b/linux/system/repo_local/mcp/apt_mirantis/maas.yml
new file mode 100644
index 0000000..63f82c2
--- /dev/null
+++ b/linux/system/repo_local/mcp/apt_mirantis/maas.yml
@@ -0,0 +1,16 @@
+parameters:
+ _param:
+ apt_mk_version: stable
+ linux_system_repo_mcp_maas_version: ${_param:apt_mk_version}
+ linux:
+ system:
+ repo:
+ mcp_maas:
+ source: "deb [arch=amd64] http://${_param:local_repo_url}/ubuntu-${_param:linux_system_codename}/maas/ ${_param:linux_system_repo_mcp_maas_version} main"
+ architectures: amd64
+ key_url: "http://${_param:local_repo_url}/public.gpg"
+ clean_file: true
+ pin:
+ - pin: 'release a=${_param:linux_system_repo_mcp_maas_version}'
+ priority: 1100
+ package: '*'
diff --git a/linux/system/repo_local/mcp/apt_mirantis/openstack.yml b/linux/system/repo_local/mcp/apt_mirantis/openstack.yml
new file mode 100644
index 0000000..0ce7d41
--- /dev/null
+++ b/linux/system/repo_local/mcp/apt_mirantis/openstack.yml
@@ -0,0 +1,15 @@
+parameters:
+ _param:
+ apt_mk_version: stable
+ linux_system_repo_mk_openstack_version: ${_param:apt_mk_version}
+ linux:
+ system:
+ repo:
+ mirantis_openstack:
+ source: "deb [arch=amd64] http://${_param:local_repo_url}/ubuntu-${_param:linux_system_codename}/openstack/${_param:openstack_version} ${_param:linux_system_repo_mk_openstack_version} main"
+ architectures: amd64
+ key_url: "http://${_param:local_repo_url}/public.gpg"
+ pin:
+ - pin: 'release l=${_param:openstack_version}'
+ priority: 1100
+ package: '*'
\ No newline at end of file
diff --git a/linux/system/repo_local/mcp/apt_mirantis/saltstack_2016_3.yml b/linux/system/repo_local/mcp/apt_mirantis/saltstack_2016_3.yml
new file mode 100644
index 0000000..1cd567a
--- /dev/null
+++ b/linux/system/repo_local/mcp/apt_mirantis/saltstack_2016_3.yml
@@ -0,0 +1,16 @@
+parameters:
+ _param:
+ apt_mk_version: stable
+ linux_system_repo_mcp_saltstack_version: ${_param:apt_mk_version}
+ linux:
+ system:
+ repo:
+ mcp_saltstack:
+ source: "deb [arch=amd64] http://${_param:local_repo_url}/ubuntu-${_param:linux_system_codename}/salt/2016.3/ ${_param:linux_system_repo_mcp_saltstack_version} main"
+ architectures: amd64
+ key_url: "http://${_param:local_repo_url}/public.gpg"
+ clean_file: true
+ pin:
+ - pin: 'release a=${_param:linux_system_repo_mcp_saltstack_version}'
+ priority: 1100
+ package: '*'
\ No newline at end of file
diff --git a/linux/system/repo_local/mcp/apt_mirantis/sensu.yml b/linux/system/repo_local/mcp/apt_mirantis/sensu.yml
new file mode 100644
index 0000000..5cd16cf
--- /dev/null
+++ b/linux/system/repo_local/mcp/apt_mirantis/sensu.yml
@@ -0,0 +1,16 @@
+parameters:
+ _param:
+ apt_mk_version: stable
+ linux_system_repo_mcp_extra_version: ${_param:apt_mk_version}
+ linux:
+ system:
+ repo:
+ mcp_extra:
+ source: "deb [arch=amd64] http://${_param:local_repo_url}/ubuntu-${_param:linux_system_codename}/sensu/ ${_param:linux_system_repo_mcp_extra_version} main"
+ architectures: amd64
+ key_url: "http://${_param:local_repo_url}/public.gpg"
+ clean_file: true
+ pin:
+ - pin: 'release a=${_param:linux_system_repo_mcp_extra_version}'
+ priority: 1100
+ package: '*'
diff --git a/linux/system/repo_local/mcp/apt_mirantis/ubuntu.yml b/linux/system/repo_local/mcp/apt_mirantis/ubuntu.yml
new file mode 100644
index 0000000..d510183
--- /dev/null
+++ b/linux/system/repo_local/mcp/apt_mirantis/ubuntu.yml
@@ -0,0 +1,23 @@
+parameters:
+ linux:
+ system:
+ repo:
+ ubuntu:
+ refresh_db: ${_param:linux_repo_refresh_db}
+ source: "deb [arch=amd64] http://${_param:local_repo_url}/ubuntu ${_param:linux_system_codename} main universe restricted"
+ architectures: amd64
+ default: true
+ key_url: "http://${_param:local_repo_url}/public.gpg"
+ ubuntu-updates:
+ refresh_db: ${_param:linux_repo_refresh_db}
+ source: "deb [arch=amd64] http://${_param:local_repo_url}/ubuntu ${_param:linux_system_codename}-updates main universe restricted"
+ architectures: amd64
+ default: true
+ key_url: "http://${_param:local_repo_url}/public.gpg"
+ ubuntu-security:
+ refresh_db: ${_param:linux_repo_refresh_db}
+ source: "deb [arch=amd64] http://${_param:local_repo_url}/ubuntu ${_param:linux_system_codename}-security main universe restricted"
+ architectures: amd64
+ default: true
+ key_url: "http://${_param:local_repo_url}/public.gpg"
+
diff --git a/linux/system/repo_local/mcp/openstack.yml b/linux/system/repo_local/mcp/openstack.yml
index 08f1e67..2e69ef2 100644
--- a/linux/system/repo_local/mcp/openstack.yml
+++ b/linux/system/repo_local/mcp/openstack.yml
@@ -1,4 +1,7 @@
parameters:
+ _param:
+ apt_mk_version: stable
+ linux_system_repo_mk_openstack_version: ${_param:apt_mk_version}
linux:
system:
repo:
@@ -10,3 +13,11 @@
- pin: 'release l=${_param:openstack_version}'
priority: 1100
package: '*'
+ mk_openstack:
+ source: "deb [arch=amd64] http://${_param:local_repo_url}/ubuntu-${_param:linux_system_codename}/ ${_param:linux_system_repo_mk_openstack_version} ${_param:openstack_version}"
+ architectures: amd64
+ key_url: "http://${_param:local_repo_url}/public.gpg"
+ pin:
+ - pin: 'release l=${_param:linux_system_repo_mk_openstack_version}'
+ priority: 1100
+ package: '*'
diff --git a/linux/system/repo_local/ubuntu.yml b/linux/system/repo_local/ubuntu.yml
index d510183..46994ee 100644
--- a/linux/system/repo_local/ubuntu.yml
+++ b/linux/system/repo_local/ubuntu.yml
@@ -20,4 +20,3 @@
architectures: amd64
default: true
key_url: "http://${_param:local_repo_url}/public.gpg"
-
diff --git a/maas/region/restoredb.yml b/maas/region/restoredb.yml
new file mode 100644
index 0000000..df4ff95
--- /dev/null
+++ b/maas/region/restoredb.yml
@@ -0,0 +1,9 @@
+classes:
+- system.maas.region.single
+parameters:
+ maas:
+ region:
+ database:
+ initial_data:
+ source: ${linux:network:fqdn}
+ host: ${_param:backupninja_backup_host}
\ No newline at end of file
diff --git a/maas/region/single.yml b/maas/region/single.yml
index 20779aa..3fdc105 100644
--- a/maas/region/single.yml
+++ b/maas/region/single.yml
@@ -36,7 +36,7 @@
dnssec_validation: 'no'
enable_third_party_drivers: true
maas_name: mas01
- active_discovery_interval: '600'
+ active_discovery_interval: 600
ntp_external_only: true
upstream_dns: ${_param:dns_server01}
enable_http_proxy: false
diff --git a/neutron/compute/nfv/dpdk.yml b/neutron/compute/nfv/dpdk.yml
index c8872c7..0901bb8 100644
--- a/neutron/compute/nfv/dpdk.yml
+++ b/neutron/compute/nfv/dpdk.yml
@@ -1,4 +1,6 @@
parameters:
+ _param:
+ compute_ovs_vhost_socket_dir: "/run/openvswitch-vhost"
linux:
network:
bridge: openvswitch
@@ -12,7 +14,8 @@
memory_channels: "${_param:compute_ovs_memory_channels}"
vhost_socket_dir:
name: "openvswitch-vhost"
- path: "/run/openvswitch-vhost"
+ path: "${_param:compute_ovs_vhost_socket_dir}"
neutron:
compute:
dpdk: True
+ vhost_socket_dir: "${_param:compute_ovs_vhost_socket_dir}"
diff --git a/neutron/control/cluster.yml b/neutron/control/cluster.yml
index 47928b6..ea9596d 100644
--- a/neutron/control/cluster.yml
+++ b/neutron/control/cluster.yml
@@ -21,15 +21,15 @@
- address: ${_param:cluster_vip_address}
port: 9696
servers:
- - name: ctl01
+ - name: ${_param:cluster_node01_hostname}
host: ${_param:cluster_node01_address}
port: 9696
params: check inter 10s fastinter 2s downinter 3s rise 3 fall 3
- - name: ctl02
+ - name: ${_param:cluster_node02_hostname}
host: ${_param:cluster_node02_address}
port: 9696
params: check inter 10s fastinter 2s downinter 3s rise 3 fall 3
- - name: ctl03
+ - name: ${_param:cluster_node03_hostname}
host: ${_param:cluster_node03_address}
port: 9696
params: check inter 10s fastinter 2s downinter 3s rise 3 fall 3
diff --git a/neutron/control/openvswitch/cluster.yml b/neutron/control/openvswitch/cluster.yml
index 032ffbf..80489c8 100644
--- a/neutron/control/openvswitch/cluster.yml
+++ b/neutron/control/openvswitch/cluster.yml
@@ -47,15 +47,15 @@
- address: ${_param:cluster_vip_address}
port: 9696
servers:
- - name: ctl01
+ - name: ${_param:cluster_node01_hostname}
host: ${_param:cluster_node01_address}
port: 9696
params: check inter 10s fastinter 2s downinter 3s rise 3 fall 3
- - name: ctl02
+ - name: ${_param:cluster_node02_hostname}
host: ${_param:cluster_node02_address}
port: 9696
params: check inter 10s fastinter 2s downinter 3s rise 3 fall 3
- - name: ctl03
+ - name: ${_param:cluster_node03_hostname}
host: ${_param:cluster_node03_address}
port: 9696
params: check inter 10s fastinter 2s downinter 3s rise 3 fall 3
diff --git a/nginx/server/proxy/openstack/glare.yml b/nginx/server/proxy/openstack/glare.yml
new file mode 100644
index 0000000..898f622
--- /dev/null
+++ b/nginx/server/proxy/openstack/glare.yml
@@ -0,0 +1,22 @@
+parameters:
+ _param:
+ nginx_proxy_openstack_api_host: ${_param:cluster_public_host}
+ nginx:
+ server:
+ enabled: true
+ site:
+ nginx_proxy_openstack_api_glare:
+ enabled: true
+ type: nginx_proxy
+ name: openstack_api_glare
+ underscores_in_headers: true
+ check: false
+ proxy:
+ host: ${_param:glance_service_host}
+ port: 9494
+ protocol: http
+ size: 30000m
+ host:
+ name: ${_param:nginx_proxy_openstack_api_host}
+ port: 9494
+ ssl: ${_param:nginx_proxy_ssl}
diff --git a/nginx/server/proxy/oss/devops_portal.yml b/nginx/server/proxy/oss/devops_portal.yml
new file mode 100644
index 0000000..7e313bc
--- /dev/null
+++ b/nginx/server/proxy/oss/devops_portal.yml
@@ -0,0 +1,20 @@
+parameters:
+ nginx:
+ server:
+ enabled: true
+ site:
+ nginx_devops_portal:
+ enabled: true
+ type: nginx_proxy
+ name: devops_portal
+ check: false
+ proxy:
+ host: ${_param:stacklight_monitor_address}
+ port: 8800
+ protocol: http
+ websocket: true
+ host:
+ name: ${_param:cluster_public_host}
+ port: 8800
+ protocol: https
+ ssl: ${_param:nginx_proxy_ssl}
diff --git a/nginx/server/proxy/oss/rundeck.yml b/nginx/server/proxy/oss/rundeck.yml
new file mode 100644
index 0000000..e6a0303
--- /dev/null
+++ b/nginx/server/proxy/oss/rundeck.yml
@@ -0,0 +1,20 @@
+parameters:
+ nginx:
+ server:
+ enabled: true
+ site:
+ nginx_rundeck:
+ enabled: true
+ type: nginx_proxy
+ name: rundeck
+ check: false
+ proxy:
+ host: ${_param:stacklight_monitor_address}
+ port: 4440
+ protocol: http
+ websocket: true
+ host:
+ name: ${_param:cluster_public_host}
+ port: 4440
+ protocol: https
+ ssl: ${_param:nginx_proxy_ssl}
diff --git a/opencontrail/client/resource/llgr.yml b/opencontrail/client/resource/llgr.yml
new file mode 100644
index 0000000..aff3ffb
--- /dev/null
+++ b/opencontrail/client/resource/llgr.yml
@@ -0,0 +1,18 @@
+parameters:
+ _param:
+ opencontrail_gsc_grp_enable: True
+ opencontrail_gsc_grp_restart_time: 60
+ opencontrail_gsc_grp_end_of_rib_timeout: 30
+ opencontrail_gsc_grp_bgp_helper_enable: False
+ opencontrail_gsc_grp_xmpp_helper_enable: False
+ opencontrail_gsc_grp_long_lived_restart_time: 300
+ opencontrail:
+ client:
+ global_system_config:
+ grp:
+ enable: ${_param:opencontrail_gsc_grp_enable}
+ restart_time: ${_param:opencontrail_gsc_grp_restart_time}
+ end_of_rib_timeout: ${_param:opencontrail_gsc_grp_end_of_rib_timeout}
+ bgp_helper_enable: ${_param:opencontrail_gsc_grp_bgp_helper_enable}
+ xmpp_helper_enable: ${_param:opencontrail_gsc_grp_xmpp_helper_enable}
+ long_lived_restart_time: ${_param:opencontrail_gsc_grp_long_lived_restart_time}
diff --git a/opencontrail/compute/upgrade.yml b/opencontrail/compute/upgrade.yml
new file mode 100644
index 0000000..d1e4894
--- /dev/null
+++ b/opencontrail/compute/upgrade.yml
@@ -0,0 +1,14 @@
+parameters:
+ opencontrail:
+ compute:
+ control:
+ members:
+ - host: ${_param:opencontrail_control_node01_address}
+ - host: ${_param:opencontrail_control_node02_address}
+ collector:
+ members:
+ - host: ${_param:opencontrail_analytics_node01_address}
+ - host: ${_param:opencontrail_analytics_node02_address}
+ - host: ${_param:opencontrail_analytics_node03_address}
+ discovery:
+ enabled: False
diff --git a/opencontrail/control/analytics4_0.yml b/opencontrail/control/analytics4_0.yml
index c38e06a..9614d61 100644
--- a/opencontrail/control/analytics4_0.yml
+++ b/opencontrail/control/analytics4_0.yml
@@ -13,8 +13,10 @@
opencontrail_message_queue_node02_address: ${_param:openstack_message_queue_node02_address}
opencontrail_message_queue_node03_address: ${_param:openstack_message_queue_node03_address}
opencontrail_message_queue_address: ${_param:openstack_message_queue_address}
- opencontrail_analytics_image: docker-prod-local.artifactory.mirantis.com/opencontrail/opencontrail-analytics
- opencontrail_analyticsdb_image: docker-prod-local.artifactory.mirantis.com/opencontrail/opencontrail-analyticsdb
+ opencontrail_analytics_image: docker-prod-local.artifactory.mirantis.com/opencontrail-${_param:linux_repo_contrail_component}/opencontrail-analytics
+ opencontrail_analyticsdb_image: docker-prod-local.artifactory.mirantis.com/opencontrail-${_param:linux_repo_contrail_component}/opencontrail-analyticsdb
+ opencontrail_analytics_container_name: opencontrail_analytics_1
+ opencontrail_analyticsdb_container_name: opencontrail_analyticsdb_1
# Temprorary fix for MOS9 packages to pin old version of kafka
linux:
system:
@@ -68,19 +70,22 @@
docker:
client:
compose:
- opencontrail_api:
+ opencontrail:
status: up
pull: true
service:
analytics:
image: ${_param:opencontrail_analytics_image}
+ container_name: ${_param:opencontrail_analytics_container_name}
network_mode: "host"
privileged: true
+ restart: always
volumes:
- /etc/contrail:/etc/contrail
- /etc/redis/redis.conf:/etc/redis/redis.conf
analyticsdb:
image: ${_param:opencontrail_analyticsdb_image}
+ container_name: ${_param:opencontrail_analyticsdb_container_name}
volumes:
- /etc/cassandra/cassandra-env-analytics.sh:/etc/cassandra/cassandra-env.sh
- /etc/cassandra/cassandra_analytics.yaml:/etc/cassandra/cassandra.yaml
@@ -97,3 +102,4 @@
- /etc/zookeeper/conf/log4j.properties:/etc/zookeeper/conf/log4j.properties
network_mode: "host"
privileged: true
+ restart: always
diff --git a/opencontrail/control/cluster4_0.yml b/opencontrail/control/cluster4_0.yml
index 92a6a17..60749b3 100644
--- a/opencontrail/control/cluster4_0.yml
+++ b/opencontrail/control/cluster4_0.yml
@@ -14,9 +14,12 @@
opencontrail_message_queue_node02_address: ${_param:openstack_control_node02_address}
opencontrail_message_queue_node03_address: ${_param:openstack_control_node03_address}
opencontrail_message_queue_address: ${_param:openstack_control_address}
- opencontrail_analytics_image: docker-prod-local.artifactory.mirantis.com/opencontrail/opencontrail-analytics
- opencontrail_analyticsdb_image: docker-prod-local.artifactory.mirantis.com/opencontrail/opencontrail-analyticsdb
- opencontrail_controller_image: docker-prod-local.artifactory.mirantis.com/opencontrail/opencontrail-controller
+ opencontrail_analytics_image: docker-prod-local.artifactory.mirantis.com/opencontrail-${_param:linux_repo_contrail_component}/opencontrail-analytics
+ opencontrail_analyticsdb_image: docker-prod-local.artifactory.mirantis.com/opencontrail-${_param:linux_repo_contrail_component}/opencontrail-analyticsdb
+ opencontrail_controller_image: docker-prod-local.artifactory.mirantis.com/opencontrail-${_param:linux_repo_contrail_component}/opencontrail-controller
+ opencontrail_controller_container_name: opencontrail_controller_1
+ opencontrail_analytics_container_name: opencontrail_analytics_1
+ opencontrail_analyticsdb_container_name: opencontrail_analyticsdb_1
analytics_vip_address: ${_param:opencontrail_analytics_address}
# Temprorary fix for MOS9 packages to pin old version of kafka
linux:
@@ -125,12 +128,13 @@
docker:
client:
compose:
- opencontrail_api:
+ opencontrail:
status: up
pull: true
service:
controller:
image: ${_param:opencontrail_controller_image}
+ container_name: ${_param:opencontrail_controller_container_name}
volumes:
- /etc/contrail:/etc/contrail
- /var/lib/configdb:/var/lib/cassandra
@@ -143,15 +147,19 @@
- /etc/zookeeper/conf/log4j.properties:/etc/zookeeper/conf/log4j.properties
network_mode: "host"
privileged: true
+ restart: always
analytics:
image: ${_param:opencontrail_analytics_image}
+ container_name: ${_param:opencontrail_analytics_container_name}
network_mode: "host"
privileged: true
+ restart: always
volumes:
- /etc/contrail:/etc/contrail
- /etc/redis/redis.conf:/etc/redis/redis.conf
analyticsdb:
image: ${_param:opencontrail_analyticsdb_image}
+ container_name: ${_param:opencontrail_analyticsdb_container_name}
volumes:
- /etc/cassandra/cassandra-env-analytics.sh:/etc/cassandra/cassandra-env.sh
- /etc/cassandra/cassandra_analytics.yaml:/etc/cassandra/cassandra.yaml
@@ -168,3 +176,4 @@
- /etc/zookeeper/conf/log4j.properties:/etc/zookeeper/conf/log4j.properties
network_mode: "host"
privileged: true
+ restart: always
diff --git a/opencontrail/control/control4_0.yml b/opencontrail/control/control4_0.yml
index f1d603c..02ab75e 100644
--- a/opencontrail/control/control4_0.yml
+++ b/opencontrail/control/control4_0.yml
@@ -9,7 +9,8 @@
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_controller_image: docker-prod-local.artifactory.mirantis.com/opencontrail/opencontrail-controller
+ opencontrail_controller_image: docker-prod-local.artifactory.mirantis.com/opencontrail-${_param:linux_repo_contrail_component}/opencontrail-controller
+ opencontrail_controller_container_name: opencontrail_controller_1
analytics_vip_address: ${_param:opencontrail_analytics_address}
opencontrail:
common:
@@ -87,12 +88,13 @@
docker:
client:
compose:
- opencontrail_api:
+ opencontrail:
status: up
pull: true
service:
controller:
image: ${_param:opencontrail_controller_image}
+ container_name: ${_param:opencontrail_controller_container_name}
volumes:
- /etc/contrail:/etc/contrail
- /var/lib/configdb:/var/lib/cassandra
@@ -105,3 +107,4 @@
- /etc/zookeeper/conf/log4j.properties:/etc/zookeeper/conf/log4j.properties
network_mode: "host"
privileged: true
+ restart: always
diff --git a/opencontrail/control/single4_0.yml b/opencontrail/control/single4_0.yml
index a9ae787..a4fae18 100644
--- a/opencontrail/control/single4_0.yml
+++ b/opencontrail/control/single4_0.yml
@@ -7,9 +7,12 @@
opencontrail_kafka_log_cleanup_dir: '/usr/share/kafka/logs/'
opencontrail_version: 4.0
linux_repo_contrail_component: oc40
- opencontrail_analytics_image: docker-prod-local.artifactory.mirantis.com/opencontrail/opencontrail-analytics
- opencontrail_analyticsdb_image: docker-prod-local.artifactory.mirantis.com/opencontrail/opencontrail-analyticsdb
- opencontrail_controller_image: docker-prod-local.artifactory.mirantis.com/opencontrail/opencontrail-controller
+ opencontrail_analytics_image: docker-prod-local.artifactory.mirantis.com/opencontrail-${_param:linux_repo_contrail_component}/opencontrail-analytics
+ opencontrail_analyticsdb_image: docker-prod-local.artifactory.mirantis.com/opencontrail-${_param:linux_repo_contrail_component}/opencontrail-analyticsdb
+ opencontrail_controller_image: docker-prod-local.artifactory.mirantis.com/opencontrail-${_param:linux_repo_contrail_component}/opencontrail-controller
+ opencontrail_controller_container_name: opencontrail_controller_1
+ opencontrail_analytics_container_name: opencontrail_analytics_1
+ opencontrail_analyticsdb_container_name: opencontrail_analyticsdb_1
# Temprorary fix for MOS9 packages to pin old version of kafka
linux:
system:
@@ -156,12 +159,13 @@
docker:
client:
compose:
- opencontrail_api:
+ opencontrail:
status: up
pull: true
service:
controller:
image: ${_param:opencontrail_controller_image}
+ container_name: ${_param:opencontrail_controller_container_name}
volumes:
- /etc/contrail:/etc/contrail
- /var/lib/configdb:/var/lib/cassandra
@@ -174,15 +178,19 @@
- /etc/zookeeper/conf/log4j.properties:/etc/zookeeper/conf/log4j.properties
network_mode: "host"
privileged: true
+ restart: always
analytics:
image: ${_param:opencontrail_analytics_image}
+ container_name: ${_param:opencontrail_analytics_container_name}
network_mode: "host"
privileged: true
+ restart: always
volumes:
- /etc/contrail:/etc/contrail
- /etc/redis/redis.conf:/etc/redis/redis.conf
analyticsdb:
image: ${_param:opencontrail_analyticsdb_image}
+ container_name: ${_param:opencontrail_analyticsdb_container_name}
volumes:
- /etc/cassandra/cassandra-env-analytics.sh:/etc/cassandra/cassandra-env.sh
- /etc/cassandra/cassandra_analytics.yaml:/etc/cassandra/cassandra.yaml
@@ -199,3 +207,4 @@
- /etc/zookeeper/conf/log4j.properties:/etc/zookeeper/conf/log4j.properties
network_mode: "host"
privileged: true
+ restart: always
diff --git a/openssh/server/team/members/dkruglov.yml b/openssh/server/team/members/dkruglov.yml
index 358e365..1df2a6b 100644
--- a/openssh/server/team/members/dkruglov.yml
+++ b/openssh/server/team/members/dkruglov.yml
@@ -11,7 +11,6 @@
email: dkruglov@mirantis.com
openssh:
server:
- enabled: true
user:
dkruglov:
enabled: true
diff --git a/openssh/server/team/services.yml b/openssh/server/team/services.yml
index ea34889..40694d2 100644
--- a/openssh/server/team/services.yml
+++ b/openssh/server/team/services.yml
@@ -9,6 +9,8 @@
- system.openssh.server.team.members.miwinski
- system.openssh.server.team.members.mlos
- system.openssh.server.team.members.dbogaczyk
+- system.openssh.server.team.members.dkruglov
+- system.openssh.server.team.members.sflorczak
parameters:
_param:
linux_system_user_sudo: true
diff --git a/prometheus/server/init.yml b/prometheus/server/init.yml
index 99fdceb..5d115ac 100644
--- a/prometheus/server/init.yml
+++ b/prometheus/server/init.yml
@@ -4,6 +4,7 @@
prometheus_server_data_directory: /data
prometheus:
server:
+ version: 2.0
dir:
data: /srv/volumes/local/prometheus/data
config: /srv/volumes/local/prometheus/config
diff --git a/salt/minion/cert/k8s_client.yml b/salt/minion/cert/k8s_client.yml
index 06d83c4..be262b5 100644
--- a/salt/minion/cert/k8s_client.yml
+++ b/salt/minion/cert/k8s_client.yml
@@ -8,6 +8,34 @@
key_file: /etc/kubernetes/ssl/kubelet-client.key
cert_file: /etc/kubernetes/ssl/kubelet-client.crt
ca_file: /etc/kubernetes/ssl/ca-kubernetes.crt
- common_name: kubelet-client
+ common_name: system:node:${linux:system:name}
+ organization_name: system:nodes
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}
\ No newline at end of file
+ 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}
+ k8s_proxy:
+ host: ${_param:salt_minion_ca_host}
+ authority: ${_param:salt_minion_ca_authority}
+ key_file: /etc/kubernetes/ssl/kube-proxy-client.key
+ cert_file: /etc/kubernetes/ssl/kube-proxy-client.crt
+ ca_file: /etc/kubernetes/ssl/ca-kubernetes.crt
+ common_name: system:kube-proxy
+ 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}
+ k8s_scheduler:
+ host: ${_param:salt_minion_ca_host}
+ authority: ${_param:salt_minion_ca_authority}
+ key_file: /etc/kubernetes/ssl/kube-scheduler-client.key
+ cert_file: /etc/kubernetes/ssl/kube-scheduler-client.crt
+ ca_file: /etc/kubernetes/ssl/ca-kubernetes.crt
+ common_name: system:kube-scheduler
+ 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}
+ k8s_controller_manager:
+ host: ${_param:salt_minion_ca_host}
+ authority: ${_param:salt_minion_ca_authority}
+ key_file: /etc/kubernetes/ssl/kube-controller-manager-client.key
+ cert_file: /etc/kubernetes/ssl/kube-controller-manager-client.crt
+ ca_file: /etc/kubernetes/ssl/ca-kubernetes.crt
+ common_name: system:kube-controller-manager
+ 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}
diff --git a/salt/minion/cert/k8s_client_single.yml b/salt/minion/cert/k8s_client_single.yml
index 179d534..e9c7d79 100644
--- a/salt/minion/cert/k8s_client_single.yml
+++ b/salt/minion/cert/k8s_client_single.yml
@@ -8,6 +8,34 @@
key_file: /etc/kubernetes/ssl/kubelet-client.key
cert_file: /etc/kubernetes/ssl/kubelet-client.crt
ca_file: /etc/kubernetes/ssl/ca-kubernetes.crt
- common_name: kubelet-client
+ common_name: system:node:${linux:system:name}
+ organization_name: system:nodes
signing_policy: cert_client
- alternative_names: IP:${_param:control_address},IP:${_param:kubernetes_internal_api_address}
\ No newline at end of file
+ alternative_names: IP:${_param:control_address},IP:${_param:kubernetes_internal_api_address}
+ k8s_proxy:
+ host: ${_param:salt_minion_ca_host}
+ authority: ${_param:salt_minion_ca_authority}
+ key_file: /etc/kubernetes/ssl/kube-proxy-client.key
+ cert_file: /etc/kubernetes/ssl/kube-proxy-client.crt
+ ca_file: /etc/kubernetes/ssl/ca-kubernetes.crt
+ common_name: system:kube-proxy
+ signing_policy: cert_client
+ alternative_names: IP:${_param:control_address},IP:${_param:kubernetes_internal_api_address}
+ k8s_scheduler:
+ host: ${_param:salt_minion_ca_host}
+ authority: ${_param:salt_minion_ca_authority}
+ key_file: /etc/kubernetes/ssl/kube-scheduler-client.key
+ cert_file: /etc/kubernetes/ssl/kube-scheduler-client.crt
+ ca_file: /etc/kubernetes/ssl/ca-kubernetes.crt
+ common_name: system:kube-scheduler
+ signing_policy: cert_client
+ alternative_names: IP:${_param:control_address},IP:${_param:kubernetes_internal_api_address}
+ k8s_controller_manager:
+ host: ${_param:salt_minion_ca_host}
+ authority: ${_param:salt_minion_ca_authority}
+ key_file: /etc/kubernetes/ssl/kube-controller-manager-client.key
+ cert_file: /etc/kubernetes/ssl/kube-controller-manager-client.crt
+ ca_file: /etc/kubernetes/ssl/ca-kubernetes.crt
+ common_name: system:kube-controller-manager
+ signing_policy: cert_client
+ alternative_names: IP:${_param:control_address},IP:${_param:kubernetes_internal_api_address}
diff --git a/salt/syndic/cluster.yml b/salt/syndic/cluster.yml
new file mode 100644
index 0000000..55ae6d7
--- /dev/null
+++ b/salt/syndic/cluster.yml
@@ -0,0 +1,11 @@
+classes:
+- service.salt.syndic.cluster
+parameters:
+ _param:
+ salt_syndic_master_address_01: 127.0.0.1
+ salt_syndic_master_address_02: 127.0.0.1
+ salt:
+ syndic:
+ masters:
+ - host: ${_param:salt_syndic_master_address_01}
+ - host: ${_param:salt_syndic_master_address_02}
diff --git a/salt/syndic/single.yml b/salt/syndic/single.yml
new file mode 100644
index 0000000..8c015b7
--- /dev/null
+++ b/salt/syndic/single.yml
@@ -0,0 +1,5 @@
+classes:
+- service.salt.syndic.single
+parameters:
+ _param:
+ salt_syndic_master_address: 127.0.0.1