diff options
| author |   Jenkins <jenkins@review.openstack.org> | 2015-12-18 10:22:39 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <review@openstack.org> | 2015-12-18 10:22:39 +0000 |
| commit | 8e1fd53efb481a4073dc707601dd3ed9463a1854 (patch) | |
| tree | 51955b289ddaed05aa25f572d460b0aa02f206fc /puppet | |
| parent | 0284f863a95d4cd27b19de048141cd7ec07c161b (diff) | |
| parent | 22b4acf454d74302f1cca03f7fe22f63619b1f70 (diff) | |
Merge "Allow for usage of pre-allocated IPs for the controller nodes"
Diffstat (limited to 'puppet')
| -rw-r--r-- | puppet/controller.yaml | 19 |
1 files changed, 19 insertions, 0 deletions
diff --git a/puppet/controller.yaml b/puppet/controller.yaml index 7089f60b..20379292 100644 --- a/puppet/controller.yaml +++ b/puppet/controller.yaml @@ -98,6 +98,15 @@ parameters: description: | Controller specific hiera configuration data to inject into the cluster. type: json + ControllerIPs: + default: {} + description: > + A network mapped list of IPs to assign to Controllers in the following form: + { + "internal_api": ["a.b.c.d", "e.f.g.h"], + ... + } + type: json ControlVirtualInterface: default: 'br-ex' description: Interface where virtual ip will be assigned. @@ -719,26 +728,36 @@ resources: ExternalPort: type: OS::TripleO::Controller::Ports::ExternalPort properties: + IPPool: {get_param: ControllerIPs} + NodeIndex: {get_param: NodeIndex} ControlPlaneIP: {get_attr: [Controller, networks, ctlplane, 0]} InternalApiPort: type: OS::TripleO::Controller::Ports::InternalApiPort properties: + IPPool: {get_param: ControllerIPs} + NodeIndex: {get_param: NodeIndex} ControlPlaneIP: {get_attr: [Controller, networks, ctlplane, 0]} StoragePort: type: OS::TripleO::Controller::Ports::StoragePort properties: + IPPool: {get_param: ControllerIPs} + NodeIndex: {get_param: NodeIndex} ControlPlaneIP: {get_attr: [Controller, networks, ctlplane, 0]} StorageMgmtPort: type: OS::TripleO::Controller::Ports::StorageMgmtPort properties: + IPPool: {get_param: ControllerIPs} + NodeIndex: {get_param: NodeIndex} ControlPlaneIP: {get_attr: [Controller, networks, ctlplane, 0]} TenantPort: type: OS::TripleO::Controller::Ports::TenantPort properties: + IPPool: {get_param: ControllerIPs} + NodeIndex: {get_param: NodeIndex} ControlPlaneIP: {get_attr: [Controller, networks, ctlplane, 0]} NetIpMap: |