Merge "Add upgrade openstack job mitaka -> newton"
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/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/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}