diff options
| author |   Jenkins <jenkins@review.openstack.org> | 2015-09-21 19:24:28 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <review@openstack.org> | 2015-09-21 19:24:28 +0000 |
| commit | bb03764bca90278e4e0b1cb0b07da6d0a458990d (patch) | |
| tree | 5f716374bf309a1b0b3aeb81e9e55e4d0dce4d89 /puppet | |
| parent | 210ade81937dacd3eda9478d2806057ef7b1fead (diff) | |
| parent | bccb6989845893299a5e487c4f15b0c8066fddb0 (diff) | |
Merge "Configure ctlplane network with a static IP"
Diffstat (limited to 'puppet')
| -rw-r--r-- | puppet/ceph-storage-puppet.yaml | 1 | ||||
| -rw-r--r-- | puppet/cinder-storage-puppet.yaml | 1 | ||||
| -rw-r--r-- | puppet/compute-puppet.yaml | 1 | ||||
| -rw-r--r-- | puppet/controller-puppet.yaml | 1 | ||||
| -rw-r--r-- | puppet/swift-storage-puppet.yaml | 1 |
5 files changed, 5 insertions, 0 deletions
diff --git a/puppet/ceph-storage-puppet.yaml b/puppet/ceph-storage-puppet.yaml index f08b83cd..4b4c76fc 100644 --- a/puppet/ceph-storage-puppet.yaml +++ b/puppet/ceph-storage-puppet.yaml @@ -102,6 +102,7 @@ resources: NetworkConfig: type: OS::TripleO::CephStorage::Net::SoftwareConfig properties: + ControlPlaneIp: {get_attr: [CephStorage, networks, ctlplane, 0]} StorageIpSubnet: {get_attr: [StoragePort, ip_subnet]} StorageMgmtIpSubnet: {get_attr: [StorageMgmtPort, ip_subnet]} diff --git a/puppet/cinder-storage-puppet.yaml b/puppet/cinder-storage-puppet.yaml index d764c6f7..f597512a 100644 --- a/puppet/cinder-storage-puppet.yaml +++ b/puppet/cinder-storage-puppet.yaml @@ -161,6 +161,7 @@ resources: NetworkConfig: type: OS::TripleO::BlockStorage::Net::SoftwareConfig properties: + ControlPlaneIp: {get_attr: [BlockStorage, networks, ctlplane, 0]} InternalApiIpSubnet: {get_attr: [InternalApiPort, ip_subnet]} StorageIpSubnet: {get_attr: [StoragePort, ip_subnet]} StorageMgmtIpSubnet: {get_attr: [StorageMgmtPort, ip_subnet]} diff --git a/puppet/compute-puppet.yaml b/puppet/compute-puppet.yaml index 74e9b63e..3f730994 100644 --- a/puppet/compute-puppet.yaml +++ b/puppet/compute-puppet.yaml @@ -312,6 +312,7 @@ resources: NetworkConfig: type: OS::TripleO::Compute::Net::SoftwareConfig properties: + ControlPlaneIp: {get_attr: [NovaCompute, networks, ctlplane, 0]} InternalApiIpSubnet: {get_attr: [InternalApiPort, ip_subnet]} StorageIpSubnet: {get_attr: [StoragePort, ip_subnet]} TenantIpSubnet: {get_attr: [TenantPort, ip_subnet]} diff --git a/puppet/controller-puppet.yaml b/puppet/controller-puppet.yaml index eb19b36d..084fe3d1 100644 --- a/puppet/controller-puppet.yaml +++ b/puppet/controller-puppet.yaml @@ -602,6 +602,7 @@ resources: NetworkConfig: type: OS::TripleO::Controller::Net::SoftwareConfig properties: + ControlPlaneIp: {get_attr: [Controller, networks, ctlplane, 0]} ExternalIpSubnet: {get_attr: [ExternalPort, ip_subnet]} InternalApiIpSubnet: {get_attr: [InternalApiPort, ip_subnet]} StorageIpSubnet: {get_attr: [StoragePort, ip_subnet]} diff --git a/puppet/swift-storage-puppet.yaml b/puppet/swift-storage-puppet.yaml index 5c4ff5a1..67617771 100644 --- a/puppet/swift-storage-puppet.yaml +++ b/puppet/swift-storage-puppet.yaml @@ -130,6 +130,7 @@ resources: NetworkConfig: type: OS::TripleO::ObjectStorage::Net::SoftwareConfig properties: + ControlPlaneIp: {get_attr: [SwiftStorage, networks, ctlplane, 0]} InternalApiIpSubnet: {get_attr: [InternalApiPort, ip_subnet]} StorageIpSubnet: {get_attr: [StoragePort, ip_subnet]} StorageMgmtIpSubnet: {get_attr: [StorageMgmtPort, ip_subnet]} |