From 3b4b19f16ceab57267b916f4cdb7ba17dbbdb927 Mon Sep 17 00:00:00 2001
From: Dan Prince <dprince@redhat.com>
Date: Thu, 4 Sep 2014 13:52:45 -0400
Subject: [PATCH] Update RH1 to use net-label instead of net-id
Nodepool now supports net-labels so lets start by using
them on the RH1 TripleO cloud. The existing nodepool
implementation rely's on novaclient (i.e. a nova extension)
which is deployed via TripleO and should work fine.
Future work may include the use of neutronclient which
may enable us to use this approach for other (public)
clouds.
The motivation here is to make nodepool.yaml a bit more
readable with regards to the net-id's.
Change-Id: Icc1c44803928a13790805837dedb3c0fb15e9cbe
---
.../openstack_project/templates/nodepool/nodepool.yaml.erb | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/modules/openstack_project/templates/nodepool/nodepool.yaml.erb b/modules/openstack_project/templates/nodepool/nodepool.yaml.erb
index b036874ad6..ce2eae3781 100644
--- a/modules/openstack_project/templates/nodepool/nodepool.yaml.erb
+++ b/modules/openstack_project/templates/nodepool/nodepool.yaml.erb
@@ -988,8 +988,8 @@ providers:
max-servers: 60
rate: 0.001
networks:
- - net-id: 505a106c-7d65-44a7-b3e7-99bb49d2ebab
- - net-id: deedbc59-a076-4d9c-94a8-21fc5a7b8e0b
+ - net-label: default-net
+ - net-label: tripleo-bm-test
images:
- name: tripleo-precise
base-image: 'Ubuntu Precise 12.04 LTS Server 64-bit'