d451831248
The redis_vip should come from a Neutron Port as its cidr depends on the Neutron Network configuration. This change adds 2 new files and modifies 1 in the network/ports directory: - noop.yaml - Passes through the ctlplane Controller IP (modified) - ctlplane_vip.yaml - Creates a new VIP on the control plane - vip.yaml - Creates a VIP on the named network (for isolated nets) Also, changes to overcloud-without-mergepy.yaml create the Redis Virtual IP. The standard resource registry was modified to use noop.yaml for the new Redis VIP. The Puppet resource registry was modified to use ctlplane_vip.yaml by default, but can be made to use vip.yaml when network isolation is used by using an environment file. vip.yaml will place the VIP according to the ServiceNetMap, which can also be overridden. We use this new VIP port definition to assign a VIP to Redis, but follow-up patches will assign VIPs to the rest of the services in a similar fashion. Co-Authored-By: Dan Sneddon <dsneddon@redhat.com> Change-Id: I2cb44ea7a057c4064d0e1999702623618ee3390c
76 lines
3.9 KiB
YAML
76 lines
3.9 KiB
YAML
resource_registry:
|
|
OS::TripleO::BlockStorage: puppet/cinder-storage-puppet.yaml
|
|
OS::TripleO::BlockStorage::Net::SoftwareConfig: net-config-noop.yaml
|
|
OS::TripleO::Compute: puppet/compute-puppet.yaml
|
|
OS::TripleO::Compute::Net::SoftwareConfig: net-config-bridge.yaml
|
|
OS::TripleO::SoftwareDeployment: OS::Heat::StructuredDeployment
|
|
OS::TripleO::Controller: puppet/controller-puppet.yaml
|
|
OS::TripleO::Controller::Net::SoftwareConfig: net-config-bridge.yaml
|
|
OS::TripleO::ObjectStorage: puppet/swift-storage-puppet.yaml
|
|
OS::TripleO::ObjectStorage::Net::SoftwareConfig: net-config-noop.yaml
|
|
OS::TripleO::CephStorage: puppet/ceph-storage-puppet.yaml
|
|
OS::TripleO::CephStorage::Net::SoftwareConfig: net-config-noop.yaml
|
|
OS::TripleO::ControllerPostDeployment: puppet/controller-post-puppet.yaml
|
|
# set to controller-config-pacemaker.yaml to enable pacemaker
|
|
OS::TripleO::ControllerConfig: puppet/controller-config.yaml
|
|
OS::TripleO::ComputePostDeployment: puppet/compute-post-puppet.yaml
|
|
OS::TripleO::ObjectStoragePostDeployment: puppet/swift-storage-post.yaml
|
|
OS::TripleO::BlockStoragePostDeployment: puppet/cinder-storage-post.yaml
|
|
OS::TripleO::CephStoragePostDeployment: puppet/ceph-storage-post-puppet.yaml
|
|
OS::TripleO::SwiftDevicesAndProxy::SoftwareConfig: puppet/swift-devices-and-proxy-config.yaml
|
|
OS::TripleO::CephClusterConfig::SoftwareConfig: puppet/ceph-cluster-config.yaml
|
|
OS::TripleO::AllNodes::SoftwareConfig: puppet/all-nodes-config.yaml
|
|
OS::TripleO::BootstrapNode::SoftwareConfig: puppet/bootstrap-config.yaml
|
|
OS::TripleO::NodeUserData: firstboot/userdata_default.yaml
|
|
OS::TripleO::NodeExtraConfigPost: extraconfig/post_deploy/default.yaml
|
|
OS::TripleO::Tasks::PackageUpdate: extraconfig/tasks/yum_update.yaml
|
|
|
|
# TripleO overcloud networks
|
|
OS::TripleO::Network: network/networks.yaml
|
|
OS::TripleO::VipConfig: puppet/vip-config.yaml
|
|
|
|
|
|
OS::TripleO::Network::External: network/noop.yaml
|
|
OS::TripleO::Network::InternalApi: network/noop.yaml
|
|
OS::TripleO::Network::StorageMgmt: network/noop.yaml
|
|
OS::TripleO::Network::Storage: network/noop.yaml
|
|
OS::TripleO::Network::Tenant: network/noop.yaml
|
|
|
|
OS::TripleO::Network::Ports::NetIpMap: network/ports/net_ip_map.yaml
|
|
OS::TripleO::Network::Ports::NetIpListMap: network/ports/net_ip_list_map.yaml
|
|
|
|
# Port assignments for the controller role
|
|
OS::TripleO::Controller::Ports::ExternalPort: network/ports/noop.yaml
|
|
OS::TripleO::Controller::Ports::InternalApiPort: network/ports/noop.yaml
|
|
OS::TripleO::Controller::Ports::StoragePort: network/ports/noop.yaml
|
|
OS::TripleO::Controller::Ports::StorageMgmtPort: network/ports/noop.yaml
|
|
OS::TripleO::Controller::Ports::TenantPort: network/ports/noop.yaml
|
|
|
|
# Port assignments for the compute role
|
|
OS::TripleO::Compute::Ports::InternalApiPort: network/ports/noop.yaml
|
|
OS::TripleO::Compute::Ports::StoragePort: network/ports/noop.yaml
|
|
OS::TripleO::Compute::Ports::TenantPort: network/ports/noop.yaml
|
|
|
|
# Port assignments for the ceph storage role
|
|
OS::TripleO::CephStorage::Ports::StoragePort: network/ports/noop.yaml
|
|
OS::TripleO::CephStorage::Ports::StorageMgmtPort: network/ports/noop.yaml
|
|
|
|
# Port assignments for the swift storage role
|
|
OS::TripleO::SwiftStorage::Ports::InternalApiPort: network/ports/noop.yaml
|
|
OS::TripleO::SwiftStorage::Ports::StoragePort: network/ports/noop.yaml
|
|
OS::TripleO::SwiftStorage::Ports::StorageMgmtPort: network/ports/noop.yaml
|
|
|
|
# Port assignments for the block storage role
|
|
OS::TripleO::BlockStorage::Ports::InternalApiPort: network/ports/noop.yaml
|
|
OS::TripleO::BlockStorage::Ports::StoragePort: network/ports/noop.yaml
|
|
OS::TripleO::BlockStorage::Ports::StorageMgmtPort: network/ports/noop.yaml
|
|
|
|
# Cinder backend config for the controller role
|
|
OS::TripleO::Controller::CinderBackend: extraconfig/controller/noop.yaml
|
|
|
|
# Port assignments for service virtual IPs for the controller role
|
|
OS::TripleO::Controller::Ports::RedisVipPort: network/ports/ctlplane_vip.yaml
|
|
|
|
parameter_defaults:
|
|
EnablePackageInstall: false
|