diff options
author | Fatih Degirmenci <fdegir@gmail.com> | 2018-11-21 11:57:59 +0100 |
---|---|---|
committer | Fatih Degirmenci <fdegir@gmail.com> | 2018-11-21 12:03:32 +0100 |
commit | 2c8c96b50cc5d91592052d2b967601033519d69d (patch) | |
tree | 23fa96e84dbd194c5e257ba8bce7deebb0770c01 /xci/var/ericsson-idf-pod2.yml | |
parent | c53017fa23a3e495f8a091dd7e6be902fc966137 (diff) |
Rename Ericsson POD2 PDF/IDF
The PDF/IDF filenames to use during deployments in CI will be generated
dynamically based on which slave the job is running on with the help of
the SLAVE_NAME environment variable Jenkins injects into job environment.
It will probably look like this
pdf=var/pdf.yml
idf=var/idf.yml
if [[ "$SLAVE_NAME" !~ virtual ]]; then
pdf=var/${SLAVE_NAME}-pdf.yml
pdf=var/${SLAVE_NAME}-idf.yml
fi
./xci-deploy.sh -i $idf -p $pdf
deploy-scenario:os-nosdn-nofeature
installer-type:osa
Change-Id: Ief319ee36292ca888b97e4059a26337ee98dfef2
Signed-off-by: Fatih Degirmenci <fdegir@gmail.com>
Diffstat (limited to 'xci/var/ericsson-idf-pod2.yml')
-rw-r--r-- | xci/var/ericsson-idf-pod2.yml | 132 |
1 files changed, 0 insertions, 132 deletions
diff --git a/xci/var/ericsson-idf-pod2.yml b/xci/var/ericsson-idf-pod2.yml deleted file mode 100644 index 8d20ae34..00000000 --- a/xci/var/ericsson-idf-pod2.yml +++ /dev/null @@ -1,132 +0,0 @@ -############################################################################## -# Copyright (c) 2018 Ericsson AB, Mirantis Inc., Enea AB and others. -# All rights reserved. This program and the accompanying materials -# are made available under the terms of the Apache License, Version 2.0 -# which accompanies this distribution, and is available at -# http://www.apache.org/licenses/LICENSE-2.0 -############################################################################## ---- -### ERICSSON POD 2 installer descriptor file ### -idf: - version: 0.1 - installer: ['apex', 'compass4nfv', 'daisy', 'osa'] - net_config: &net_config - admin: - interface: 2 - network: 192.168.122.0 # Untagged, 'PXE/Admin' on wiki, different IP - mask: 24 - mgmt: - interface: 1 - network: 172.29.236.0 - mask: 22 - storage: - interface: 3 - network: 172.29.240.0 # Tagged, not the same with 'storage' on wiki - mask: 22 - private: - interface: 4 - network: 172.29.242.0 # Tagged, not the same with 'private' on wiki - mask: 22 - public: - interface: 2 - network: 192.168.122.0 # Untagged, 'public' on wiki - mask: 24 - gateway: 192.168.122.1 - dns: - - 8.8.8.8 - - 8.8.4.4 - osa: &idf_osa - nodes_roles: - opnfv: [deployment] - node1: [controller] - node2: [compute, storage] - node3: [compute, storage] - node4: [controller] - node5: [controller] - groups: - openstack: - - controller - - compute - - storage - hostnames: - opnfv: opnfv - node1: controller00 - node2: compute00 - node3: compute01 - node4: controller01 - node5: controller02 - 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] - 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 - - -xci: - pod_name: pod1 - net_config: *net_config - flavors: - mini: - - opnfv - - node1 - - node2 - noha: - - opnfv - - node1 - - node2 - - node3 - ha: - - opnfv - - node1 - - node2 - - node3 - - node4 - - node5 - - # net_config network to be used by the PXE - pxe_network: public - - # As the MAC of generated bridges are generated, we use a list of local - # bridges to create libvirt networks - jumphost_interfaces_bridges: - - name: virbr0 - ip: 192.168.122.1 - - extra_addresses: - opnfv: 192.168.122.2 - - installers: - osa: *idf_osa - kubespray: *idf_kubespray |