diff options
| author |   Jenkins <jenkins@review.openstack.org> | 2017-01-03 10:31:44 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <review@openstack.org> | 2017-01-03 10:31:44 +0000 |
| commit | 6b8c34b27a324120f6945f7873f479d37ba2e516 (patch) | |
| tree | d4dea5dfda9cdffb7aa8bd54b17249bb74e74c24 /network/config/multiple-nics | |
| parent | 52fa7c6f511218e961e6cc02073898e6ac5ae706 (diff) | |
| parent | 3c6ec654b45fa1490cd452404ada735397852e38 (diff) | |
Merge "Bump template version for all templates to "ocata""
Diffstat (limited to 'network/config/multiple-nics')
| -rw-r--r-- | network/config/multiple-nics/ceph-storage.yaml | 2 | ||||
| -rw-r--r-- | network/config/multiple-nics/cinder-storage.yaml | 2 | ||||
| -rw-r--r-- | network/config/multiple-nics/compute-dvr.yaml | 2 | ||||
| -rw-r--r-- | network/config/multiple-nics/compute.yaml | 2 | ||||
| -rw-r--r-- | network/config/multiple-nics/controller-v6.yaml | 2 | ||||
| -rw-r--r-- | network/config/multiple-nics/controller.yaml | 2 | ||||
| -rw-r--r-- | network/config/multiple-nics/swift-storage.yaml | 2 |
7 files changed, 7 insertions, 7 deletions
diff --git a/network/config/multiple-nics/ceph-storage.yaml b/network/config/multiple-nics/ceph-storage.yaml index e9c34213..6a788063 100644 --- a/network/config/multiple-nics/ceph-storage.yaml +++ b/network/config/multiple-nics/ceph-storage.yaml @@ -1,4 +1,4 @@ -heat_template_version: '2016-10-14' +heat_template_version: ocata description: > Software Config to drive os-net-config to configure multiple interfaces for the ceph storage role. parameters: diff --git a/network/config/multiple-nics/cinder-storage.yaml b/network/config/multiple-nics/cinder-storage.yaml index f58f1168..d2384445 100644 --- a/network/config/multiple-nics/cinder-storage.yaml +++ b/network/config/multiple-nics/cinder-storage.yaml @@ -1,4 +1,4 @@ -heat_template_version: '2016-10-14' +heat_template_version: ocata description: > Software Config to drive os-net-config to configure multiple interfaces for the cinder storage role. parameters: diff --git a/network/config/multiple-nics/compute-dvr.yaml b/network/config/multiple-nics/compute-dvr.yaml index db9b4919..abfd323f 100644 --- a/network/config/multiple-nics/compute-dvr.yaml +++ b/network/config/multiple-nics/compute-dvr.yaml @@ -1,4 +1,4 @@ -heat_template_version: '2016-10-14' +heat_template_version: ocata description: > Software Config to drive os-net-config to configure multiple interfaces for the compute role with external bridge for DVR. diff --git a/network/config/multiple-nics/compute.yaml b/network/config/multiple-nics/compute.yaml index 9b0c8c02..101a08d3 100644 --- a/network/config/multiple-nics/compute.yaml +++ b/network/config/multiple-nics/compute.yaml @@ -1,4 +1,4 @@ -heat_template_version: '2016-10-14' +heat_template_version: ocata description: > Software Config to drive os-net-config to configure multiple interfaces for the compute role. parameters: diff --git a/network/config/multiple-nics/controller-v6.yaml b/network/config/multiple-nics/controller-v6.yaml index a0ed9f78..4fae435a 100644 --- a/network/config/multiple-nics/controller-v6.yaml +++ b/network/config/multiple-nics/controller-v6.yaml @@ -1,4 +1,4 @@ -heat_template_version: '2016-10-14' +heat_template_version: ocata description: > Software Config to drive os-net-config to configure multiple interfaces for the controller role with IPv6 on the External network. The IPv6 default route is on the External network, and the IPv4 default route is on the Control Plane. diff --git a/network/config/multiple-nics/controller.yaml b/network/config/multiple-nics/controller.yaml index e38c545c..ba9f8fd4 100644 --- a/network/config/multiple-nics/controller.yaml +++ b/network/config/multiple-nics/controller.yaml @@ -1,4 +1,4 @@ -heat_template_version: '2016-10-14' +heat_template_version: ocata description: > Software Config to drive os-net-config to configure multiple interfaces for the controller role. parameters: diff --git a/network/config/multiple-nics/swift-storage.yaml b/network/config/multiple-nics/swift-storage.yaml index 1ad503a7..4019012a 100644 --- a/network/config/multiple-nics/swift-storage.yaml +++ b/network/config/multiple-nics/swift-storage.yaml @@ -1,4 +1,4 @@ -heat_template_version: '2016-10-14' +heat_template_version: ocata description: > Software Config to drive os-net-config to configure multiple interfaces for the swift storage role. parameters: |