aboutsummaryrefslogtreecommitdiffstats
path: root/network
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2015-12-03 14:36:37 +0000
committerGerrit Code Review <review@openstack.org>2015-12-03 14:36:37 +0000
commit3bf96c7462b0c3cd6a8d6bc8d134c9d698f6dd6e (patch)
tree151e165765cb91fc8b06ce4d9989e795017ec8dc /network
parent16871a864da4d121580d20df1f658e9fbe04794f (diff)
parent9e9273a8e5211f8e9b701c291ad332d5375e2198 (diff)
Merge "Make all network ports type to consume FixedIPs"
Diffstat (limited to 'network')
-rw-r--r--network/ports/internal_api.yaml7
-rw-r--r--network/ports/storage.yaml7
-rw-r--r--network/ports/storage_mgmt.yaml7
-rw-r--r--network/ports/tenant.yaml7
4 files changed, 28 insertions, 0 deletions
diff --git a/network/ports/internal_api.yaml b/network/ports/internal_api.yaml
index b671aa5f..d528b327 100644
--- a/network/ports/internal_api.yaml
+++ b/network/ports/internal_api.yaml
@@ -16,6 +16,12 @@ parameters:
description: IP address on the control plane
default: ''
type: string
+ FixedIPs:
+ description: >
+ Control the IP allocation for the VIP port. E.g.
+ [{'ip_address':'1.2.3.4'}]
+ default: []
+ type: json
resources:
@@ -24,6 +30,7 @@ resources:
properties:
network: {get_param: InternalApiNetName}
name: {get_param: PortName}
+ fixed_ips: {get_param: FixedIPs}
replacement_policy: AUTO
outputs:
diff --git a/network/ports/storage.yaml b/network/ports/storage.yaml
index e1ef8e03..88fb537c 100644
--- a/network/ports/storage.yaml
+++ b/network/ports/storage.yaml
@@ -16,6 +16,12 @@ parameters:
description: IP address on the control plane
default: ''
type: string
+ FixedIPs:
+ description: >
+ Control the IP allocation for the VIP port. E.g.
+ [{'ip_address':'1.2.3.4'}]
+ default: []
+ type: json
resources:
@@ -24,6 +30,7 @@ resources:
properties:
network: {get_param: StorageNetName}
name: {get_param: PortName}
+ fixed_ips: {get_param: FixedIPs}
replacement_policy: AUTO
outputs:
diff --git a/network/ports/storage_mgmt.yaml b/network/ports/storage_mgmt.yaml
index e5b5b884..c98a21ef 100644
--- a/network/ports/storage_mgmt.yaml
+++ b/network/ports/storage_mgmt.yaml
@@ -16,6 +16,12 @@ parameters:
description: IP address on the control plane
default: ''
type: string
+ FixedIPs:
+ description: >
+ Control the IP allocation for the VIP port. E.g.
+ [{'ip_address':'1.2.3.4'}]
+ default: []
+ type: json
resources:
@@ -24,6 +30,7 @@ resources:
properties:
network: {get_param: StorageMgmtNetName}
name: {get_param: PortName}
+ fixed_ips: {get_param: FixedIPs}
replacement_policy: AUTO
outputs:
diff --git a/network/ports/tenant.yaml b/network/ports/tenant.yaml
index 9a351a24..94408ca2 100644
--- a/network/ports/tenant.yaml
+++ b/network/ports/tenant.yaml
@@ -16,6 +16,12 @@ parameters:
description: IP address on the control plane
default: ''
type: string
+ FixedIPs:
+ description: >
+ Control the IP allocation for the VIP port. E.g.
+ [{'ip_address':'1.2.3.4'}]
+ default: []
+ type: json
resources:
@@ -24,6 +30,7 @@ resources:
properties:
network: {get_param: TenantNetName}
name: {get_param: PortName}
+ fixed_ips: {get_param: FixedIPs}
replacement_policy: AUTO
outputs: