diff options
| -rwxr-xr-x | xci/installer/kubespray/deploy.sh | 3 | ||||
| -rw-r--r-- | xci/playbooks/roles/create-nodes/tasks/create_vm.yml | 10 | ||||
| -rw-r--r-- | xci/var/idf.yml | 11 |
3 files changed, 24 insertions, 0 deletions
diff --git a/xci/installer/kubespray/deploy.sh b/xci/installer/kubespray/deploy.sh index 98b1dcdb..48ef7456 100755 --- a/xci/installer/kubespray/deploy.sh +++ b/xci/installer/kubespray/deploy.sh @@ -69,14 +69,17 @@ if [ $XCI_FLAVOR != "aio" ]; then echo "Info: Configured target hosts for kubespray" fi + echo "Info: Using kubespray to deploy the kubernetes cluster" echo "-----------------------------------------------------------------------" ssh root@$OPNFV_HOST_IP "set -o pipefail; export XCI_FLAVOR=$XCI_FLAVOR; export INSTALLER_TYPE=$INSTALLER_TYPE; \ + export IDF=/root/releng-xci/xci/var/idf.yml; export PDF=/root/releng-xci/xci/var/pdf.yml; \ cd releng-xci/.cache/repos/kubespray/; ansible-playbook \ -i opnfv_inventory/dynamic_inventory.py cluster.yml -b | tee setup-kubernetes.log" scp root@$OPNFV_HOST_IP:~/releng-xci/.cache/repos/kubespray/setup-kubernetes.log \ $LOG_PATH/setup-kubernetes.log + cd $K8_XCI_PLAYBOOKS ansible-playbook ${XCI_ANSIBLE_PARAMS} \ -i ${XCI_PLAYBOOKS}/dynamic_inventory.py configure-kubenet.yml diff --git a/xci/playbooks/roles/create-nodes/tasks/create_vm.yml b/xci/playbooks/roles/create-nodes/tasks/create_vm.yml index df019c88..4afb71cf 100644 --- a/xci/playbooks/roles/create-nodes/tasks/create_vm.yml +++ b/xci/playbooks/roles/create-nodes/tasks/create_vm.yml @@ -102,6 +102,8 @@ PATH: "{{ lookup('env', 'XCI_VENV') }}/bin" register: vbmc_list + - debug: var=vbmc_list + # NOTE(NobodyCam): Space at the end of the find clause is required for proper matching. - name: delete vm from virtualbmc if it is there command: vbmc delete {{ vm_name }} @@ -122,6 +124,14 @@ environment: PATH: "{{ lookup('env', 'XCI_VENV') }}/bin" + - name: get list of nodes from virtualbmc + command: vbmc list + environment: + PATH: "{{ lookup('env', 'XCI_VENV') }}/bin" + register: vbmc_list2 + + - debug: var=vbmc_list2 + - name: get XML of the vm virt: name: "{{ vm_name }}" diff --git a/xci/var/idf.yml b/xci/var/idf.yml index 628e1b8c..7f20c3bf 100644 --- a/xci/var/idf.yml +++ b/xci/var/idf.yml @@ -84,6 +84,17 @@ idf: node3: node2 node4: master2 node5: master3 + network: + # network mapping + network_mapping: + # Management network used by installer components to communicate + net-mgmt: mgmt + # 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 xci: pod_name: vpod1 net_config: *net_config |