diff options
| author |   Jenkins <jenkins@review.openstack.org> | 2016-05-24 10:34:32 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <review@openstack.org> | 2016-05-24 10:34:32 +0000 |
| commit | d1e548cbfaa24bdaf4659b864bd61b5f6f769908 (patch) | |
| tree | f838d9159fb68d7571f8b0e4ac3a6c24eafc510e /puppet/compute.yaml | |
| parent | 6a962c59e902d626b11a9fea3825d0faaf2b3007 (diff) | |
| parent | 947f47ce9038b634f52491de63d6747808c06b9e (diff) | |
Merge "Dump IPs configuration as hieradata"
Diffstat (limited to 'puppet/compute.yaml')
| -rw-r--r-- | puppet/compute.yaml | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/puppet/compute.yaml b/puppet/compute.yaml index 4c18067a..e56deefd 100644 --- a/puppet/compute.yaml +++ b/puppet/compute.yaml @@ -430,16 +430,22 @@ resources: properties: ControlPlaneIp: {get_attr: [NovaCompute, networks, ctlplane, 0]} ExternalIp: {get_attr: [ExternalPort, ip_address]} + ExternalIpSubnet: {get_attr: [ExternalPort, ip_subnet]} ExternalIpUri: {get_attr: [ExternalPort, ip_address_uri]} InternalApiIp: {get_attr: [InternalApiPort, ip_address]} + InternalApiIpSubnet: {get_attr: [InternalApiPort, ip_subnet]} InternalApiIpUri: {get_attr: [InternalApiPort, ip_address_uri]} StorageIp: {get_attr: [StoragePort, ip_address]} + StorageIpSubnet: {get_attr: [StoragePort, ip_subnet]} StorageIpUri: {get_attr: [StoragePort, ip_address_uri]} StorageMgmtIp: {get_attr: [StorageMgmtPort, ip_address]} + StorageMgmtIpSubnet: {get_attr: [StorageMgmtPort, ip_subnet]} StorageMgmtIpUri: {get_attr: [StorageMgmtPort, ip_address_uri]} TenantIp: {get_attr: [TenantPort, ip_address]} + TenantIpSubnet: {get_attr: [TenantPort, ip_subnet]} TenantIpUri: {get_attr: [TenantPort, ip_address_uri]} ManagementIp: {get_attr: [ManagementPort, ip_address]} + ManagementIpSubnet: {get_attr: [ManagementPort, ip_subnet]} ManagementIpUri: {get_attr: [ManagementPort, ip_address_uri]} NetworkConfig: @@ -481,6 +487,7 @@ resources: - all_nodes # provided by allNodesConfig - '"%{::osfamily}"' - common + - network - neutron_bigswitch_data # Optionally provided by ComputeExtraConfigPre - cisco_n1kv_data # Optionally provided by ComputeExtraConfigPre - nova_nuage_data # Optionally provided by ComputeExtraConfigPre @@ -494,6 +501,11 @@ resources: mapped_data: {get_param: ExtraConfig} common: raw_data: {get_file: hieradata/common.yaml} + network: + mapped_data: + net_ip_map: {get_attr: [NetIpMap, net_ip_map]} + net_ip_subnet_map: {get_attr: [NetIpMap, net_ip_subnet_map]} + net_ip_uri_map: {get_attr: [NetIpMap, net_ip_uri_map]} ceph: raw_data: {get_file: hieradata/ceph.yaml} compute: |