From 7df5981e1236727d088577c8514f5f226740dfa2 Mon Sep 17 00:00:00 2001
From: Jens Harbott <j.harbott@x-ion.de>
Date: Wed, 31 Jul 2019 14:39:56 +0000
Subject: [PATCH] Be explicit about fortnebula networks with nodepool

We don't want nodepool to use floating IPs in the fn cloud as it is an
ipv6 only cloud. We explicitly tell it there is no fip source and that
the tenant network routes ipv6 externally. This config is based on the
limestone configuration which is a similar cloud network wise.

Change-Id: I4a27a22a5beb9c5fc9d3e16cd2ca5b41aecbb46f
---
 .../templates/clouds/nodepool_builder_clouds.yaml.j2     | 9 ++++++++-
 playbooks/templates/clouds/nodepool_clouds.yaml.j2       | 9 ++++++++-
 2 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/playbooks/templates/clouds/nodepool_builder_clouds.yaml.j2 b/playbooks/templates/clouds/nodepool_builder_clouds.yaml.j2
index 54627b8523..f2e9fd4738 100644
--- a/playbooks/templates/clouds/nodepool_builder_clouds.yaml.j2
+++ b/playbooks/templates/clouds/nodepool_builder_clouds.yaml.j2
@@ -171,7 +171,13 @@ clouds:
     interface: public
   fortnebula:
     regions:
-      - regionOne
+      - name: regionOne
+        values:
+          networks:
+            - name: openstackzuul
+              routes_externally: false
+              routes_ipv6_externally: true
+              nat_destination: true
     api_timeout: 60
     auth:
       auth_url: https://openstack.fortnebula.com:13000/v3
@@ -181,4 +187,5 @@ clouds:
       project_domain_name: Default
       user_domain_name: Default
     identity_api_version: 3
+    floating_ip_source: None
     image_format: 'qcow2'
diff --git a/playbooks/templates/clouds/nodepool_clouds.yaml.j2 b/playbooks/templates/clouds/nodepool_clouds.yaml.j2
index f553d1f922..1150ed12e7 100644
--- a/playbooks/templates/clouds/nodepool_clouds.yaml.j2
+++ b/playbooks/templates/clouds/nodepool_clouds.yaml.j2
@@ -148,7 +148,13 @@ clouds:
     interface: public
   fortnebula:
     regions:
-      - regionOne
+      - name: regionOne
+        values:
+          networks:
+            - name: openstackzuul
+              routes_externally: false
+              routes_ipv6_externally: true
+              nat_destination: true
     api_timeout: 60
     auth:
       auth_url: https://openstack.fortnebula.com:13000/v3
@@ -158,4 +164,5 @@ clouds:
       project_domain_name: Default
       user_domain_name: Default
     identity_api_version: 3
+    floating_ip_source: None
     image_format: 'qcow2'