Merge "Remove variables not available in prometheus 2.0"
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/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/xenial/mcp/apt_mk/cassandra.yml b/aptly/server/mirror/ubuntu/xenial/mcp/apt_mk/cassandra.yml
index ce120b5..5afbf77 100644
--- a/aptly/server/mirror/ubuntu/xenial/mcp/apt_mk/cassandra.yml
+++ b/aptly/server/mirror/ubuntu/xenial/mcp/apt_mk/cassandra.yml
@@ -20,4 +20,4 @@
publisher:
component: ${_param:mirror_mirantis_openstack_xenial_cassandra_components}
distributions:
- - ubuntu-xenial/cassandra/${_param:apt_mk_version}/
\ No newline at end of file
+ - 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
index d58dd96..a0b1293 100644
--- a/aptly/server/mirror/ubuntu/xenial/mcp/apt_mk/ceph.yml
+++ b/aptly/server/mirror/ubuntu/xenial/mcp/apt_mk/ceph.yml
@@ -20,4 +20,4 @@
publisher:
component: ${_param:mirror_mirantis_openstack_xenial_ceph_components}
distributions:
- - ubuntu-xenial/ceph/${_param:apt_mk_version}/
\ No newline at end of file
+ - ubuntu-xenial/ceph/${_param:apt_mk_version}
\ 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
index 9b6fe2a..cfec221 100644
--- a/aptly/server/mirror/ubuntu/xenial/mcp/apt_mk/glusterfs.yml
+++ b/aptly/server/mirror/ubuntu/xenial/mcp/apt_mk/glusterfs.yml
@@ -3,7 +3,7 @@
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_components: '"3.12"'
mirror_mirantis_openstack_xenial_glusterfs_key_url: "http://apt.mirantis.com/public.gpg"
mirror_mirantis_openstack_xenial_glusterfs_gpgkeys:
- A76882D3
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/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/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/gerrit/server/single.yml b/gerrit/server/single.yml
index 952e82e..6704f97 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,8 @@
name: gerrit
user: gerrit
password: ${_param:postgresql_gerrit_password}
+ pool_limit: 250
+ pool_max_idle: 16
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/job/deploy/lab/deploy.yml b/jenkins/client/job/deploy/lab/deploy.yml
index 751089a..b6bbc71 100644
--- a/jenkins/client/job/deploy/lab/deploy.yml
+++ b/jenkins/client/job/deploy/lab/deploy.yml
@@ -90,6 +90,10 @@
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: ""
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/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_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/git-mirrors/2way.yml b/jenkins/client/job/git-mirrors/2way.yml
index ef1515b..330abc2 100644
--- a/jenkins/client/job/git-mirrors/2way.yml
+++ b/jenkins/client/job/git-mirrors/2way.yml
@@ -31,6 +31,11 @@
github:
pollscm:
spec: ${_param:jenkins_pollscm_spec}
+ gerrit:
+ project:
+ "{{source}}":
+ branches:
+ - master
param:
SOURCE_URL:
type: string
diff --git a/jenkins/client/job/oscore/security_tests.yml b/jenkins/client/job/oscore/security_tests.yml
index cfa90bf..e4f5f6d 100644
--- a/jenkins/client/job/oscore/security_tests.yml
+++ b/jenkins/client/job/oscore/security_tests.yml
@@ -11,7 +11,8 @@
artifact:
keep_num: 30
type: workflow-scm
- concurrent: true
+ # 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"
@@ -73,7 +74,23 @@
REPORT_FORMAT:
type: string
description: Format for generated report(csv,html,json)
- default: "csv"
+ 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:
@@ -137,4 +154,4 @@
REPORT_FORMAT:
type: string
description: Format for generated report(csv,html,json)
- default: "csv"
+ default: "json"
diff --git a/jenkins/client/job/oscore/tests.yml b/jenkins/client/job/oscore/tests.yml
index 85346e1..ae7d44d 100644
--- a/jenkins/client/job/oscore/tests.yml
+++ b/jenkins/client/job/oscore/tests.yml
@@ -50,6 +50,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}}"
diff --git a/jenkins/client/job/salt-formulas/git-mirrors/2way.yml b/jenkins/client/job/salt-formulas/git-mirrors/2way.yml
index c00c707..2f399cc 100644
--- a/jenkins/client/job/salt-formulas/git-mirrors/2way.yml
+++ b/jenkins/client/job/salt-formulas/git-mirrors/2way.yml
@@ -251,6 +251,11 @@
github:
pollscm:
spec: ${_param:jenkins_pollscm_spec}
+ gerrit:
+ project:
+ salt-formulas/{{name}}:
+ branches:
+ - master
param:
SOURCE_URL:
type: string
@@ -324,7 +329,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/tests.yml b/jenkins/client/job/salt-formulas/tests.yml
index b5c596b..2e29d65 100644
--- a/jenkins/client/job/salt-formulas/tests.yml
+++ b/jenkins/client/job/salt-formulas/tests.yml
@@ -173,7 +173,7 @@
name: test-salt-formulas-env
discard:
build:
- keep_num: 500
+ keep_num: 1000
artifact:
keep_num: 10
type: workflow-scm
diff --git a/jenkins/client/job/salt-models/tests.yml b/jenkins/client/job/salt-models/tests.yml
index ec35f94..879a1f1 100644
--- a/jenkins/client/job/salt-models/tests.yml
+++ b/jenkins/client/job/salt-models/tests.yml
@@ -173,7 +173,7 @@
name: test-salt-model-node
discard:
build:
- keep_num: 500
+ keep_num: 1000
artifact:
keep_num: 10
type: workflow-scm
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/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/ubuntu.yml b/linux/system/repo/mcp/apt_mirantis/ubuntu.yml
index 2203e07..e254ed6 100644
--- a/linux/system/repo/mcp/apt_mirantis/ubuntu.yml
+++ b/linux/system/repo/mcp/apt_mirantis/ubuntu.yml
@@ -5,17 +5,20 @@
system:
repo:
ubuntu:
- source: "deb [arch=amd64] http://apt.mirantis.com/${_param:linux_system_codename}/ubuntu/ ${_param:apt_mk_version} main restricted universe"
+ 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_url: "http://apt.mirantis.com/public.gpg"
+ key_id: 437D05B5
+ key_server: keyserver.ubuntu.com
ubuntu_updates:
- source: "deb [arch=amd64] http://apt.mirantis.com/${_param:linux_system_codename}/ubuntu/updates/ ${_param:apt_mk_version} main restricted universe"
+ 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_url: "http://apt.mirantis.com/public.gpg"
+ key_id: 437D05B5
+ key_server: keyserver.ubuntu.com
ubuntu_security:
- source: "deb [arch=amd64] http://apt.mirantis.com/${_param:linux_system_codename}/ubuntu/security/ ${_param:apt_mk_version} main restricted universe"
+ 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_url: "http://apt.mirantis.com/public.gpg"
\ No newline at end of file
+ key_id: 437D05B5
+ key_server: keyserver.ubuntu.com
\ No newline at end of file
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/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/opencontrail/control/analytics4_0.yml b/opencontrail/control/analytics4_0.yml
index c38e06a..4ec9b4c 100644
--- a/opencontrail/control/analytics4_0.yml
+++ b/opencontrail/control/analytics4_0.yml
@@ -15,6 +15,8 @@
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_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,12 +70,13 @@
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
volumes:
@@ -81,6 +84,7 @@
- /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
diff --git a/opencontrail/control/cluster4_0.yml b/opencontrail/control/cluster4_0.yml
index 92a6a17..611eb24 100644
--- a/opencontrail/control/cluster4_0.yml
+++ b/opencontrail/control/cluster4_0.yml
@@ -17,6 +17,9 @@
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_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
@@ -145,6 +149,7 @@
privileged: true
analytics:
image: ${_param:opencontrail_analytics_image}
+ container_name: ${_param:opencontrail_analytics_container_name}
network_mode: "host"
privileged: true
volumes:
@@ -152,6 +157,7 @@
- /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
diff --git a/opencontrail/control/control4_0.yml b/opencontrail/control/control4_0.yml
index f1d603c..2fe76e8 100644
--- a/opencontrail/control/control4_0.yml
+++ b/opencontrail/control/control4_0.yml
@@ -10,6 +10,7 @@
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_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
diff --git a/opencontrail/control/single4_0.yml b/opencontrail/control/single4_0.yml
index a9ae787..fcbd6af 100644
--- a/opencontrail/control/single4_0.yml
+++ b/opencontrail/control/single4_0.yml
@@ -10,6 +10,9 @@
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_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
@@ -176,6 +180,7 @@
privileged: true
analytics:
image: ${_param:opencontrail_analytics_image}
+ container_name: ${_param:opencontrail_analytics_container_name}
network_mode: "host"
privileged: true
volumes:
@@ -183,6 +188,7 @@
- /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
diff --git a/openssh/server/team/services.yml b/openssh/server/team/services.yml
index 7d71d98..40694d2 100644
--- a/openssh/server/team/services.yml
+++ b/openssh/server/team/services.yml
@@ -10,6 +10,7 @@
- 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