From a3c0456cc14a75e96808505e670d0cab37b30abc Mon Sep 17 00:00:00 2001
From: agardner <agardner@linuxfoundation.org>
Date: Wed, 28 Mar 2018 16:06:23 -0400
Subject: JOID PDF-IDF support for intel-pod18

More info in gerrit comments.

Remove joid from all other idfs other than intel/pod18
add installer: ['apex', 'compass4nfv', 'daisy', 'fuel'] where missing

Change-Id: I2afc415599070e210736c5fc304f7cb150f05029
Signed-off-by: agardner <agardner@linuxfoundation.org>
---
 config/installers/joid/pod_config.yaml.j2 | 250 +++++++++++++++---------------
 1 file changed, 124 insertions(+), 126 deletions(-)

(limited to 'config')

diff --git a/config/installers/joid/pod_config.yaml.j2 b/config/installers/joid/pod_config.yaml.j2
index b77fa864..26f775df 100644
--- a/config/installers/joid/pod_config.yaml.j2
+++ b/config/installers/joid/pod_config.yaml.j2
@@ -5,170 +5,168 @@
 # which accompanies this distribution, and is available at
 # http://www.apache.org/licenses/LICENSE-2.0
 ##############################################################################
+{%- set net_config = conf.idf.net_config %}
 ---
 lab:
   location: intel
   racks:
-    - rack: pod5
+    - rack: pod18
       nodes:
-    - name: {{ conf['nodes'][0]['name'] }}
-      architecture: {{ conf['nodes'][0]['node']['arch'] }}
+    - name: {{ conf.nodes[0].name }}
+      architecture: {{ conf.nodes[0].node.arch }}
       roles: [network, control]
       nics:
-        - ifname: {{ conf['nodes'][0]['interfaces'][0]['name'] }}
+        - ifname: {{ conf.nodes[0].interfaces[1].name }}{% if conf.nodes[0].interfaces[1].vlan | int > 0 %}.{{conf.nodes[0].interfaces[1].vlan}}{% endif %}
+          spaces: [admin]
+          mac: ["{{ conf.nodes[0].interfaces[1].mac_address }}"]
+        - ifname: {{ conf.nodes[0].interfaces[2].name }}{% if conf.nodes[0].interfaces[2].vlan | int > 0 %}.{{conf.nodes[0].interfaces[2].vlan}}{% endif %}
           spaces: [data]
-          mac: ["{{ conf['nodes'][0]['interfaces'][0]['mac_address'] }}"]
-        - ifname: {{ conf['nodes'][0]['interfaces'][0]['name'] }}.{{ conf['nodes'][0]['interfaces'][0]['vlan'] }}
+          mac: ["{{ conf.nodes[0].interfaces[2].mac_address }}"]
+        - ifname: {{ conf.nodes[0].interfaces[0].name }}{% if conf.nodes[0].interfaces[0].vlan | int > 0 %}.{{conf.nodes[0].interfaces[0].vlan}}{% endif %}
           spaces: [floating]
-          mac: ["{{ conf['nodes'][0]['interfaces'][0]['mac_address'] }}"]
-        - ifname: {{ conf['nodes'][0]['interfaces'][1]['name'] }}.{{ conf['nodes'][0]['interfaces'][1]['vlan'] }}
+          mac: ["{{ conf.nodes[0].interfaces[0].mac_address }}"]
+        - ifname: {{ conf.nodes[0].interfaces[3].name }}{% if conf.nodes[0].interfaces[3].vlan | int > 0 %}.{{conf.nodes[0].interfaces[3].vlan}}{% endif %}
           spaces: [public]
-          mac: ["{{ conf['nodes'][0]['interfaces'][1]['mac_address'] }}"]
-        - ifname: {{ conf['nodes'][0]['interfaces'][1]['name'] }}
+          mac: ["{{ conf.nodes[0].interfaces[3].mac_address }}"]
+        - ifname: {{ conf.nodes[0].interfaces[3].name }}
           spaces: [storage]
-          mac: ["{{ conf['nodes'][0]['interfaces'][1]['mac_address'] }}"]
-        - ifname: {{ conf['nodes'][0]['interfaces'][2]['name'] }}
-          spaces: [admin]
-          mac: ["{{ conf['nodes'][0]['interfaces'][2]['mac_address'] }}"]
+          mac: ["{{ conf.nodes[0].interfaces[3].mac_address }}"]
       power:
-        type: {{ conf['nodes'][0]['remote_management']['type'] }}
-        address: {{ conf['nodes'][0]['remote_management']['address'] }}
-        user: {{ conf['nodes'][0]['remote_management']['user'] }}
-        pass: {{ conf['nodes'][0]['remote_management']['pass'] }}
-    - name: {{ conf['nodes'][1]['name'] }}
-      architecture: {{ conf['nodes'][1]['node']['arch'] }}
+        type: {{ conf.nodes[0].remote_management.type }}
+        address: {{ conf.nodes[0].remote_management.address }}
+        user: {{ conf.nodes[0].remote_management.user }}
+        pass: {{ conf.nodes[0].remote_management.pass }}
+    - name: {{ conf.nodes[1].name }}
+      architecture: {{ conf.nodes[1].node.arch }}
       roles: [compute, control, storage]
       nics:
-        - ifname: {{ conf['nodes'][1]['interfaces'][0]['name'] }}
+        - ifname: {{ conf.nodes[1].interfaces[1].name }}{% if conf.nodes[1].interfaces[1].vlan | int > 0 %}.{{conf.nodes[1].interfaces[1].vlan}}{% endif %}
+          spaces: [admin]
+          mac: ["{{ conf.nodes[1].interfaces[1].mac_address }}"]
+        - ifname: {{ conf.nodes[1].interfaces[2].name }}{% if conf.nodes[1].interfaces[2].vlan | int > 0 %}.{{conf.nodes[1].interfaces[2].vlan}}{% endif %}
           spaces: [data]
-          mac: ["{{ conf['nodes'][1]['interfaces'][0]['mac_address'] }}"]
-        - ifname: {{ conf['nodes'][1]['interfaces'][0]['name'] }}.{{ conf['nodes'][1]['interfaces'][0]['vlan'] }}
+          mac: ["{{ conf.nodes[1].interfaces[2].mac_address }}"]
+        - ifname: {{ conf.nodes[1].interfaces[0].name }}{% if conf.nodes[1].interfaces[0].vlan | int > 0 %}.{{conf.nodes[1].interfaces[0].vlan}}{% endif %}
           spaces: [floating]
-          mac: ["{{ conf['nodes'][1]['interfaces'][0]['mac_address'] }}"]
-        - ifname: {{ conf['nodes'][1]['interfaces'][1]['name'] }}.{{ conf['nodes'][1]['interfaces'][1]['vlan'] }}
+          mac: ["{{ conf.nodes[1].interfaces[0].mac_address }}"]
+        - ifname: {{ conf.nodes[1].interfaces[3].name }}{% if conf.nodes[1].interfaces[3].vlan | int > 0 %}.{{conf.nodes[1].interfaces[3].vlan}}{% endif %}
           spaces: [public]
-          mac: ["{{ conf['nodes'][1]['interfaces'][1]['mac_address'] }}"]
-        - ifname: {{ conf['nodes'][1]['interfaces'][1]['name'] }}
+          mac: ["{{ conf.nodes[1].interfaces[3].mac_address }}"]
+        - ifname: {{ conf.nodes[1].interfaces[3].name }}
           spaces: [storage]
-          mac: ["{{ conf['nodes'][1]['interfaces'][1]['mac_address'] }}"]
-        - ifname: {{ conf['nodes'][1]['interfaces'][2]['name'] }}
-          spaces: [admin]
-          mac: ["{{ conf['nodes'][1]['interfaces'][2]['mac_address'] }}"]
+          mac: ["{{ conf.nodes[1].interfaces[3].mac_address }}"]
       power:
-        type: {{ conf['nodes'][1]['remote_management']['type'] }}
-        address: {{ conf['nodes'][1]['remote_management']['address'] }}
-        user: {{ conf['nodes'][1]['remote_management']['user'] }}
-        pass: {{ conf['nodes'][1]['remote_management']['pass'] }}
-    - name: {{ conf['nodes'][2]['name'] }}
-      architecture: {{ conf['nodes'][2]['node']['arch'] }}
+        type: {{ conf.nodes[1].remote_management.type }}
+        address: {{ conf.nodes[1].remote_management.address }}
+        user: {{ conf.nodes[1].remote_management.user }}
+        pass: {{ conf.nodes[1].remote_management.pass }}
+    - name: {{ conf.nodes[2].name }}
+      architecture: {{ conf.nodes[2].node.arch }}
       roles: [compute, control, storage]
       nics:
-        - ifname: {{ conf['nodes'][2]['interfaces'][0]['name'] }}
-          spaces: [data]
-          mac: ["{{ conf['nodes'][2]['interfaces'][0]['mac_address'] }}"]
-        - ifname: {{ conf['nodes'][2]['interfaces'][0]['name'] }}.{{ conf['nodes'][2]['interfaces'][0]['vlan'] }}
+        - ifname: {{ conf.nodes[2].interfaces[1].name }}{% if conf.nodes[2].interfaces[1].vlan | int > 0 %}.{{conf.nodes[2].interfaces[1].vlan}}{% endif %}
+          spaces: [admin]
+          mac: ["{{ conf.nodes[2].interfaces[1].mac_address }}"]
+        - ifname: {{ conf.nodes[2].interfaces[2].name }}{% if conf.nodes[2].interfaces[2].vlan | int > 0 %}.{{conf.nodes[2].interfaces[2].vlan}}{% endif %}
           spaces: [floating]
-          mac: ["{{ conf['nodes'][2]['interfaces'][0]['mac_address'] }}"]
-        - ifname: {{ conf['nodes'][2]['interfaces'][1]['name'] }}.{{ conf['nodes'][2]['interfaces'][1]['vlan'] }}
+          mac: ["{{ conf.nodes[2].interfaces[2].mac_address }}"]
+        - ifname: {{ conf.nodes[2].interfaces[0].name }}{% if conf.nodes[2].interfaces[0].vlan | int > 0 %}.{{conf.nodes[2].interfaces[0].vlan}}{% endif %}
           spaces: [public]
-          mac: ["{{ conf['nodes'][2]['interfaces'][1]['mac_address'] }}"]
-        - ifname: {{ conf['nodes'][2]['interfaces'][1]['name'] }}
+          mac: ["{{ conf.nodes[2].interfaces[0].mac_address }}"]
+        - ifname: {{ conf.nodes[2].interfaces[3].name }}{% if conf.nodes[2].interfaces[3].vlan | int > 0 %}.{{conf.nodes[2].interfaces[3].vlan}}{% endif %}
+          spaces: [storage]
+          mac: ["{{ conf.nodes[2].interfaces[3].mac_address }}"]
+        - ifname: {{ conf.nodes[2].interfaces[3].name }}
           spaces: [storage]
-          mac: ["{{ conf['nodes'][2]['interfaces'][1]['mac_address'] }}"]
-        - ifname: {{ conf['nodes'][2]['interfaces'][2]['name'] }}
+          mac: ["{{ conf.nodes[2].interfaces[3].mac_address }}"]
       power:
-        type: {{ conf['nodes'][2]['remote_management']['type'] }}
-        address: {{ conf['nodes'][2]['remote_management']['address'] }}
-        user: {{ conf['nodes'][2]['remote_management']['user'] }}
-        pass: {{ conf['nodes'][2]['remote_management']['pass'] }}
-    - name: {{ conf['nodes'][3]['name'] }}
-      architecture: {{ conf['nodes'][3]['node']['arch'] }}
+        type: {{ conf.nodes[2].remote_management.type }}
+        address: {{ conf.nodes[2].remote_management.address }}
+        user: {{ conf.nodes[2].remote_management.user }}
+        pass: {{ conf.nodes[2].remote_management.pass }}
+    - name: {{ conf.nodes[3].name }}
+      architecture: {{ conf.nodes[3].node.arch }}
       roles: [compute, storage]
       nics:
-        - ifname: {{ conf['nodes'][3]['interfaces'][0]['name'] }}
+        - ifname: {{ conf.nodes[3].interfaces[1].name }}{% if conf.nodes[3].interfaces[1].vlan | int > 0 %}.{{conf.nodes[3].interfaces[1].vlan}}{% endif %}
+          spaces: [admin]
+          mac: ["{{ conf.nodes[3].interfaces[1].mac_address }}"]
+        - ifname: {{ conf.nodes[3].interfaces[2].name }}{% if conf.nodes[3].interfaces[2].vlan | int > 0 %}.{{conf.nodes[3].interfaces[2].vlan}}{% endif %}
           spaces: [data]
-          mac: ["{{ conf['nodes'][3]['interfaces'][0]['mac_address'] }}"]
-        - ifname: {{ conf['nodes'][3]['interfaces'][0]['name'] }}.{{ conf['nodes'][3]['interfaces'][0]['vlan'] }}
+          mac: ["{{ conf.nodes[3].interfaces[2].mac_address }}"]
+        - ifname: {{ conf.nodes[3].interfaces[0].name }}{% if conf.nodes[3].interfaces[0].vlan | int > 0 %}.{{conf.nodes[3].interfaces[0].vlan}}{% endif %}
           spaces: [floating]
-          mac: ["{{ conf['nodes'][3]['interfaces'][0]['mac_address'] }}"]
-        - ifname: {{ conf['nodes'][3]['interfaces'][1]['name'] }}.{{ conf['nodes'][3]['interfaces'][1]['vlan'] }}
+          mac: ["{{ conf.nodes[3].interfaces[0].mac_address }}"]
+        - ifname: {{ conf.nodes[3].interfaces[3].name }}{% if conf.nodes[3].interfaces[3].vlan | int > 0 %}.{{conf.nodes[3].interfaces[3].vlan}}{% endif %}
           spaces: [public]
-          mac: ["{{ conf['nodes'][3]['interfaces'][1]['mac_address'] }}"]
-        - ifname: {{ conf['nodes'][3]['interfaces'][1]['name'] }}
+          mac: ["{{ conf.nodes[3].interfaces[3].mac_address }}"]
+        - ifname: {{ conf.nodes[3].interfaces[3].name }}
           spaces: [storage]
-          mac: ["{{ conf['nodes'][3]['interfaces'][1]['mac_address'] }}"]
-        - ifname: {{ conf['nodes'][3]['interfaces'][2]['name'] }}
+          mac: ["{{ conf.nodes[3].interfaces[3].mac_address }}"]
       power:
-        type: {{ conf['nodes'][3]['remote_management']['type'] }}
-        address: {{ conf['nodes'][3]['remote_management']['address'] }}
-        user: {{ conf['nodes'][3]['remote_management']['user'] }}
-        pass: {{ conf['nodes'][3]['remote_management']['pass'] }}
-    - name: {{ conf['nodes'][4]['name'] }}
-      architecture: {{ conf['nodes'][4]['node']['arch'] }}
+        type: {{ conf.nodes[3].remote_management.type }}
+        address: {{ conf.nodes[3].remote_management.address }}
+        user: {{ conf.nodes[3].remote_management.user }}
+        pass: {{ conf.nodes[3].remote_management.pass }}
+    - name: {{ conf.nodes[4].name }}
+      architecture: {{ conf.nodes[4].node.arch }}
       roles: [compute, storage]
       nics:
-        - ifname: {{ conf['nodes'][4]['interfaces'][0]['name'] }}
+        - ifname: {{ conf.nodes[4].interfaces[1].name }}{% if conf.nodes[4].interfaces[1].vlan | int > 0 %}.{{conf.nodes[4].interfaces[1].vlan}}{% endif %}
+          spaces: [admin]
+          mac: ["{{ conf.nodes[4].interfaces[1].mac_address }}"]
+        - ifname: {{ conf.nodes[4].interfaces[2].name }}{% if conf.nodes[4].interfaces[2].vlan | int > 0 %}.{{conf.nodes[4].interfaces[2].vlan}}{% endif %}
           spaces: [data]
-          mac: ["{{ conf['nodes'][4]['interfaces'][0]['mac_address'] }}"]
-        - ifname: {{ conf['nodes'][4]['interfaces'][0]['name'] }}.{{ conf['nodes'][4]['interfaces'][0]['vlan'] }}
+          mac: ["{{ conf.nodes[4].interfaces[2].mac_address }}"]
+        - ifname: {{ conf.nodes[4].interfaces[0].name }}{% if conf.nodes[4].interfaces[0].vlan | int > 0 %}.{{conf.nodes[4].interfaces[0].vlan}}{% endif %}
           spaces: [floating]
-          mac: ["{{ conf['nodes'][4]['interfaces'][0]['mac_address'] }}"]
-        - ifname: {{ conf['nodes'][4]['interfaces'][1]['name'] }}.{{ conf['nodes'][4]['interfaces'][1]['vlan'] }}
+          mac: ["{{ conf.nodes[4].interfaces[0].mac_address }}"]
+        - ifname: {{ conf.nodes[4].interfaces[3].name }}{% if conf.nodes[4].interfaces[3].vlan | int > 0 %}.{{conf.nodes[4].interfaces[3].vlan}}{% endif %}
           spaces: [public]
-          mac: ["{{ conf['nodes'][4]['interfaces'][1]['mac_address'] }}"]
-        - ifname: {{ conf['nodes'][4]['interfaces'][1]['name'] }}
+          mac: ["{{ conf.nodes[4].interfaces[3].mac_address }}"]
+        - ifname: {{ conf.nodes[1].interfaces[2].name }}
           spaces: [storage]
-          mac: ["{{ conf['nodes'][4]['interfaces'][1]['mac_address'] }}"]
-        - ifname: {{ conf['nodes'][1]['interfaces'][2]['name'] }}
+          mac: ["{{ conf.nodes[4].interfaces[3].mac_address }}"]
       power:
-        type: {{ conf['nodes'][4]['remote_management']['type'] }}
-        address: {{ conf['nodes'][4]['remote_management']['address'] }}
-        user: {{ conf['nodes'][4]['remote_management']['user'] }}
-        pass: {{ conf['nodes'][4]['remote_management']['pass'] }}
+        type: {{ conf.nodes[4].remote_management.type }}
+        address: {{ conf.nodes[4].remote_management.address }}
+        user: {{ conf.nodes[4].remote_management.user }}
+        pass: {{ conf.nodes[4].remote_management.pass }}
       floating-ip-range: 10.5.15.6,10.5.15.250,10.5.15.1,10.5.15.0/24
-      ext-port: "ens785f0.505"
-      dns: 8.8.8.8
+      ext-port: "nic1"
+      dns: {{ net_config.public.dns[0] }}
       osdomainname:
-opnfv:
-  release: f
-  distro: xenial
-  type: ha
-  openstack: pike
-  sdncontroller:
-    - type: nosdn
-  storage:
-    - type: ceph
-      disk: /dev/sdb
-  feature: odl_l2
-  spaces:
-    - type: admin
-      bridge: brAdm
-      cidr: 10.5.1.0/24
-      gateway: 10.5.1.1
-      vlan:
-    - type: data
-      bridge: brData
-      cidr: 10.5.12.0/24
-      gateway:
-      vlan:
-    - type: storage
-      bridge: brStor
-      cidr: 10.5.13.0/24
-      gateway:
-      vlan:
-    - type: public
-      bridge: brMgmt
-      cidr: 10.5.14.0/24
-      gateway:
-      vlan: 504
-    - type: floating
-      bridge: brPublic
-      cidr: 10.5.15.0/24
-      gateway:
-      vlan: 505
-    - type: external
-      bridge: brExt
-      cidr:
-      gateway:
-      ipaddress: 10.2.117.92
-      vlan:
+  opnfv:
+    release: f
+    distro: xenial
+    type: noha
+    openstack: pike
+    sdncontroller:
+      - type: nosdn
+    storage:
+      - type: ceph
+        disk: /dev/sdb
+    feature: odl_l2
+    spaces:
+      - type: admin  # admin
+        bridge: {{ net_config.admin.bridge }}
+        cidr: {{ net_config.admin.network }}/{{ net_config.admin.mask }}
+        gateway: {{ net_config.admin.gateway }}
+        vlan:
+      - type: data  # mgmt
+        cidr: {{ net_config.mgmt.network }}/{{ net_config.mgmt.mask }}
+        gateway:
+        vlan:
+      - type: storage  # storage
+        cidr: {{ net_config.storage.network }}/{{ net_config.storage.mask }}
+        gateway:
+        vlan:
+      - type: floating  # private
+        bridge: {{ net_config.private.bridge }}
+        cidr: {{ net_config.private.network }}/{{ net_config.private.mask }}
+        gateway:
+        vlan:
+      - type: public  # public
+        cidr: {{ net_config.public.network }}/{{ net_config.public.mask }}
+        gateway: {{ net_config.public.gateway }}
+        vlan: {% if net_config.public.vlan | int > 0 %}{{ net_config.public.vlan }}{% endif %}
-- 
cgit 1.2.3-korg