Merge the tip of origin/release/proposed/2019.2.0 into origin/release/2019.2.0
c6ac0987 Add amphora images source for offline repo
74865012 Update image for amphora
495f8f8b Update docker images
a1ff57ee Add linux-tools-common to offline image
2bce735c Bump Contrail packages to 2019.2.13
be6c70f8 Add updates_mirantis repo to system model
fd5874a3 Add accountsservice packages to offline image
1a020170 Added keepalived definition and health_check script for rabbiteMQ
613e04e1 Defined `use_vip_address` and `host` fields to `message_queue` section.
09c1edc2 Add additional parameters for rewrited ceph pipelines
cb884f15 Add parameter ask_confirmation for ceph-upgrade pipeline
b6e724e9 Remove git data from file
91f510c1 Adding Stepan Rogov
cd540927 Bump cvp-sanity-checks image
ddc6396c Adding Pavel Vaylov
Change-Id: I33bd3301025d10bf98a849d486c9ce18d9e2d7f8
diff --git a/aodh/server/cluster.yml b/aodh/server/cluster.yml
index 53ec417..d4dc529 100644
--- a/aodh/server/cluster.yml
+++ b/aodh/server/cluster.yml
@@ -60,6 +60,8 @@
user: openstack
password: ${_param:rabbitmq_openstack_password}
virtual_host: '/openstack'
+ use_vip_address: ${_param:openstack_rabbitmq_standalone_mode}
+ host: ${_param:openstack_message_queue_address}
members:
- host: ${_param:openstack_message_queue_node01_address}
- host: ${_param:openstack_message_queue_node02_address}
diff --git a/aodh/server/single.yml b/aodh/server/single.yml
index 3f2ea75..a86aabe 100644
--- a/aodh/server/single.yml
+++ b/aodh/server/single.yml
@@ -25,6 +25,8 @@
ssl:
enabled: ${_param:galera_ssl_enabled}
message_queue:
+ use_vip_address: ${_param:openstack_rabbitmq_standalone_mode}
+ host: ${_param:openstack_message_queue_address}
port: ${_param:openstack_rabbitmq_port}
x509:
enabled: ${_param:openstack_rabbitmq_x509_enabled}
diff --git a/barbican/server/cluster.yml b/barbican/server/cluster.yml
index 558f08b..a40ed99 100644
--- a/barbican/server/cluster.yml
+++ b/barbican/server/cluster.yml
@@ -23,6 +23,8 @@
ssl:
enabled: ${_param:galera_ssl_enabled}
message_queue:
+ use_vip_address: ${_param:openstack_rabbitmq_standalone_mode}
+ host: ${_param:openstack_message_queue_address}
port: ${_param:openstack_rabbitmq_port}
x509:
enabled: ${_param:openstack_rabbitmq_x509_enabled}
diff --git a/barbican/server/single.yml b/barbican/server/single.yml
index 1ee95f7..3e9a10a 100644
--- a/barbican/server/single.yml
+++ b/barbican/server/single.yml
@@ -24,6 +24,8 @@
password: ${_param:keystone_barbican_password}
protocol: ${_param:internal_protocol}
message_queue:
+ use_vip_address: ${_param:openstack_rabbitmq_standalone_mode}
+ host: ${_param:openstack_message_queue_address}
port: ${_param:openstack_rabbitmq_port}
x509:
enabled: ${_param:openstack_rabbitmq_x509_enabled}
diff --git a/ceilometer/agent/cluster.yml b/ceilometer/agent/cluster.yml
index c24adf7..f909934 100644
--- a/ceilometer/agent/cluster.yml
+++ b/ceilometer/agent/cluster.yml
@@ -22,6 +22,8 @@
region: ${_param:openstack_region}
protocol: ${_param:cluster_internal_protocol}
message_queue:
+ use_vip_address: ${_param:openstack_rabbitmq_standalone_mode}
+ host: ${_param:openstack_message_queue_address}
port: ${_param:openstack_rabbitmq_port}
engine: rabbitmq
members:
diff --git a/ceilometer/agent/single.yml b/ceilometer/agent/single.yml
index 0bf079f..addca8c 100644
--- a/ceilometer/agent/single.yml
+++ b/ceilometer/agent/single.yml
@@ -13,6 +13,8 @@
password: ${_param:keystone_ceilometer_password}
protocol: ${_param:internal_protocol}
message_queue:
+ use_vip_address: ${_param:openstack_rabbitmq_standalone_mode}
+ host: ${_param:openstack_message_queue_address}
port: ${_param:openstack_rabbitmq_port}
x509:
enabled: ${_param:openstack_rabbitmq_x509_enabled}
diff --git a/ceilometer/agent/telemetry/cluster.yml b/ceilometer/agent/telemetry/cluster.yml
index 8f9c996..d5eeab7 100644
--- a/ceilometer/agent/telemetry/cluster.yml
+++ b/ceilometer/agent/telemetry/cluster.yml
@@ -24,6 +24,8 @@
message_queue:
port: ${_param:openstack_rabbitmq_port}
engine: rabbitmq
+ use_vip_address: ${_param:openstack_rabbitmq_standalone_mode}
+ host: ${_param:openstack_message_queue_address}
members:
- host: ${_param:openstack_message_queue_node01_address}
- host: ${_param:openstack_message_queue_node02_address}
diff --git a/ceilometer/agent/telemetry/single.yml b/ceilometer/agent/telemetry/single.yml
index 36f2f08..61ceca9 100644
--- a/ceilometer/agent/telemetry/single.yml
+++ b/ceilometer/agent/telemetry/single.yml
@@ -9,6 +9,8 @@
ssl:
enabled: ${_param:ceilometer_agent_ssl_enabled}
message_queue:
+ use_vip_address: ${_param:openstack_rabbitmq_standalone_mode}
+ host: ${_param:openstack_message_queue_address}
port: ${_param:openstack_rabbitmq_port}
x509:
enabled: ${_param:openstack_rabbitmq_x509_enabled}
diff --git a/ceilometer/server/cluster.yml b/ceilometer/server/cluster.yml
index 485eda2..47233c0 100644
--- a/ceilometer/server/cluster.yml
+++ b/ceilometer/server/cluster.yml
@@ -36,6 +36,8 @@
message_queue:
port: ${_param:openstack_rabbitmq_port}
engine: rabbitmq
+ use_vip_address: ${_param:openstack_rabbitmq_standalone_mode}
+ host: ${_param:openstack_message_queue_address}
members:
- host: ${_param:openstack_message_queue_node01_address}
- host: ${_param:openstack_message_queue_node02_address}
diff --git a/ceilometer/server/single.yml b/ceilometer/server/single.yml
index eeadcc0..9ab0316 100644
--- a/ceilometer/server/single.yml
+++ b/ceilometer/server/single.yml
@@ -18,6 +18,8 @@
host: ${_param:stacklight_monitor_address}
port: 9200
message_queue:
+ use_vip_address: ${_param:openstack_rabbitmq_standalone_mode}
+ host: ${_param:openstack_message_queue_address}
port: ${_param:openstack_rabbitmq_port}
x509:
enabled: ${_param:openstack_rabbitmq_x509_enabled}
diff --git a/ceilometer/server/telemetry/cluster.yml b/ceilometer/server/telemetry/cluster.yml
index 9ee78ef..07bcdf6 100644
--- a/ceilometer/server/telemetry/cluster.yml
+++ b/ceilometer/server/telemetry/cluster.yml
@@ -30,6 +30,8 @@
region: ${_param:openstack_region}
protocol: ${_param:cluster_internal_protocol}
message_queue:
+ use_vip_address: ${_param:openstack_rabbitmq_standalone_mode}
+ host: ${_param:openstack_message_queue_address}
port: ${_param:openstack_rabbitmq_port}
engine: rabbitmq
members:
diff --git a/ceilometer/server/telemetry/single.yml b/ceilometer/server/telemetry/single.yml
index 1724277..8b0cc0e 100644
--- a/ceilometer/server/telemetry/single.yml
+++ b/ceilometer/server/telemetry/single.yml
@@ -7,6 +7,8 @@
server:
role: ${_param:openstack_node_role}
message_queue:
+ use_vip_address: ${_param:openstack_rabbitmq_standalone_mode}
+ host: ${_param:openstack_message_queue_address}
port: ${_param:openstack_rabbitmq_port}
x509:
enabled: ${_param:openstack_rabbitmq_x509_enabled}
diff --git a/cinder/control/cluster.yml b/cinder/control/cluster.yml
index c8c25bd..23787a7 100644
--- a/cinder/control/cluster.yml
+++ b/cinder/control/cluster.yml
@@ -65,6 +65,8 @@
message_queue:
port: ${_param:openstack_rabbitmq_port}
engine: rabbitmq
+ use_vip_address: ${_param:openstack_rabbitmq_standalone_mode}
+ host: ${_param:openstack_message_queue_address}
members:
- host: ${_param:openstack_message_queue_node01_address}
- host: ${_param:openstack_message_queue_node02_address}
diff --git a/cinder/control/single.yml b/cinder/control/single.yml
index 963e308..6760d05 100644
--- a/cinder/control/single.yml
+++ b/cinder/control/single.yml
@@ -42,6 +42,8 @@
barbican:
enabled: ${_param:barbican_integration_enabled}
message_queue:
+ use_vip_address: ${_param:openstack_rabbitmq_standalone_mode}
+ host: ${_param:openstack_message_queue_address}
port: ${_param:openstack_rabbitmq_port}
x509:
enabled: ${_param:openstack_rabbitmq_x509_enabled}
diff --git a/cinder/volume/backend/ceph.yml b/cinder/volume/backend/ceph.yml
index 6b41224..14a9a4a 100644
--- a/cinder/volume/backend/ceph.yml
+++ b/cinder/volume/backend/ceph.yml
@@ -4,6 +4,8 @@
cinder:
volume:
message_queue:
+ use_vip_address: ${_param:openstack_rabbitmq_standalone_mode}
+ host: ${_param:openstack_message_queue_address}
ha_queues: true
enabled: true
notification: true
diff --git a/cinder/volume/local.yml b/cinder/volume/local.yml
index c35129d..e0c6ed8 100644
--- a/cinder/volume/local.yml
+++ b/cinder/volume/local.yml
@@ -24,8 +24,9 @@
barbican:
enabled: ${_param:barbican_integration_enabled}
message_queue:
+ use_vip_address: ${_param:openstack_rabbitmq_standalone_mode}
+ host: ${_param:openstack_message_queue_address}
port: ${_param:openstack_rabbitmq_port}
- host: ${_param:single_address}
x509:
enabled: ${_param:openstack_rabbitmq_x509_enabled}
ca_file: ${_param:rabbitmq_cinder_ssl_ca_file}
diff --git a/cinder/volume/single.yml b/cinder/volume/single.yml
index c40c7e9..695d27f 100644
--- a/cinder/volume/single.yml
+++ b/cinder/volume/single.yml
@@ -32,6 +32,8 @@
enabled: ${_param:barbican_integration_enabled}
message_queue:
port: ${_param:openstack_rabbitmq_port}
+ use_vip_address: ${_param:openstack_rabbitmq_standalone_mode}
+ host: ${_param:openstack_message_queue_address}
members:
- host: ${_param:openstack_message_queue_node01_address}
- host: ${_param:openstack_message_queue_node02_address}
diff --git a/debmirror/mirror_mirantis_com/ubuntu/xenial.yml b/debmirror/mirror_mirantis_com/ubuntu/xenial.yml
index 8781811..6cef39b 100644
--- a/debmirror/mirror_mirantis_com/ubuntu/xenial.yml
+++ b/debmirror/mirror_mirantis_com/ubuntu/xenial.yml
@@ -195,3 +195,5 @@
813: --include='universe/g/glibc/' # PROD-35417 Req for rabbitmq 3.8.2
814: --include='universe/o/opensaml2' # PROD-35464 Req for SAML2/Federation
815: --include='universe/x/xmltooling' # PROD-35464 Req for SAML2/Federation
+ 816: --include='main/a/accountsservice' # PROD-36001 Req for cfg01 upgrade
+ 817: --include='main/l/linux/linux-tools-common' # PROD-36124 Req for tooling upgrade
diff --git a/debmirror/mirror_mirantis_com/update/ubuntu/xenial.yml b/debmirror/mirror_mirantis_com/update/ubuntu/xenial.yml
index 5ed6905..ac74e67 100644
--- a/debmirror/mirror_mirantis_com/update/ubuntu/xenial.yml
+++ b/debmirror/mirror_mirantis_com/update/ubuntu/xenial.yml
@@ -195,3 +195,5 @@
813: --include='universe/g/glibc/' # PROD-35417 Req for rabbitmq 3.8.2
814: --include='universe/o/opensaml2' # PROD-35464 Req for SAML2/Federation
815: --include='universe/x/xmltooling' # PROD-35464 Req for SAML2/Federation
+ 816: --include='main/a/accountsservice' # PROD-36001 Req for cfg01 upgrade
+ 817: --include='main/l/linux/linux-tools-common' # PROD-36124 Req for tooling upgrade
diff --git a/defaults/docker_images.yml b/defaults/docker_images.yml
index bd82083..e69638e 100644
--- a/defaults/docker_images.yml
+++ b/defaults/docker_images.yml
@@ -5,27 +5,27 @@
# 2.6.2 version, from 12/18/2108, differ from latest 2.6.2 upstream - update next cycle
docker_image_registry: "${_param:mcp_docker_registry}/mirantis/external/registry:2019.2.6"
docker_image_visualizer: "${_param:mcp_docker_registry}/mirantis/external/visualizer:2019.2.6"
- docker_image_openldap: "${_param:mcp_docker_registry}/mirantis/cicd/openldap:2019.2.11"
- docker_image_postgresql: "${_param:mcp_docker_registry}/mirantis/external/library/postgres:9.6.10"
+ docker_image_openldap: "${_param:mcp_docker_registry}/mirantis/cicd/openldap:2019.2.13"
+ docker_image_postgresql: "${_param:mcp_docker_registry}/mirantis/external/library/postgres:9.6.20"
# 3.4.13, from Feb 15, differ from 3.4.13 upstream verison, from March 14 - update next cycle
docker_image_mongodb: "${_param:mcp_docker_registry}/mirantis/external/mongo:2019.2.6"
###
- # phpldapadmin:0.6.12
- docker_image_phpldapadmin: "${_param:mcp_docker_registry}/mirantis/cicd/phpldapadmin:2019.2.9"
+ # phpldapadmin:0.9.0
+ docker_image_phpldapadmin: "${_param:mcp_docker_registry}/mirantis/cicd/phpldapadmin:2019.2.13"
# gerrit:2.15.18
docker_image_gerrit: "${_param:mcp_docker_registry}/mirantis/cicd/gerrit:2019.2.11"
- # mysql:5.6.48
- docker_image_mysql: "${_param:mcp_docker_registry}/mirantis/cicd/mysql:2019.2.10"
+ # mysql:5.6.51
+ docker_image_mysql: "${_param:mcp_docker_registry}/mirantis/cicd/mysql:2019.2.13"
# jenkins:2.204.3
- docker_image_jenkins: "${_param:mcp_docker_registry}/mirantis/cicd/jenkins:2019.2.9"
+ docker_image_jenkins: "${_param:mcp_docker_registry}/mirantis/cicd/jenkins:2019.2.13"
docker_image_jenkins_jnlp_slave: "${_param:mcp_docker_registry}/mirantis/cicd/jnlp-slave:2019.2.11"
# TODO: fix tag
- docker_image_jenkins_ssh_slave: "${_param:mcp_docker_registry}/mirantis/cicd/ssh-slave:2019.2.10"
+ docker_image_jenkins_ssh_slave: "${_param:mcp_docker_registry}/mirantis/cicd/ssh-slave:2019.2.13"
# model-generator
docker_image_operations_api: "${_param:mcp_docker_registry}/mirantis/model-generator/operations-api:2019.2.6"
docker_image_operations_ui: "${_param:mcp_docker_registry}/mirantis/model-generator/operations-ui:2019.2.6"
# OpenContrail
- opencontrail_docker_image_tag: "2019.2.12"
+ opencontrail_docker_image_tag: "2019.2.13"
# stacklight
# locally forked v7.4.4, updated 2020-08-06
docker_image_alerta: "${_param:mcp_docker_registry}/openstack-docker/alerta:2019.2.11"
@@ -47,16 +47,16 @@
docker_image_keycloak_server: "${_param:mcp_docker_registry}/mirantis/external/jboss/keycloak:4.5.0.Final"
docker_image_keycloak_proxy: "${_param:mcp_docker_registry}/mirantis/external/jboss/keycloak:3.4.2.Final"
# CVP
- docker_image_cvp_sanity_checks: "${_param:mcp_docker_registry}/mirantis/cvp/cvp-sanity-checks:2019.2.12"
+ docker_image_cvp_sanity_checks: "${_param:mcp_docker_registry}/mirantis/cvp/cvp-sanity-checks:2019.2.13"
docker_image_cvp_tempest: "${_param:mcp_docker_registry}/mirantis/cicd/ci-tempest:${_param:openstack_version}"
docker_image_cvp_shaker_checks: "${_param:mcp_docker_registry}/mirantis/cvp/cvp-shaker:2019.2.3"
docker_image_cvp_rally: "${_param:mcp_docker_registry}/mirantis/cvp/cvp-rally:2019.2.5"
docker_image_cvp_xrally: "${_param:mcp_docker_registry}/mirantis/external/xrally/xrally-openstack:0.11.2"
# aptly
docker_image_aptly:
- base: "${_param:mcp_docker_registry}/mirantis/cicd/aptly:2019.2.9"
- public: "${_param:mcp_docker_registry}/mirantis/cicd/aptly-public:2019.2.9"
- publisher: "${_param:mcp_docker_registry}/mirantis/cicd/aptly-publisher:2019.2.9"
+ base: "${_param:mcp_docker_registry}/mirantis/cicd/aptly:2019.2.13"
+ public: "${_param:mcp_docker_registry}/mirantis/cicd/aptly-public:2019.2.13"
+ publisher: "${_param:mcp_docker_registry}/mirantis/cicd/aptly-publisher:2019.2.13"
# List of images, to be placed into offline image, during separate image build process
# WARNING: registry|target_registry and names - must be exactly same as list above!
@@ -76,33 +76,33 @@
name: compose:1.17.1
- registry: ${_param:mcp_docker_registry}/mirantis/cicd
target_registry: ${_param:default_local_mirrror_content:docker_client_registry_target_registry}/mirantis/cicd
- name: openldap:2019.2.11
+ name: openldap:2019.2.13
- registry: ${_param:mcp_docker_registry}/mirantis/external/library
target_registry: ${_param:default_local_mirrror_content:docker_client_registry_target_registry}/mirantis/external/library
- name: postgres:9.6.10
+ name: postgres:9.6.20
- registry: ${_param:mcp_docker_registry}/mirantis/cicd
target_registry: ${_param:default_local_mirrror_content:docker_client_registry_target_registry}/mirantis/cicd
- name: phpldapadmin:2019.2.9
+ name: phpldapadmin:2019.2.13
- registry: ${_param:mcp_docker_registry}/mirantis/cicd
target_registry: ${_param:default_local_mirrror_content:docker_client_registry_target_registry}/mirantis/cicd
- name: aptly:2019.2.9
+ name: aptly:2019.2.13
- registry: ${_param:mcp_docker_registry}/mirantis/cicd
target_registry: ${_param:default_local_mirrror_content:docker_client_registry_target_registry}/mirantis/cicd
- name: aptly-public:2019.2.9
+ name: aptly-public:2019.2.13
- registry: ${_param:mcp_docker_registry}/mirantis/cicd
target_registry: ${_param:default_local_mirrror_content:docker_client_registry_target_registry}/mirantis/cicd
- name: aptly-publisher:2019.2.9
+ name: aptly-publisher:2019.2.13
- registry: ${_param:mcp_docker_registry}/mirantis/cicd
target_registry: ${_param:default_local_mirrror_content:docker_client_registry_target_registry}/mirantis/cicd
name: jnlp-slave:2019.2.11
- registry: ${_param:mcp_docker_registry}/mirantis/cicd
target_registry: ${_param:default_local_mirrror_content:docker_client_registry_target_registry}/mirantis/cicd
- name: ssh-slave:2019.2.10
+ name: ssh-slave:2019.2.13
- registry: ${_param:mcp_docker_registry}/mirantis/cicd
target_registry: ${_param:default_local_mirrror_content:docker_client_registry_target_registry}/mirantis/cicd
- name: jenkins:2019.2.9
+ name: jenkins:2019.2.13
- registry: ${_param:mcp_docker_registry}/mirantis/cicd
target_registry: ${_param:default_local_mirrror_content:docker_client_registry_target_registry}/mirantis/cicd
name: gerrit:2019.2.11
@@ -182,14 +182,14 @@
name: cvp-shaker:2019.2.3
- registry: ${_param:mcp_docker_registry}/mirantis/cvp
target_registry: ${_param:default_local_mirrror_content:docker_client_registry_target_registry}/mirantis/cvp
- name: cvp-sanity-checks:2019.2.12
+ name: cvp-sanity-checks:2019.2.13
- registry: ${_param:mcp_docker_registry}/mirantis/external/xrally
target_registry: ${_param:default_local_mirrror_content:docker_client_registry_target_registry}/mirantis/external/xrally
name: xrally-openstack:0.11.2
#
- registry: ${_param:mcp_docker_registry}/mirantis/cicd
target_registry: ${_param:default_local_mirrror_content:docker_client_registry_target_registry}/mirantis/cicd
- name: mysql:2019.2.10
+ name: mysql:2019.2.13
- registry: ${_param:mcp_docker_registry}/mirantis/external
target_registry: ${_param:default_local_mirrror_content:docker_client_registry_target_registry}/mirantis/external
name: mongo:2019.2.6
diff --git a/defaults/linux_system_file.yml b/defaults/linux_system_file.yml
index 032be7e..3380839 100644
--- a/defaults/linux_system_file.yml
+++ b/defaults/linux_system_file.yml
@@ -12,20 +12,34 @@
ubuntu-16-04-x64.qcow2.md5:
name: /srv/http/images.mirantis.com/ubuntu-16-04-x64-mcp2019.2.0.qcow2.md5
source: ${_param:mcp_static_images_url}/ubuntu-16-04-x64-mcp2019.2.0.qcow2.md5
- amphora-x64-haproxy-pike.qcow2:
+ artifactory-amphora-x64-haproxy-pike.qcow2:
source: ${_param:mcp_binary_registry}/mirantis/openstack/octavia/images/2019.2.6/pike/amphora-x64-haproxy.qcow2
name: /srv/http/artifactory.mirantis.com/artifactory/binary-prod-local/mirantis/openstack/octavia/images/2019.2.6/pike/amphora-x64-haproxy.qcow2
hash: ${_param:mcp_binary_registry}/mirantis/openstack/octavia/images/2019.2.6/pike/amphora-x64-haproxy.qcow2.md5
- amphora-x64-haproxy-pike.qcow2.md5:
+ artifactory-amphora-x64-haproxy-pike.qcow2.md5:
source: ${_param:mcp_binary_registry}/mirantis/openstack/octavia/images/2019.2.6/pike/amphora-x64-haproxy.qcow2.md5
name: /srv/http/artifactory.mirantis.com/artifactory/binary-prod-local/mirantis/openstack/octavia/images/2019.2.6/pike/amphora-x64-haproxy.qcow2.md5
- amphora-x64-haproxy-queens.qcow2:
+ artifactory-amphora-x64-haproxy-queens.qcow2:
source: ${_param:mcp_binary_registry}/mirantis/openstack/octavia/images/2019.2.6/queens/amphora-x64-haproxy.qcow2
name: /srv/http/artifactory.mirantis.com/artifactory/binary-prod-local/mirantis/openstack/octavia/images/2019.2.6/queens/amphora-x64-haproxy.qcow2
hash: ${_param:mcp_binary_registry}/mirantis/openstack/octavia/images/2019.2.6/queens/amphora-x64-haproxy.qcow2.md5
- amphora-x64-haproxy-queens.qcow2.md5:
+ artifactory-amphora-x64-haproxy-queens.qcow2.md5:
source: ${_param:mcp_binary_registry}/mirantis/openstack/octavia/images/2019.2.6/queens/amphora-x64-haproxy.qcow2.md5
name: /srv/http/artifactory.mirantis.com/artifactory/binary-prod-local/mirantis/openstack/octavia/images/2019.2.6/queens/amphora-x64-haproxy.qcow2.md5
+ images-mirantis-com-amphora-x64-haproxy-pike-2019.2.0.qcow2:
+ source: ${_param:mcp_static_images_url}/octavia/amphora-x64-haproxy-pike-2019.2.0.qcow2
+ name: /srv/http/images.mirantis.com/octavia/amphora-x64-haproxy-pike-2019.2.0.qcow2
+ hash: ${_param:mcp_static_images_url}/octavia/amphora-x64-haproxy-pike-2019.2.0.qcow2.md5
+ images-mirantis-com-amphora-x64-haproxy-pike-2019.2.0.qcow2.md5:
+ source: ${_param:mcp_static_images_url}/octavia/amphora-x64-haproxy-pike-2019.2.0.qcow2.md5
+ name: /srv/http/images.mirantis.com/octavia/amphora-x64-haproxy-pike-2019.2.0.qcow2.md5
+ images-mirantis-com-amphora-x64-haproxy-queens-2019.2.0.qcow2:
+ source: ${_param:mcp_static_images_url}/octavia/amphora-x64-haproxy-queens-2019.2.0.qcow2
+ name: /srv/http/images.mirantis.com/octavia/amphora-x64-haproxy-queens-2019.2.0.qcow2
+ hash: ${_param:mcp_static_images_url}/octavia/amphora-x64-haproxy-queens-2019.2.0.qcow2.md5
+ images-mirantis-com-amphora-x64-haproxy-queens.qcow2-2019.2.0.md5:
+ source: ${_param:mcp_static_images_url}/octavia/amphora-x64-haproxy-queens-2019.2.0.qcow2.md5
+ name: /srv/http/images.mirantis.com/octavia/amphora-x64-haproxy-queens-2019.2.0.qcow2.md5
cirros-0.4.0-x86_64-disk.img:
source: ${_param:mcp_binary_registry}/mirantis/external/images/cirros/0.4.0/cirros-0.4.0-x86_64-disk.img
name: /srv/http/artifactory.mirantis.com/artifactory/binary-prod-local/mirantis/external/images/cirros/0.4.0/cirros-0.4.0-x86_64-disk.img
diff --git a/defaults/linux_system_repo.yml b/defaults/linux_system_repo.yml
index 77dfc4e..d39863f 100644
--- a/defaults/linux_system_repo.yml
+++ b/defaults/linux_system_repo.yml
@@ -7,6 +7,10 @@
linux_system_repo_update_url: http://mirror.mirantis.com/update/${_param:mcp_version}/
# Global-hotfix
linux_system_repo_hotfix_url: http://mirror.mirantis.com/hotfix/${_param:mcp_version}/
+ # Updates.mirantis
+ updates_mirantis_host: updates.mirantis.com
+ updates_mirantis_version: stable
+ updates_mirantis_key_file: updates_mirantis.key
# Per repos
linux_system_repo_mcp_cassandra_url: ${_param:linux_system_repo_url}/cassandra/
linux_system_repo_mcp_glusterfs_url: ${_param:linux_system_repo_url}/glusterfs-${_param:linux_system_repo_mcp_glusterfs_version_number}/
diff --git a/defaults/openstack/init.yml b/defaults/openstack/init.yml
index 6049f84..8f5ac47 100644
--- a/defaults/openstack/init.yml
+++ b/defaults/openstack/init.yml
@@ -239,7 +239,7 @@
octavia_health_manager_node03_address: 192.168.10.12
#
amphora_image_name: amphora-x64-haproxy
- amphora_image_url: "${_param:mcp_binary_registry}/mirantis/openstack/octavia/images/2019.2.6/${_param:openstack_version}/amphora-x64-haproxy.qcow2"
+ amphora_image_url: "${_param:mcp_static_images_url}/octavia/amphora-x64-haproxy-${_param:openstack_version}-2019.2.0.qcow2"
glance_image_cirros_name: 'TestCirros-0.4.0'
glance_image_cirros_location: "${_param:mcp_binary_registry}/mirantis/external/images/cirros/0.4.0/cirros-0.4.0-x86_64-disk.img"
diff --git a/defaults/rabbitmq/init.yml b/defaults/rabbitmq/init.yml
index 2cad9ec..ca9ee5f 100644
--- a/defaults/rabbitmq/init.yml
+++ b/defaults/rabbitmq/init.yml
@@ -2,3 +2,4 @@
_param:
# SSL
rabbitmq_ssl_enabled: False
+ openstack_rabbitmq_standalone_mode: False
diff --git a/designate/server/cluster/default.yml b/designate/server/cluster/default.yml
index 9656bc9..2b1cbf6 100644
--- a/designate/server/cluster/default.yml
+++ b/designate/server/cluster/default.yml
@@ -58,6 +58,8 @@
api:
address: ${_param:single_address}
message_queue:
+ use_vip_address: ${_param:openstack_rabbitmq_standalone_mode}
+ host: ${_param:openstack_message_queue_address}
engine: rabbitmq
port: ${_param:openstack_rabbitmq_port}
members:
diff --git a/designate/server/cluster/simple.yml b/designate/server/cluster/simple.yml
index 55998d5..e160aa4 100644
--- a/designate/server/cluster/simple.yml
+++ b/designate/server/cluster/simple.yml
@@ -54,6 +54,8 @@
api:
address: ${_param:single_address}
message_queue:
+ use_vip_address: ${_param:openstack_rabbitmq_standalone_mode}
+ host: ${_param:openstack_message_queue_address}
engine: rabbitmq
port: ${_param:openstack_rabbitmq_port}
members:
diff --git a/designate/server/single.yml b/designate/server/single.yml
index 8f07ffb..792294f 100644
--- a/designate/server/single.yml
+++ b/designate/server/single.yml
@@ -53,7 +53,8 @@
protocol: ${_param:internal_protocol}
message_queue:
engine: rabbitmq
- host: ${_param:cluster_vip_address}
+ use_vip_address: ${_param:openstack_rabbitmq_standalone_mode}
+ host: ${_param:openstack_message_queue_address}
port: ${_param:openstack_rabbitmq_port}
user: openstack
password: ${_param:rabbitmq_openstack_password}
diff --git a/glance/control/cluster.yml b/glance/control/cluster.yml
index 0eae619..d8fc376 100644
--- a/glance/control/cluster.yml
+++ b/glance/control/cluster.yml
@@ -65,6 +65,8 @@
user: openstack
password: ${_param:rabbitmq_openstack_password}
virtual_host: '/openstack'
+ use_vip_address: ${_param:openstack_rabbitmq_standalone_mode}
+ host: ${_param:openstack_message_queue_address}
members:
- host: ${_param:openstack_message_queue_node01_address}
- host: ${_param:openstack_message_queue_node02_address}
diff --git a/glance/control/single.yml b/glance/control/single.yml
index 160d26d..179eec7 100644
--- a/glance/control/single.yml
+++ b/glance/control/single.yml
@@ -36,6 +36,8 @@
barbican:
enabled: ${_param:barbican_integration_enabled}
message_queue:
+ use_vip_address: ${_param:openstack_rabbitmq_standalone_mode}
+ host: ${_param:openstack_message_queue_address}
port: ${_param:openstack_rabbitmq_port}
x509:
enabled: ${_param:openstack_rabbitmq_x509_enabled}
diff --git a/heat/server/cluster.yml b/heat/server/cluster.yml
index 89a5885..54f0058 100644
--- a/heat/server/cluster.yml
+++ b/heat/server/cluster.yml
@@ -69,6 +69,8 @@
user: openstack
password: ${_param:rabbitmq_openstack_password}
virtual_host: '/openstack'
+ use_vip_address: ${_param:openstack_rabbitmq_standalone_mode}
+ host: ${_param:openstack_message_queue_address}
members:
- host: ${_param:openstack_message_queue_node01_address}
- host: ${_param:openstack_message_queue_node02_address}
diff --git a/heat/server/single.yml b/heat/server/single.yml
index 4ce11fa..095e09b 100644
--- a/heat/server/single.yml
+++ b/heat/server/single.yml
@@ -32,6 +32,8 @@
ssl:
enabled: ${_param:galera_ssl_enabled}
message_queue:
+ use_vip_address: ${_param:openstack_rabbitmq_standalone_mode}
+ host: ${_param:openstack_message_queue_address}
port: ${_param:openstack_rabbitmq_port}
x509:
enabled: ${_param:openstack_rabbitmq_x509_enabled}
diff --git a/ironic/api/cluster.yml b/ironic/api/cluster.yml
index cd6c667..c3c5a26 100644
--- a/ironic/api/cluster.yml
+++ b/ironic/api/cluster.yml
@@ -26,6 +26,8 @@
ssl:
enabled: ${_param:galera_ssl_enabled}
message_queue:
+ use_vip_address: ${_param:openstack_rabbitmq_standalone_mode}
+ host: ${_param:openstack_message_queue_address}
members:
- host: ${_param:openstack_message_queue_node01_address}
- host: ${_param:openstack_message_queue_node02_address}
diff --git a/ironic/api/single.yml b/ironic/api/single.yml
index db39076..22f57fd 100644
--- a/ironic/api/single.yml
+++ b/ironic/api/single.yml
@@ -24,6 +24,8 @@
ssl:
enabled: ${_param:galera_ssl_enabled}
message_queue:
+ use_vip_address: ${_param:openstack_rabbitmq_standalone_mode}
+ host: ${_param:openstack_message_queue_address}
port: ${_param:openstack_rabbitmq_port}
x509:
enabled: ${_param:openstack_rabbitmq_x509_enabled}
diff --git a/ironic/conductor/cluster.yml b/ironic/conductor/cluster.yml
index 69cc3dc..6709403 100644
--- a/ironic/conductor/cluster.yml
+++ b/ironic/conductor/cluster.yml
@@ -24,6 +24,8 @@
ssl:
enabled: ${_param:galera_ssl_enabled}
message_queue:
+ host: ${_param:openstack_message_queue_address}
+ use_vip_address: ${_param:openstack_rabbitmq_standalone_mode}
members:
- host: ${_param:openstack_message_queue_node01_address}
- host: ${_param:openstack_message_queue_node02_address}
diff --git a/ironic/conductor/single.yml b/ironic/conductor/single.yml
index 88179a3..a55c8c3 100644
--- a/ironic/conductor/single.yml
+++ b/ironic/conductor/single.yml
@@ -23,6 +23,8 @@
ssl:
enabled: ${_param:galera_ssl_enabled}
message_queue:
+ use_vip_address: ${_param:openstack_rabbitmq_standalone_mode}
+ host: ${_param:openstack_message_queue_address}
port: ${_param:openstack_rabbitmq_port}
x509:
enabled: ${_param:openstack_rabbitmq_x509_enabled}
diff --git a/jenkins/client/approved_scripts.yml b/jenkins/client/approved_scripts.yml
index 6491f5c..a78bd6e 100644
--- a/jenkins/client/approved_scripts.yml
+++ b/jenkins/client/approved_scripts.yml
@@ -169,3 +169,4 @@
- staticMethod org.codehaus.groovy.runtime.EncodingGroovyMethods encodeBase64 byte[]
- staticMethod org.codehaus.groovy.runtime.ScriptBytecodeAdapter bitwiseNegate java.lang.Object
- staticMethod org.codehaus.groovy.runtime.DefaultGroovyMethods max java.util.Collection
+ - staticMethod org.codehaus.groovy.runtime.DefaultGroovyMethods removeElement java.util.Collection java.lang.Object
diff --git a/jenkins/client/job/ceph/add-node.yml b/jenkins/client/job/ceph/add-node.yml
index 1c8f234..258bc76 100644
--- a/jenkins/client/job/ceph/add-node.yml
+++ b/jenkins/client/job/ceph/add-node.yml
@@ -16,7 +16,6 @@
credentials: ${_param:jenkins_gerrit_credentials}
script: ceph-add-node.groovy
param:
- # general parameters
SALT_MASTER_URL:
type: string
description: URL of Salt master
@@ -27,9 +26,17 @@
default: salt
HOST:
type: string
- description: OSD HOST that will be added to Ceph cluster (rgw04*)
- default: 'rgw04*'
- HOST_TYPE:
+ description: OSD HOST that will be added to Ceph cluster (e.g. rgw04*)
+ default: ''
+ CLUSTER_FLAGS:
type: string
- description: Type of Ceph node to be added. Valid values are mon/osd/rgw
- default: 'rgw'
+ description: Flags to be aplied before pipeline and after pipeline (comma-separated list)
+ default: ''
+ OSD_ONLY:
+ type: boolean
+ default: 'false'
+ description: Add only missing OSDs while keep HOST itself intact
+ USE_UPMAP:
+ type: boolean
+ default: 'false'
+ description: Use upmap balancer to smooth data migrations
diff --git a/jenkins/client/job/ceph/add-osd-upmap.yml b/jenkins/client/job/ceph/add-osd-upmap.yml
index a96a303..1c1ccb1 100644
--- a/jenkins/client/job/ceph/add-osd-upmap.yml
+++ b/jenkins/client/job/ceph/add-osd-upmap.yml
@@ -28,7 +28,7 @@
default: salt
HOST:
type: string
- description: OSD HOST that will be added to Ceph cluster (rgw04*)
+ description: OSD HOST that will be added to Ceph cluster
default: 'osd*'
CLUSTER_FLAGS:
type: string
diff --git a/jenkins/client/job/ceph/remove-node.yml b/jenkins/client/job/ceph/remove-node.yml
index aa32c4c..9fdd102 100644
--- a/jenkins/client/job/ceph/remove-node.yml
+++ b/jenkins/client/job/ceph/remove-node.yml
@@ -27,26 +27,27 @@
default: salt
HOST:
type: string
- description: OSD HOST that will be removed from Ceph cluster (rgw04*)
- default: 'rgw04*'
- HOST_TYPE:
+ description: HOST to remove from thecluster
+ OSD:
type: string
- description: Type of Ceph node to be removed. Valid values are mon/osd/rgw
- default: 'rgw'
- ADMIN_HOST:
+ description: Remove only those OSDs at HOST (comma-separated list or *). Leave empty if you going to remove a whole osd node. Only relevant with OSD node
+ default: ''
+ CLUSTER_FLAGS:
type: string
- description: Host with admin keyring and access to cluster management
- default: 'cmn01*'
- GENERATE_CRUSHMAP:
- type: boolean
- default: 'false'
- description: Only if removing OSD host. Set to true if crush map file should be updated. Enforce has to happen manually unless it is specifically set to be enforced in pillar.
+ description: Flags to be aplied before pipeline and after pipeline (comma-separated list)
WAIT_FOR_HEALTHY:
type: boolean
default: 'true'
description: Wait for healthy during pipeline
- CLEANDISK:
+ CLEAN_ORPHANS:
type: boolean
default: 'false'
- description: Clean data/block partitions
-
+ description: Clean orphaned ceph partition which are no longer part of cluster. Only relevant with osd hosts and required Luminous ceph-disk
+ FAST_WIPE:
+ type: boolean
+ default: 'true'
+ description: Wipe only partition table of each removed disk. Otherwise whole disk will be wiped. Only relevant with osd hosts
+ GENERATE_CRUSHMAP:
+ type: boolean
+ default: 'false'
+ description: Generate new crush map
diff --git a/jenkins/client/job/ceph/remove-osd.yml b/jenkins/client/job/ceph/remove-osd.yml
index ce2037b..1565ab5 100644
--- a/jenkins/client/job/ceph/remove-osd.yml
+++ b/jenkins/client/job/ceph/remove-osd.yml
@@ -32,10 +32,6 @@
type: string
description: These OSDs at HOST will be removed (comma-separated list)
default: '*'
- ADMIN_HOST:
- type: string
- description: Host with admin keyring and access to cluster management
- default: 'cmn01*'
CLUSTER_FLAGS:
type: string
description: Flags to be aplied before pipeline and after pipeline (comma-separated list)
@@ -43,10 +39,10 @@
type: boolean
default: 'true'
description: Wait for healthy during pipeline
- CLEANDISK:
+ FAST_WIPE:
type: boolean
- default: 'false'
- description: Clean data/block partitions
+ default: 'true'
+ description: Wipe only partition table of each removed disk. Otherwise whole disk will be wiped. Only relevant with osd hosts
CLEAN_ORPHANS:
type: boolean
default: 'false'
diff --git a/jenkins/client/job/ceph/upgrade.yml b/jenkins/client/job/ceph/upgrade.yml
index e8b94a2..8016d8f 100644
--- a/jenkins/client/job/ceph/upgrade.yml
+++ b/jenkins/client/job/ceph/upgrade.yml
@@ -34,6 +34,10 @@
type: boolean
default: 'true'
description: Wait for healthy during pipeline
+ ASK_CONFIRMATION:
+ type: boolean
+ description: Ask for manual confirmation
+ default: 'true'
CLUSTER_FLAGS:
type: string
default: 'noout'
diff --git a/keepalived/cluster/instance/rabbitmq_vip.yml b/keepalived/cluster/instance/rabbitmq_vip.yml
new file mode 100644
index 0000000..922afc7
--- /dev/null
+++ b/keepalived/cluster/instance/rabbitmq_vip.yml
@@ -0,0 +1,16 @@
+classes:
+- service.keepalived.cluster.single
+parameters:
+ _param:
+ keepalived_rabbitemq_vrrp_script_content: 'rabbitmqctl cluster_status --formatter=erlang | grep -q "running_nodes.*$(hostname)"'
+ keepalived:
+ cluster:
+ vrrp_scripts:
+ rabbitemq_vip:
+ content: ${_param:keepalived_rabbitemq_vrrp_script_content}
+ interval: 10
+ rise: 1
+ fall: 1
+ instance:
+ VIP:
+ track_script: rabbitemq_vip
diff --git a/keystone/server/cluster.yml b/keystone/server/cluster.yml
index e0d01d9..16ec57a 100644
--- a/keystone/server/cluster.yml
+++ b/keystone/server/cluster.yml
@@ -67,6 +67,8 @@
message_queue:
port: ${_param:openstack_rabbitmq_port}
engine: rabbitmq
+ use_vip_address: ${_param:openstack_rabbitmq_standalone_mode}
+ host: ${_param:openstack_message_queue_address}
members:
- host: ${_param:openstack_message_queue_node01_address}
- host: ${_param:openstack_message_queue_node02_address}
diff --git a/keystone/server/single.yml b/keystone/server/single.yml
index 8c5e594..080c65e 100644
--- a/keystone/server/single.yml
+++ b/keystone/server/single.yml
@@ -62,7 +62,8 @@
message_queue:
port: ${_param:openstack_rabbitmq_port}
engine: rabbitmq
- host: ${_param:single_address}
+ use_vip_address: ${_param:openstack_rabbitmq_standalone_mode}
+ host: ${_param:openstack_message_queue_address}
user: openstack
password: ${_param:rabbitmq_openstack_password}
virtual_host: '/openstack'
diff --git a/linux/system/repo/mcp/updates_mirantis.yml b/linux/system/repo/mcp/updates_mirantis.yml
new file mode 100644
index 0000000..bec5689
--- /dev/null
+++ b/linux/system/repo/mcp/updates_mirantis.yml
@@ -0,0 +1,9 @@
+parameters:
+ linux:
+ system:
+ repo:
+ updates_mirantis:
+ source: "deb https://${_param:updates_mirantis_login}:${_param:updates_mirantis_password}@${_param:updates_mirantis_host}/${_param:updates_mirantis_version} xenial main"
+ key_url: "https://${_param:updates_mirantis_login}:${_param:updates_mirantis_password}@${_param:updates_mirantis_host}/${_param:updates_mirantis_version}/${_param:updates_mirantis_key_file}"
+ architectures: amd64
+ clean_file: True
diff --git a/manila/common/cluster.yml b/manila/common/cluster.yml
index 73c679b..27f2641 100644
--- a/manila/common/cluster.yml
+++ b/manila/common/cluster.yml
@@ -15,6 +15,7 @@
user: openstack
password: ${_param:rabbitmq_openstack_password}
virtual_host: '/openstack'
+ use_vip_address: ${_param:openstack_rabbitmq_standalone_mode}
host: ${_param:openstack_message_queue_address}
x509:
enabled: ${_param:openstack_rabbitmq_x509_enabled}
diff --git a/manila/common/single.yml b/manila/common/single.yml
index fe59263..61930a7 100644
--- a/manila/common/single.yml
+++ b/manila/common/single.yml
@@ -13,7 +13,8 @@
user: openstack
password: ${_param:rabbitmq_openstack_password}
virtual_host: '/openstack'
- host: ${_param:single_address}
+ use_vip_address: ${_param:openstack_rabbitmq_standalone_mode}
+ host: ${_param:openstack_message_queue_address}
x509:
enabled: ${_param:openstack_rabbitmq_x509_enabled}
ca_file: ${_param:rabbitmq_manila_ssl_ca_file}
diff --git a/murano/server/cluster.yml b/murano/server/cluster.yml
index 73dcb38..5001c64 100644
--- a/murano/server/cluster.yml
+++ b/murano/server/cluster.yml
@@ -29,6 +29,8 @@
user: ${_param:keystone_murano_username}
password: ${_param:keystone_murano_password}
message_queue:
+ use_vip_address: ${_param:openstack_rabbitmq_standalone_mode}
+ host: ${_param:openstack_message_queue_address}
engine: rabbitmq
port: 5672
members:
diff --git a/murano/server/single.yml b/murano/server/single.yml
index 1512893..0f3c1ed 100644
--- a/murano/server/single.yml
+++ b/murano/server/single.yml
@@ -29,7 +29,8 @@
message_queue:
engine: rabbitmq
port: 5672
- host: ${_param:cluster_vip_address}
+ use_vip_address: ${_param:openstack_rabbitmq_standalone_mode}
+ host: ${_param:openstack_message_queue_address}
user: openstack
password: ${_param:rabbitmq_openstack_password}
virtual_host: '/openstack'
diff --git a/neutron/compute/cluster.yml b/neutron/compute/cluster.yml
index 0766df7..32a8efc 100644
--- a/neutron/compute/cluster.yml
+++ b/neutron/compute/cluster.yml
@@ -31,6 +31,8 @@
tenant_network_types: ${_param:neutron_tenant_network_types}"
message_queue:
port: ${_param:openstack_rabbitmq_port}
+ use_vip_address: ${_param:openstack_rabbitmq_standalone_mode}
+ host: ${_param:openstack_message_queue_address}
members:
- host: ${_param:openstack_message_queue_node01_address}
- host: ${_param:openstack_message_queue_node02_address}
diff --git a/neutron/control/cluster.yml b/neutron/control/cluster.yml
index fe6f464..c95db09 100644
--- a/neutron/control/cluster.yml
+++ b/neutron/control/cluster.yml
@@ -20,6 +20,8 @@
password: ${_param:keystone_nova_password}
message_queue:
port: ${_param:openstack_rabbitmq_port}
+ use_vip_address: ${_param:openstack_rabbitmq_standalone_mode}
+ host: ${_param:openstack_message_queue_address}
members:
- host: ${_param:openstack_message_queue_node01_address}
- host: ${_param:openstack_message_queue_node02_address}
diff --git a/neutron/control/opencontrail/single.yml b/neutron/control/opencontrail/single.yml
index 00fa23c..ce55faa 100644
--- a/neutron/control/opencontrail/single.yml
+++ b/neutron/control/opencontrail/single.yml
@@ -10,6 +10,8 @@
region: ${_param:openstack_region}
host: ${_param:openstack_control_address}
message_queue:
+ use_vip_address: ${_param:openstack_rabbitmq_standalone_mode}
+ host: ${_param:openstack_message_queue_address}
members:
- host: ${_param:single_address}
compute:
diff --git a/neutron/control/openvswitch/single.yml b/neutron/control/openvswitch/single.yml
index 5beb0ca..bbf629c 100644
--- a/neutron/control/openvswitch/single.yml
+++ b/neutron/control/openvswitch/single.yml
@@ -39,5 +39,7 @@
region: ${_param:openstack_region}
protocol: ${_param:internal_protocol}
message_queue:
+ use_vip_address: ${_param:openstack_rabbitmq_standalone_mode}
+ host: ${_param:openstack_message_queue_address}
members:
- host: ${_param:single_address}
diff --git a/neutron/control/ovn/single.yml b/neutron/control/ovn/single.yml
index 73702fd..3a73f05 100644
--- a/neutron/control/ovn/single.yml
+++ b/neutron/control/ovn/single.yml
@@ -37,6 +37,8 @@
password: ${_param:keystone_neutron_password}
region: ${_param:openstack_region}
message_queue:
+ use_vip_address: ${_param:openstack_rabbitmq_standalone_mode}
+ host: ${_param:openstack_message_queue_address}
members:
- host: ${_param:openstack_message_queue_node01_address}
ovn_ctl_opts:
diff --git a/neutron/control/single.yml b/neutron/control/single.yml
index bc025eb..76f3654 100644
--- a/neutron/control/single.yml
+++ b/neutron/control/single.yml
@@ -26,6 +26,8 @@
ssl:
enabled: ${_param:galera_ssl_enabled}
message_queue:
+ use_vip_address: ${_param:openstack_rabbitmq_standalone_mode}
+ host: ${_param:openstack_message_queue_address}
port: ${_param:openstack_rabbitmq_port}
x509:
enabled: ${_param:openstack_rabbitmq_x509_enabled}
diff --git a/neutron/gateway/cluster.yml b/neutron/gateway/cluster.yml
index 58aaab8..517c955 100644
--- a/neutron/gateway/cluster.yml
+++ b/neutron/gateway/cluster.yml
@@ -22,6 +22,8 @@
tenant_network_types: "${_param:neutron_tenant_network_types}"
message_queue:
port: ${_param:openstack_rabbitmq_port}
+ use_vip_address: ${_param:openstack_rabbitmq_standalone_mode}
+ host: ${_param:openstack_message_queue_address}
members:
- host: ${_param:openstack_message_queue_node01_address}
- host: ${_param:openstack_message_queue_node02_address}
diff --git a/nova/compute/cluster.yml b/nova/compute/cluster.yml
index 3154a37..287987e 100644
--- a/nova/compute/cluster.yml
+++ b/nova/compute/cluster.yml
@@ -54,6 +54,8 @@
user: openstack
password: ${_param:rabbitmq_openstack_password}
virtual_host: '/openstack'
+ use_vip_address: ${_param:openstack_rabbitmq_standalone_mode}
+ host: ${_param:openstack_message_queue_address}
members:
- host: ${_param:openstack_message_queue_node01_address}
- host: ${_param:openstack_message_queue_node02_address}
diff --git a/nova/compute/single.yml b/nova/compute/single.yml
index a6126ef..519ff37 100644
--- a/nova/compute/single.yml
+++ b/nova/compute/single.yml
@@ -49,7 +49,8 @@
enabled: ${_param:nova_service_user_enabled}
message_queue:
engine: rabbitmq
- host: ${_param:control_address}
+ use_vip_address: ${_param:openstack_rabbitmq_standalone_mode}
+ host: ${_param:openstack_message_queue_address}
port: ${_param:openstack_rabbitmq_port}
user: openstack
password: ${_param:rabbitmq_openstack_password}
diff --git a/nova/compute_ironic/cluster.yml b/nova/compute_ironic/cluster.yml
index 8b57948..7943453 100644
--- a/nova/compute_ironic/cluster.yml
+++ b/nova/compute_ironic/cluster.yml
@@ -28,6 +28,8 @@
service_user:
enabled: ${_param:nova_service_user_enabled}
message_queue:
+ use_vip_address: ${_param:openstack_rabbitmq_standalone_mode}
+ host: ${_param:openstack_message_queue_address}
engine: rabbitmq
port: 5672
user: openstack
diff --git a/nova/compute_ironic/single.yml b/nova/compute_ironic/single.yml
index bc3ee7c..ab99139 100644
--- a/nova/compute_ironic/single.yml
+++ b/nova/compute_ironic/single.yml
@@ -33,7 +33,8 @@
user: openstack
password: ${_param:rabbitmq_openstack_password}
virtual_host: '/openstack'
- host: ${_param:control_address}
+ use_vip_address: ${_param:openstack_rabbitmq_standalone_mode}
+ host: ${_param:openstack_message_queue_address}
network:
engine: neutron
region: ${_param:openstack_region}
diff --git a/nova/control/cluster.yml b/nova/control/cluster.yml
index 7541d28..87363d3 100644
--- a/nova/control/cluster.yml
+++ b/nova/control/cluster.yml
@@ -73,6 +73,8 @@
user: openstack
password: ${_param:rabbitmq_openstack_password}
virtual_host: '/openstack'
+ use_vip_address: ${_param:openstack_rabbitmq_standalone_mode}
+ host: ${_param:openstack_message_queue_address}
members:
- host: ${_param:openstack_message_queue_node01_address}
- host: ${_param:openstack_message_queue_node02_address}
diff --git a/nova/control/single.yml b/nova/control/single.yml
index e964f76..10f9a1c 100644
--- a/nova/control/single.yml
+++ b/nova/control/single.yml
@@ -37,6 +37,8 @@
barbican:
enabled: ${_param:barbican_integration_enabled}
message_queue:
+ use_vip_address: ${_param:openstack_rabbitmq_standalone_mode}
+ host: ${_param:openstack_message_queue_address}
port: ${_param:openstack_rabbitmq_port}
x509:
enabled: ${_param:openstack_rabbitmq_x509_enabled}
diff --git a/octavia/api/cluster.yml b/octavia/api/cluster.yml
index e698481..1332c60 100644
--- a/octavia/api/cluster.yml
+++ b/octavia/api/cluster.yml
@@ -25,6 +25,7 @@
region: ${_param:openstack_region}
protocol: ${_param:cluster_internal_protocol}
message_queue:
+ use_vip_address: ${_param:openstack_rabbitmq_standalone_mode}
host: ${_param:openstack_message_queue_address}
port: ${_param:openstack_rabbitmq_port}
x509:
diff --git a/octavia/api/single.yml b/octavia/api/single.yml
index b359885..f76560c 100644
--- a/octavia/api/single.yml
+++ b/octavia/api/single.yml
@@ -24,6 +24,7 @@
region: ${_param:openstack_region}
protocol: ${_param:cluster_internal_protocol}
message_queue:
+ use_vip_address: ${_param:openstack_rabbitmq_standalone_mode}
host: ${_param:openstack_message_queue_address}
port: ${_param:openstack_rabbitmq_port}
x509:
diff --git a/octavia/manager/cluster.yml b/octavia/manager/cluster.yml
index c10e800..cfee518 100644
--- a/octavia/manager/cluster.yml
+++ b/octavia/manager/cluster.yml
@@ -26,6 +26,7 @@
region: ${_param:openstack_region}
protocol: ${_param:cluster_internal_protocol}
message_queue:
+ use_vip_address: ${_param:openstack_rabbitmq_standalone_mode}
host: ${_param:openstack_message_queue_address}
port: ${_param:openstack_rabbitmq_port}
x509:
diff --git a/octavia/manager/single.yml b/octavia/manager/single.yml
index 51671eb..fadae05 100644
--- a/octavia/manager/single.yml
+++ b/octavia/manager/single.yml
@@ -31,6 +31,7 @@
region: ${_param:openstack_region}
protocol: ${_param:cluster_internal_protocol}
message_queue:
+ use_vip_address: ${_param:openstack_rabbitmq_standalone_mode}
host: ${_param:openstack_message_queue_address}
port: ${_param:openstack_rabbitmq_port}
x509:
diff --git a/openssh/server/team/members/pvaylov.yml b/openssh/server/team/members/pvaylov.yml
new file mode 100644
index 0000000..7d90860
--- /dev/null
+++ b/openssh/server/team/members/pvaylov.yml
@@ -0,0 +1,19 @@
+parameters:
+ linux:
+ system:
+ user:
+ pvaylov:
+ email: pvaylov@mirantis.com
+ enabled: true
+ full_name: Pavel Vaylov
+ home: /home/pvaylov
+ name: pvaylov
+ sudo: ${_param:linux_system_user_sudo}
+ openssh:
+ server:
+ user:
+ pvaylov:
+ enabled: true
+ public_keys:
+ - key: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDHwOflKJpgQkjO90DxUWz8tdWWY9xMl4lauzPopOV+dnhJ7eyo78gGBdTi3xprguOTncktcZAss3GDapTblLbg7xoofy8qke180+LJVGFSJLACWg74e1UiuxQRv66MNjafCIy337D6RoxNwUSaf0DQGs5ainmxri/PFlnEHAYkri4mF16pKFuw5cFkAlDsLH17ok5S0Rk34zZVywVT4VsPttKbS7vzyejyL0sh8GyBfEXIRlrn6I6GjTWpI5R4rYPbbm2XfOFfQ6aYRzBReJLm8FcTHjXjYlm+LDXaAzQbaiV2W+dmCMnawPD3jZ7uQd9Ob9lYyD43V/wS7BAreIxv
+ user: ${linux:system:user:pvaylov}
diff --git a/openssh/server/team/members/srogov.yml b/openssh/server/team/members/srogov.yml
new file mode 100644
index 0000000..ae6b4a5
--- /dev/null
+++ b/openssh/server/team/members/srogov.yml
@@ -0,0 +1,19 @@
+parameters:
+ linux:
+ system:
+ user:
+ srogov:
+ email: srogov@mirantis.com
+ enabled: true
+ full_name: Stepan Rogov
+ home: /home/srogov
+ name: srogov
+ sudo: ${_param:linux_system_user_sudo}
+ openssh:
+ server:
+ user:
+ srogov:
+ enabled: true
+ public_keys:
+ - key: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCjlSWDL7hIgLbklKBVXIyNKxi3U4cbUSxPDFgUAf1Fp0mz/6o5jUuJjGMVtAYvQFBQbi8Hn0wX2bdubyFnD21M+9jQL05fqQGsG/JPq+u/XYj+k+WVLyrjTWMoL4xs9vAwjAJfDaWZ4BDwfWCAVe86OzjuFo2LvDl08YJpLTwwCqpUR9htvZGxR9UvJr7JV2xNqD9xUl3TK0n9Fo0aWbWiszImRO6KLRASKw8x0GgNjzP5qGI02x34tW9nL1yTjRxMweVyyh91OWdGLTp1ghixb2ZRJWPQ99UaWKv0pGCBbyjjmQCmODffSstIcFpGmqqZ8Y6aP6ESOYPXJccAvc0/ chlorum@chlorum
+ user: ${linux:system:user:srogov}
diff --git a/openssh/server/team/services.yml b/openssh/server/team/services.yml
index 3a2a2d3..c3a6f07 100644
--- a/openssh/server/team/services.yml
+++ b/openssh/server/team/services.yml
@@ -14,11 +14,13 @@
- system.openssh.server.team.members.osavatieiev
- system.openssh.server.team.members.pbasov
- system.openssh.server.team.members.pruzicka
-- system.openssh.server.team.members.qwu
+- system.openssh.server.team.members.pvaylov
- system.openssh.server.team.members.sburns
+- system.openssh.server.team.members.srogov
- system.openssh.server.team.members.vkuspits
- system.openssh.server.team.members.yisakov
- system.openssh.server.team.members.wnawrot
+- system.openssh.server.team.members.qwu
- system.openssh.server.team.members.srudyka
parameters:
_param:
diff --git a/sahara/server/cluster.yml b/sahara/server/cluster.yml
index 3e48e7d..00c5e3e 100644
--- a/sahara/server/cluster.yml
+++ b/sahara/server/cluster.yml
@@ -29,6 +29,8 @@
user: ${_param:keystone_sahara_username}
password: ${_param:keystone_sahara_password}
message_queue:
+ use_vip_address: ${_param:openstack_rabbitmq_standalone_mode}
+ host: ${_param:openstack_message_queue_address}
engine: rabbitmq
port: 5672
members:
diff --git a/sahara/server/single.yml b/sahara/server/single.yml
index 3b63c44..625849d 100644
--- a/sahara/server/single.yml
+++ b/sahara/server/single.yml
@@ -25,7 +25,8 @@
tenant: service
message_queue:
engine: rabbitmq
- host: ${_param:cluster_vip_address}
+ use_vip_address: ${_param:openstack_rabbitmq_standalone_mode}
+ host: ${_param:openstack_message_queue_address}
port: 5672
user: openstack
password: ${_param:rabbitmq_openstack_password}