aboutsummaryrefslogtreecommitdiffstats
path: root/mcp/reclass/classes/cluster/virtual-mcp-ocata-ovs-dpdk/openstack
diff options
context:
space:
mode:
Diffstat (limited to 'mcp/reclass/classes/cluster/virtual-mcp-ocata-ovs-dpdk/openstack')
-rw-r--r--mcp/reclass/classes/cluster/virtual-mcp-ocata-ovs-dpdk/openstack/compute.yml10
-rw-r--r--mcp/reclass/classes/cluster/virtual-mcp-ocata-ovs-dpdk/openstack/control.yml15
-rw-r--r--mcp/reclass/classes/cluster/virtual-mcp-ocata-ovs-dpdk/openstack/init.yml17
3 files changed, 32 insertions, 10 deletions
diff --git a/mcp/reclass/classes/cluster/virtual-mcp-ocata-ovs-dpdk/openstack/compute.yml b/mcp/reclass/classes/cluster/virtual-mcp-ocata-ovs-dpdk/openstack/compute.yml
index e4777fe0d..c23ca7f33 100644
--- a/mcp/reclass/classes/cluster/virtual-mcp-ocata-ovs-dpdk/openstack/compute.yml
+++ b/mcp/reclass/classes/cluster/virtual-mcp-ocata-ovs-dpdk/openstack/compute.yml
@@ -35,6 +35,16 @@ parameters:
host: ${_param:openstack_control_address}
backend:
tenant_network_types: ${_param:neutron_tenant_network_types}
+ cinder:
+ volume:
+ database:
+ host: ${_param:cluster_local_address}
+ identity:
+ host: ${_param:cluster_local_address}
+ glance:
+ host: ${_param:cluster_local_address}
+ message_queue:
+ host: ${_param:cluster_local_address}
linux:
network:
bridge: openvswitch
diff --git a/mcp/reclass/classes/cluster/virtual-mcp-ocata-ovs-dpdk/openstack/control.yml b/mcp/reclass/classes/cluster/virtual-mcp-ocata-ovs-dpdk/openstack/control.yml
index 0372906da..b85f085a1 100644
--- a/mcp/reclass/classes/cluster/virtual-mcp-ocata-ovs-dpdk/openstack/control.yml
+++ b/mcp/reclass/classes/cluster/virtual-mcp-ocata-ovs-dpdk/openstack/control.yml
@@ -27,6 +27,8 @@ classes:
- system.galera.server.database.keystone
- system.galera.server.database.nova
- system.horizon.server.single
+- service.haproxy.proxy.single
+- cluster.virtual-mcp-ocata-common.haproxy_openstack_api
- cluster.virtual-mcp-ocata-ovs-dpdk
parameters:
_param:
@@ -44,6 +46,12 @@ parameters:
proto: static
address: ${_param:single_address}
netmask: 255.255.255.0
+ ens6:
+ enabled: true
+ type: eth
+ proto: static
+ address: ${_param:cluster_public_host}
+ netmask: 255.255.255.0
keystone:
server:
admin_email: ${_param:admin_email}
@@ -80,6 +88,13 @@ parameters:
server:
backend:
tenant_vlan_range: 1000:1999
+ heat:
+ server:
+ bind:
+ api_cfn:
+ address: ${_param:single_address}
+ api_cloudwatch:
+ address: ${_param:single_address}
mysql:
server:
version: '5.7'
diff --git a/mcp/reclass/classes/cluster/virtual-mcp-ocata-ovs-dpdk/openstack/init.yml b/mcp/reclass/classes/cluster/virtual-mcp-ocata-ovs-dpdk/openstack/init.yml
index 5f40a1d1e..f7980f78a 100644
--- a/mcp/reclass/classes/cluster/virtual-mcp-ocata-ovs-dpdk/openstack/init.yml
+++ b/mcp/reclass/classes/cluster/virtual-mcp-ocata-ovs-dpdk/openstack/init.yml
@@ -6,7 +6,7 @@ parameters:
openstack_region: RegionOne
admin_email: root@localhost
cluster_public_protocol: http
- cluster_public_host: 172.16.10.101
+ cluster_public_host: 10.16.0.101
neutron_public_protocol: http
neutron_control_dvr: False
neutron_tenant_network_types: "flat,vlan"
@@ -21,8 +21,6 @@ parameters:
galera_server_cluster_name: openstack_cluster
galera_server_maintenance_password: opnfv_secret
galera_server_admin_password: opnfv_secret
- cluster_vip_address: 172.16.10.254
- cluster_local_address: ${_param:single_address}
compute_hugepages_size: 2M
compute_hugepages_count: 1024
compute_hugepages_mount: /mnt/hugepages_2M
@@ -44,24 +42,23 @@ parameters:
rabbitmq_openstack_password: opnfv_secret
rabbitmq_cold_password: opnfv_secret
glance_version: ${_param:openstack_version}
- glance_service_host: ${_param:cluster_vip_address}
+ glance_service_host: ${_param:cluster_local_address}
keystone_version: ${_param:openstack_version}
- keystone_service_host: ${_param:cluster_vip_address}
+ keystone_service_host: ${_param:cluster_local_address}
heat_version: ${_param:openstack_version}
- heat_service_host: ${_param:cluster_vip_address}
+ heat_service_host: ${_param:cluster_local_address}
heat_domain_admin_password: opnfv_secret
ceilometer_version: ${_param:openstack_version}
ceilometer_service_host: 172.16.10.108
cinder_version: ${_param:openstack_version}
- cinder_service_host: ${_param:cluster_vip_address}
+ cinder_service_host: ${_param:cluster_local_address}
ceilometer_graphite_publisher_host: 172.16.10.107
ceilometer_graphite_publisher_port: 2013
nova_version: ${_param:openstack_version}
- nova_service_host: ${_param:cluster_vip_address}
+ nova_service_host: ${_param:cluster_local_address}
nova_vncproxy_url: http://${_param:cluster_vip_address}:8060
neutron_version: ${_param:openstack_version}
- neutron_service_host: ${_param:cluster_vip_address}
- glusterfs_service_host: ${_param:cluster_vip_address}
+ neutron_service_host: ${_param:cluster_local_address}
metadata_password: password
mysql_admin_user: root
mysql_admin_password: opnfv_secret