summaryrefslogtreecommitdiffstats
path: root/xci/var
diff options
context:
space:
mode:
Diffstat (limited to 'xci/var')
-rw-r--r--xci/var/ericsson-pod2-idf.yml40
-rw-r--r--xci/var/lf-pod4-idf.yml37
2 files changed, 75 insertions, 2 deletions
diff --git a/xci/var/ericsson-pod2-idf.yml b/xci/var/ericsson-pod2-idf.yml
index 88a927e6..2839b120 100644
--- a/xci/var/ericsson-pod2-idf.yml
+++ b/xci/var/ericsson-pod2-idf.yml
@@ -9,7 +9,7 @@
### ERICSSON POD 2 installer descriptor file ###
idf:
version: 0.1
- installer: ['apex', 'compass4nfv', 'daisy', 'osa']
+ installer: ['apex', 'compass4nfv', 'daisy', 'osa', 'osh']
net_config: &net_config
admin:
interface: 2
@@ -73,6 +73,43 @@ idf:
- 'ens1f1'
- 'ens2f0'
- 'ens2f1'
+ osh: &idf_osh
+ nodes_roles:
+ opnvf: [opnfv]
+ node1: [kube-master, etcd, vault]
+ node2: [kube-node]
+ node3: [kube-node]
+ node4: [kube-master, etcd, vault]
+ node5: [kube-master, etcd, vault]
+ groups:
+ k8s-cluster:
+ - kube-node
+ - kube-master
+ hostnames:
+ opnfv: opnfv
+ node1: master1
+ node2: node1
+ node3: node2
+ node4: master2
+ node5: master3
+ network:
+ # network mapping
+ network_mapping:
+ # Management network used by installer components to communicate
+ net-mgmt: admin
+ # Storage Network
+ net-storage: storage
+ # Internal network for communication between VNF
+ net-internal: private
+ # Public network for VNF remote acces (ext-net in Openstack)
+ net-vnf: public
+ deployment_host_interfaces:
+ # Ordered-list, index should be in sync with interface index in PDF
+ - 'ens1f1' #should be eno49 but it is currently broken
+ - 'ens1f0'
+ - 'ens1f1'
+ - 'ens2f0'
+ - 'ens2f1'
kubespray: &idf_kubespray
nodes_roles:
opnvf: [opnfv]
@@ -147,3 +184,4 @@ xci:
installers:
osa: *idf_osa
kubespray: *idf_kubespray
+ osh: *idf_osh
diff --git a/xci/var/lf-pod4-idf.yml b/xci/var/lf-pod4-idf.yml
index 3b828a49..55ca6b63 100644
--- a/xci/var/lf-pod4-idf.yml
+++ b/xci/var/lf-pod4-idf.yml
@@ -10,7 +10,7 @@
idf:
version: 0.1
- installer: ['apex', 'compass4nfv', 'daisy', 'fuel', 'osa']
+ installer: ['apex', 'compass4nfv', 'daisy', 'fuel', 'osa', 'osh']
net_config: &net_config
oob:
interface: 0
@@ -79,6 +79,40 @@ idf:
# Ordered-list, index should be in sync with interface index in PDF
- 'eno1'
- 'eno3.450'
+ osh: &idf_osh
+ nodes_roles:
+ opnvf: [opnfv]
+ pod4-node1: [kube-master, etcd, vault]
+ pod4-node2: [kube-node]
+ pod4-node3: [kube-node]
+ pod4-node4: [kube-master, etcd, vault]
+ pod4-node5: [kube-master, etcd, vault]
+ groups:
+ k8s-cluster:
+ - kube-node
+ - kube-master
+ hostnames:
+ opnfv: opnfv
+ pod4-node1: master1
+ pod4-node2: node1
+ pod4-node3: node2
+ pod4-node4: master2
+ pod4-node5: master3
+ network:
+ # network mapping
+ network_mapping:
+ # Management network used by installer components to communicate
+ net-mgmt: admin
+ # Storage Network
+ net-storage: storage
+ # Internal network for communication between VNF
+ net-internal: private
+ # Public network for VNF remote acces (ext-net in Openstack)
+ net-vnf: public
+ deployment_host_interfaces:
+ # Ordered-list, index should be in sync with interface index in PDF
+ - 'eno1'
+ - 'eno3.450'
kubespray: &idf_kubespray
nodes_roles:
opnvf: [opnfv]
@@ -185,3 +219,4 @@ xci:
installers:
osa: *idf_osa
kubespray: *idf_kubespray
+ osh: *idf_osh