Merge "add missing aodh class for large setups"
diff --git a/horizon/server/plugin/lbaasv2.yml b/horizon/server/plugin/lbaasv2.yml
index 69e2682..37bf013 100644
--- a/horizon/server/plugin/lbaasv2.yml
+++ b/horizon/server/plugin/lbaasv2.yml
@@ -5,5 +5,5 @@
lbaasv2:
source:
engine: pkg
- name: python-horizon-neutron-lbaasv2-panel
+ name: python-neutron-lbaas-dashboard
diff --git a/jenkins/client/job/oscore/test_upgrades.yml b/jenkins/client/job/oscore/test_upgrades.yml
index b97855a..e193d58 100644
--- a/jenkins/client/job/oscore/test_upgrades.yml
+++ b/jenkins/client/job/oscore/test_upgrades.yml
@@ -55,6 +55,55 @@
description: "Yaml based scheme to be applied in testing"
default: '{"old": {"run_smoke": True, "context_file_name": "openstack-ovs-core-{{openstack_version_old}}","extra_context": {"default_context": {"openstack_version": "{{openstack_version_old}}"}}}, "new": {"run_smoke": True, "extra_context": {"default_context": {"openstack_version": "{{openstack_version_new}}"}}}}'
job:
+ oscore-test-openstack-upgrade-mitaka-newton:
+ display_name: oscore-test-openstack-upgrade-mitaka-newton
+ name: oscore-test-openstack-upgrade-mitaka-newton
+ concurrent: true
+ description: Test upgrade flow for opentack cluster
+ discard:
+ build:
+ keep_num: 60
+ artifact:
+ keep_num: 60
+ type: workflow-scm
+ scm:
+ type: git
+ url: "${_param:jenkins_gerrit_url}/openstack-ci/openstack-pipelines"
+ credentials: "gerrit"
+ branch: 'master'
+ script: test-openstack-upgrade-pipeline.groovy
+ param:
+ CREDENTIALS_ID:
+ type: string
+ description: "ID of jenkins credentials to be used when connecting to gerrit."
+ default: "gerrit"
+ OPENSTACK_ENVIRONMENT:
+ type: choice
+ description: "Target openstack environment."
+ choices:
+ - devcloud
+ - presales
+ - oscore_devcloud
+ OPENSTACK_API_CREDENTIALS:
+ type: string
+ description: "Credentials to the OpenStack API"
+ OPENSTACK_API_PROJECT:
+ type: string
+ default: "mcp-oscore"
+ HEAT_STACK_ZONE:
+ type: string
+ default: "mcp-oscore"
+ FLAVOR_PREFIX:
+ type: string
+ default: 'dev'
+ STACK_DELETE:
+ type: boolean
+ default: 'true'
+ description: Don't enable it if you need to use the lab after
+ TEST_SCHEME:
+ type: string
+ description: "Yaml based scheme to be applied in testing"
+ default: '{"old": {"run_smoke": True, "context_file_name": "openstack-ovs-core-mitaka","extra_context": {"default_context": {"openstack_version": "mitaka"}}}, "new": {"run_smoke": True, "extra_context": {"default_context": {"openstack_version": "newton"}}}}'
oscore-test-adjust-cluster-model:
display_name: oscore-test-adjust-cluster-model
name: oscore-test-adjust-cluster-model
diff --git a/keystone/client/service/octavia.yml b/keystone/client/service/octavia.yml
index fe0125a..bf16b79 100644
--- a/keystone/client/service/octavia.yml
+++ b/keystone/client/service/octavia.yml
@@ -9,6 +9,9 @@
client:
server:
identity:
+ roles:
+ - load-balancer_member
+ - load-balancer_admin
project:
service:
user:
diff --git a/keystone/client/v3/service/octavia.yml b/keystone/client/v3/service/octavia.yml
index a43b0a9..d571105 100644
--- a/keystone/client/v3/service/octavia.yml
+++ b/keystone/client/v3/service/octavia.yml
@@ -7,6 +7,13 @@
client:
resources:
v3:
+ roles:
+ global_load_balancer_member:
+ name: load-balancer_member
+ enabled: true
+ global_load_balancer_admin:
+ name: load-balancer_admin
+ enabled: true
users:
octavia:
password: ${_param:keystone_octavia_password}
@@ -17,7 +24,7 @@
project_id: service
services:
octavia:
- type: octavia
+ type: load-balancer
description: OpenStack Loadbalancing Service
endpoints:
octavia_public:
diff --git a/kubernetes/common/addons/alertmanager.yml b/kubernetes/common/addons/alertmanager.yml
new file mode 100644
index 0000000..c7483cf
--- /dev/null
+++ b/kubernetes/common/addons/alertmanager.yml
@@ -0,0 +1,24 @@
+classes:
+- system.prometheus.alertmanager.container
+parameters:
+ _param:
+ kubernetes_alertmanager_enabled: false
+ kubernetes_alertmanager_image: ${_param:mcp_docker_registry}/openstack-docker/alertmanager:2018.8.0
+ kubernetes_alertmanager_namespace: stacklight
+ kubernetes_alertmanager_node_port: 31993
+ kubernetes:
+ common:
+ addons:
+ alertmanager:
+ enabled: ${_param:kubernetes_alertmanager_enabled}
+ image: ${_param:kubernetes_alertmanager_image}
+ namespace: ${_param:kubernetes_alertmanager_namespace}
+ dir:
+ config: ${_param:prometheus_alertmanager_config_directory}
+ data: ${_param:prometheus_alertmanager_data_directory}
+ host_config: ${prometheus:alertmanager:dir:config}
+ host_data: ${prometheus:alertmanager:dir:data}
+ bind:
+ address: ${prometheus:alertmanager:bind:address}
+ port: ${prometheus:alertmanager:bind:port}
+ node_port: ${_param:kubernetes_alertmanager_node_port}
diff --git a/neutron/control/cluster.yml b/neutron/control/cluster.yml
index 3814a03..be69bf8 100644
--- a/neutron/control/cluster.yml
+++ b/neutron/control/cluster.yml
@@ -26,6 +26,13 @@
- host: ${_param:openstack_message_queue_node01_address}
- host: ${_param:openstack_message_queue_node02_address}
- host: ${_param:openstack_message_queue_node03_address}
+ x509:
+ enabled: ${_param:openstack_rabbitmq_x509_enabled}
+ ca_file: ${_param:rabbitmq_neutron_ssl_ca_file}
+ key_file: ${_param:rabbitmq_neutron_client_ssl_key_file}
+ cert_file: ${_param:rabbitmq_neutron_client_ssl_cert_file}
+ ssl:
+ enabled: ${_param:rabbitmq_ssl_enabled}
database:
x509:
enabled: ${_param:openstack_mysql_x509_enabled}
@@ -34,14 +41,6 @@
cert_file: ${_param:mysql_neutron_client_ssl_cert_file}
ssl:
enabled: ${_param:galera_ssl_enabled}
- message_queue:
- x509:
- enabled: ${_param:openstack_rabbitmq_x509_enabled}
- ca_file: ${_param:rabbitmq_neutron_ssl_ca_file}
- key_file: ${_param:rabbitmq_neutron_client_ssl_key_file}
- cert_file: ${_param:rabbitmq_neutron_client_ssl_cert_file}
- ssl:
- enabled: ${_param:rabbitmq_ssl_enabled}
role: ${_param:openstack_node_role}
identity:
protocol: ${_param:cluster_internal_protocol}
diff --git a/neutron/control/openvswitch/cluster.yml b/neutron/control/openvswitch/cluster.yml
index 2f1982f..094449e 100644
--- a/neutron/control/openvswitch/cluster.yml
+++ b/neutron/control/openvswitch/cluster.yml
@@ -1,6 +1,5 @@
classes:
- system.neutron.control.cluster
-- system.salt.minion.cert.rabbitmq.clients.openstack.neutron
parameters:
_param:
neutron_control_dvr: True
@@ -13,8 +12,6 @@
neutron_enable_bgp_vpn: False
neutron_bgp_vpn_driver: bagpipe
cluster_internal_protocol: 'http'
- openstack_rabbitmq_x509_enabled: False
- rabbitmq_ssl_enabled: False
neutron:
server:
role: ${_param:openstack_node_role}
@@ -40,15 +37,3 @@
identity:
region: ${_param:openstack_region}
protocol: ${_param:cluster_internal_protocol}
- message_queue:
- members:
- - host: ${_param:openstack_message_queue_node01_address}
- - host: ${_param:openstack_message_queue_node02_address}
- - host: ${_param:openstack_message_queue_node03_address}
- x509:
- enabled: ${_param:openstack_rabbitmq_x509_enabled}
- ca_file: ${_param:rabbitmq_neutron_ssl_ca_file}
- key_file: ${_param:rabbitmq_neutron_client_ssl_key_file}
- cert_file: ${_param:rabbitmq_neutron_client_ssl_cert_file}
- ssl:
- enabled: ${_param:rabbitmq_ssl_enabled}
diff --git a/neutron/control/openvswitch/single.yml b/neutron/control/openvswitch/single.yml
index 6c266c3..5beb0ca 100644
--- a/neutron/control/openvswitch/single.yml
+++ b/neutron/control/openvswitch/single.yml
@@ -1,7 +1,5 @@
classes:
- system.neutron.control.single
-- system.galera.server.database.neutron
-- system.salt.minion.cert.rabbitmq.clients.openstack.neutron
parameters:
_param:
neutron_control_dvr: True
@@ -15,8 +13,6 @@
neutron_bgp_vpn_driver: bagpipe
internal_protocol: 'http'
openstack_node_role: primary
- openstack_rabbitmq_x509_enabled: False
- rabbitmq_ssl_enabled: False
neutron:
server:
role: ${_param:openstack_node_role}
@@ -45,10 +41,3 @@
message_queue:
members:
- host: ${_param:single_address}
- x509:
- enabled: ${_param:openstack_rabbitmq_x509_enabled}
- ca_file: ${_param:rabbitmq_neutron_ssl_ca_file}
- key_file: ${_param:rabbitmq_neutron_client_ssl_key_file}
- cert_file: ${_param:rabbitmq_neutron_client_ssl_cert_file}
- ssl:
- enabled: ${_param:rabbitmq_ssl_enabled}
diff --git a/nova/compute/cluster.yml b/nova/compute/cluster.yml
index c88dcc7..4482b52 100644
--- a/nova/compute/cluster.yml
+++ b/nova/compute/cluster.yml
@@ -1,5 +1,6 @@
classes:
- service.nova.compute.kvm
+- system.salt.minion.cert.rabbitmq.clients.openstack.nova
parameters:
_param:
nova_vncproxy_url: https://${_param:cluster_public_host}:6080
@@ -36,6 +37,8 @@
SG9MrLHCd5l60aCUQg0UA5ed7Hd6SA314k+HwxJno9/wJ+voBeacMg==
-----END RSA PRIVATE KEY-----
cluster_internal_protocol: 'http'
+ openstack_rabbitmq_x509_enabled: False
+ rabbitmq_ssl_enabled: False
openssh:
client:
enabled: True
@@ -80,6 +83,13 @@
- host: ${_param:openstack_message_queue_node01_address}
- host: ${_param:openstack_message_queue_node02_address}
- host: ${_param:openstack_message_queue_node03_address}
+ x509:
+ enabled: ${_param:openstack_rabbitmq_x509_enabled}
+ ca_file: ${_param:rabbitmq_nova_ssl_ca_file}
+ key_file: ${_param:rabbitmq_nova_client_ssl_key_file}
+ cert_file: ${_param:rabbitmq_nova_client_ssl_cert_file}
+ ssl:
+ enabled: ${_param:rabbitmq_ssl_enabled}
image:
engine: glance
host: ${_param:cluster_vip_address}
diff --git a/nova/compute/single.yml b/nova/compute/single.yml
index 67c329d..5f4f8ef 100644
--- a/nova/compute/single.yml
+++ b/nova/compute/single.yml
@@ -2,6 +2,7 @@
- nova
classes:
- service.nova.compute.kvm
+- system.salt.minion.cert.rabbitmq.clients.openstack.nova
parameters:
_param:
nova_vncproxy_url: https://${_param:cluster_public_host}:6080
@@ -36,6 +37,8 @@
SG9MrLHCd5l60aCUQg0UA5ed7Hd6SA314k+HwxJno9/wJ+voBeacMg==
-----END RSA PRIVATE KEY-----
cluster_internal_protocol: 'http'
+ openstack_rabbitmq_x509_enabled: False
+ rabbitmq_ssl_enabled: False
openssh:
client:
enabled: True
@@ -76,6 +79,13 @@
user: openstack
password: ${_param:rabbitmq_openstack_password}
virtual_host: '/openstack'
+ x509:
+ enabled: ${_param:openstack_rabbitmq_x509_enabled}
+ ca_file: ${_param:rabbitmq_nova_ssl_ca_file}
+ key_file: ${_param:rabbitmq_nova_client_ssl_key_file}
+ cert_file: ${_param:rabbitmq_nova_client_ssl_cert_file}
+ ssl:
+ enabled: ${_param:rabbitmq_ssl_enabled}
image:
engine: glance
host: ${_param:control_address}
diff --git a/nova/control/cluster.yml b/nova/control/cluster.yml
index 2f411b5..c21bee4 100644
--- a/nova/control/cluster.yml
+++ b/nova/control/cluster.yml
@@ -5,6 +5,7 @@
- system.haproxy.proxy.listen.openstack.nova
- system.haproxy.proxy.listen.openstack.novnc
- system.salt.minion.cert.mysql.clients.openstack.nova
+- system.salt.minion.cert.rabbitmq.clients.openstack.nova
parameters:
_param:
nova_vncproxy_url: http://${_param:cluster_vip_address}:6080
@@ -15,6 +16,8 @@
cluster_internal_protocol: 'http'
openstack_mysql_x509_enabled: False
galera_ssl_enabled: False
+ openstack_rabbitmq_x509_enabled: False
+ rabbitmq_ssl_enabled: False
linux:
system:
package:
@@ -73,6 +76,13 @@
- host: ${_param:openstack_message_queue_node01_address}
- host: ${_param:openstack_message_queue_node02_address}
- host: ${_param:openstack_message_queue_node03_address}
+ x509:
+ enabled: ${_param:openstack_rabbitmq_x509_enabled}
+ ca_file: ${_param:rabbitmq_nova_ssl_ca_file}
+ key_file: ${_param:rabbitmq_nova_client_ssl_key_file}
+ cert_file: ${_param:rabbitmq_nova_client_ssl_cert_file}
+ ssl:
+ enabled: ${_param:rabbitmq_ssl_enabled}
glance:
host: ${_param:cluster_vip_address}
port: 9292
diff --git a/nova/control/single.yml b/nova/control/single.yml
index e7d7671..689be66 100644
--- a/nova/control/single.yml
+++ b/nova/control/single.yml
@@ -1,11 +1,14 @@
classes:
- system.salt.minion.cert.mysql.clients.openstack.nova
+- system.salt.minion.cert.rabbitmq.clients.openstack.nova
- service.nova.control.single
parameters:
_param:
cluster_internal_protocol: 'http'
openstack_mysql_x509_enabled: False
galera_ssl_enabled: False
+ openstack_rabbitmq_x509_enabled: False
+ rabbitmq_ssl_enabled: False
linux:
system:
package:
@@ -32,3 +35,12 @@
region: ${_param:openstack_region}
glance:
protocol: ${_param:cluster_internal_protocol}
+ message_queue:
+ x509:
+ enabled: ${_param:openstack_rabbitmq_x509_enabled}
+ ca_file: ${_param:rabbitmq_nova_ssl_ca_file}
+ key_file: ${_param:rabbitmq_nova_client_ssl_key_file}
+ cert_file: ${_param:rabbitmq_nova_client_ssl_cert_file}
+ ssl:
+ enabled: ${_param:rabbitmq_ssl_enabled}
+
diff --git a/salt/minion/cert/rabbitmq/clients/openstack/nova.yml b/salt/minion/cert/rabbitmq/clients/openstack/nova.yml
new file mode 100644
index 0000000..04a6078
--- /dev/null
+++ b/salt/minion/cert/rabbitmq/clients/openstack/nova.yml
@@ -0,0 +1,27 @@
+parameters:
+ _param:
+ salt_minion_ca_host: cfg01.${_param:cluster_domain}
+ salt_minion_ca_authority: salt_master_ca
+ rabbitmq_nova_client_ssl_key_file: /etc/nova/ssl/rabbitmq/client-key.pem
+ rabbitmq_nova_client_ssl_cert_file: /etc/nova/ssl/rabbitmq/client-cert.pem
+ rabbitmq_nova_ssl_ca_file: /etc/nova/ssl/rabbitmq/ca-cert.pem
+ salt:
+ minion:
+ cert:
+ rabbitmq-nova-client:
+ host: ${_param:salt_minion_ca_host}
+ authority: ${_param:salt_minion_ca_authority}
+ common_name: rabbitmq-nova-client
+ signing_policy: cert_client
+ alternative_names: >
+ IP:${_param:cluster_local_address},
+ DNS:${_param:cluster_local_address},
+ DNS:${linux:system:name},
+ DNS:${linux:network:fqdn}
+ key_usage: "digitalSignature,nonRepudiation,keyEncipherment"
+ key_file: ${_param:rabbitmq_nova_client_ssl_key_file}
+ cert_file: ${_param:rabbitmq_nova_client_ssl_cert_file}
+ ca_file: ${_param:rabbitmq_nova_ssl_ca_file}
+ user: nova
+ group: nova
+ mode: 640