From 094151224e3dd1f0d19acc184ffabdc9b597255e Mon Sep 17 00:00:00 2001 From: Michael Polenchuk Date: Tue, 11 Jul 2017 15:27:41 +0400 Subject: Set public endpoints to external interface In order to pass functest/api_check, configure public endpoints of openstack core services with external ip address. Change-Id: I519865df5700acbcf542ea71efd87780e9f1d9d5 Signed-off-by: Michael Polenchuk --- .../cluster/virtual-mcp-ocata-odl/openstack/compute.yml | 10 ++++++++++ .../cluster/virtual-mcp-ocata-odl/openstack/control.yml | 15 +++++++++++++++ .../cluster/virtual-mcp-ocata-odl/openstack/init.yml | 15 +++++++-------- 3 files changed, 32 insertions(+), 8 deletions(-) (limited to 'mcp/reclass/classes/cluster/virtual-mcp-ocata-odl/openstack') diff --git a/mcp/reclass/classes/cluster/virtual-mcp-ocata-odl/openstack/compute.yml b/mcp/reclass/classes/cluster/virtual-mcp-ocata-odl/openstack/compute.yml index 79a243d04..97eda6c51 100644 --- a/mcp/reclass/classes/cluster/virtual-mcp-ocata-odl/openstack/compute.yml +++ b/mcp/reclass/classes/cluster/virtual-mcp-ocata-odl/openstack/compute.yml @@ -31,6 +31,16 @@ parameters: host: ${_param:openstack_control_address} metadata: host: ${_param:openstack_control_address} + 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} opendaylight: client: ovsdb_server_iface: ptcp:6639:127.0.0.1 diff --git a/mcp/reclass/classes/cluster/virtual-mcp-ocata-odl/openstack/control.yml b/mcp/reclass/classes/cluster/virtual-mcp-ocata-odl/openstack/control.yml index d8ab80d9e..17c22c59e 100644 --- a/mcp/reclass/classes/cluster/virtual-mcp-ocata-odl/openstack/control.yml +++ b/mcp/reclass/classes/cluster/virtual-mcp-ocata-odl/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-odl 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} @@ -76,6 +84,13 @@ parameters: novncproxy_port: 6080 vncproxy_url: http://${_param:cluster_vip_address}:6080 workers: 1 + 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-odl/openstack/init.yml b/mcp/reclass/classes/cluster/virtual-mcp-ocata-odl/openstack/init.yml index 87d474ceb..cddecd375 100644 --- a/mcp/reclass/classes/cluster/virtual-mcp-ocata-odl/openstack/init.yml +++ b/mcp/reclass/classes/cluster/virtual-mcp-ocata-odl/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,vxlan" @@ -34,25 +34,24 @@ 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 ceilometer_database_host: ${_param:cluster_local_address} 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 -- cgit 1.2.3-korg