diff options
-rwxr-xr-x | bifrost/scripts/bifrost-provision.sh | 4 | ||||
-rw-r--r-- | xci/installer/kubespray/playbooks/configure-opnfvhost.yml | 10 | ||||
-rw-r--r-- | xci/installer/kubespray/playbooks/configure-targethosts.yml | 10 | ||||
-rw-r--r-- | xci/installer/kubespray/playbooks/group_vars/all | 11 | ||||
-rw-r--r-- | xci/installer/osa/playbooks/configure-opnfvhost.yml | 2 | ||||
-rw-r--r-- | xci/opnfv-scenario-requirements.yml | 1 | ||||
-rwxr-xr-x | xci/scripts/vm/start-new-vm.sh | 2 |
7 files changed, 25 insertions, 15 deletions
diff --git a/bifrost/scripts/bifrost-provision.sh b/bifrost/scripts/bifrost-provision.sh index 84c0db4a..d641d506 100755 --- a/bifrost/scripts/bifrost-provision.sh +++ b/bifrost/scripts/bifrost-provision.sh @@ -107,7 +107,7 @@ ${ANSIBLE} ${XCI_ANSIBLE_VERBOSITY} \ -i inventory/localhost \ test-bifrost-create-vm.yaml \ -e test_vm_num_nodes=${TEST_VM_NUM_NODES} \ - -e test_vm_cpu='host-passthrough' \ + -e test_vm_cpu='host-model' \ -e test_vm_memory_size=${VM_MEMORY_SIZE} \ -e enable_venv=${ENABLE_VENV} \ -e test_vm_domain_type=${VM_DOMAIN_TYPE} \ @@ -120,7 +120,7 @@ ${ANSIBLE} ${XCI_ANSIBLE_VERBOSITY} \ -e use_cirros=${USE_CIRROS} \ -e testing_user=${TESTING_USER} \ -e test_vm_num_nodes=${TEST_VM_NUM_NODES} \ - -e test_vm_cpu='host-passthrough' \ + -e test_vm_cpu='host-model' \ -e inventory_dhcp=${INVENTORY_DHCP} \ -e inventory_dhcp_static_ip=${INVENTORY_DHCP_STATIC_IP} \ -e enable_venv=${ENABLE_VENV} \ diff --git a/xci/installer/kubespray/playbooks/configure-opnfvhost.yml b/xci/installer/kubespray/playbooks/configure-opnfvhost.yml index 23f93852..9fb4da19 100644 --- a/xci/installer/kubespray/playbooks/configure-opnfvhost.yml +++ b/xci/installer/kubespray/playbooks/configure-opnfvhost.yml @@ -56,11 +56,11 @@ - name: copy k8s_cluster.yml shell: "cp -rf {{ remote_xci_path }}/xci/installer/kubespray/files/k8s-cluster.yml \ {{ remote_xci_path }}/.cache/repos/kubespray/opnfv_inventory/group_vars" - - name: install dbus and ptyhon-netaddr - apt: - name: "{{item}}" - update_cache: yes - with_items: "{{ kube_require_packages }}" + - name: Install required packages + package: + name: "{{ kube_require_packages[ansible_pkg_mgr] }}" + state: present + update_cache: "{{ (ansible_pkg_mgr == 'apt') | ternary('yes', omit) }}" when: XCI_FLAVOR == 'aio' - name: pip install ansible pip: diff --git a/xci/installer/kubespray/playbooks/configure-targethosts.yml b/xci/installer/kubespray/playbooks/configure-targethosts.yml index 7e29025b..08c735b4 100644 --- a/xci/installer/kubespray/playbooks/configure-targethosts.yml +++ b/xci/installer/kubespray/playbooks/configure-targethosts.yml @@ -6,11 +6,11 @@ copy: src: "{{ XCI_PATH }}/xci/files/authorized_keys" dest: /root/.ssh/authorized_keys - - name: install dbus and ptyhon-netaddr - apt: - name: "{{item}}" - update_cache: yes - with_items: "{{ kube_require_packages }}" + - name: Install required packages + package: + name: "{{ kube_require_packages[ansible_pkg_mgr] }}" + state: present + update_cache: "{{ (ansible_pkg_mgr == 'apt') | ternary('yes', omit) }}" - hosts: kube-master remote_user: root diff --git a/xci/installer/kubespray/playbooks/group_vars/all b/xci/installer/kubespray/playbooks/group_vars/all index d2c36bfc..87ed63bd 100644 --- a/xci/installer/kubespray/playbooks/group_vars/all +++ b/xci/installer/kubespray/playbooks/group_vars/all @@ -1,6 +1,13 @@ kube_require_packages: - - "python-netaddr" - - "dbus" + apt: + - python-netaddr + - dbus + yum: + - python-netaddr + - dbus + zypper: + - python-netaddr + - dbus-1 keepalived_ubuntu_src: "uca" keepalived_uca_apt_repo_url: "{{ uca_apt_repo_url | default('http://ubuntu-cloud.archive.canonical.com/ubuntu') }}" diff --git a/xci/installer/osa/playbooks/configure-opnfvhost.yml b/xci/installer/osa/playbooks/configure-opnfvhost.yml index de922d3c..4d75f115 100644 --- a/xci/installer/osa/playbooks/configure-opnfvhost.yml +++ b/xci/installer/osa/playbooks/configure-opnfvhost.yml @@ -28,6 +28,8 @@ roles: - role: configure-network when: XCI_FLAVOR != "aio" + # we need to force sync time with ntp or the nodes will be out of sync timewise + - role: synchronize-time tasks: - name: generate SSH keys diff --git a/xci/opnfv-scenario-requirements.yml b/xci/opnfv-scenario-requirements.yml index ece4caea..36415d3f 100644 --- a/xci/opnfv-scenario-requirements.yml +++ b/xci/opnfv-scenario-requirements.yml @@ -71,3 +71,4 @@ - noha distros: - ubuntu + - centos diff --git a/xci/scripts/vm/start-new-vm.sh b/xci/scripts/vm/start-new-vm.sh index 915a7ee2..0cafaf2b 100755 --- a/xci/scripts/vm/start-new-vm.sh +++ b/xci/scripts/vm/start-new-vm.sh @@ -83,7 +83,7 @@ update_clean_vm_files() { [[ $# -ne 1 ]] && usage && exit 1 -declare -r CPU=${XCI_CPU_TYPE:-host-passthrough} +declare -r CPU=${XCI_CPU_TYPE:-host-model} declare -r NCPUS=${XCI_NCPUS:-24} declare -r MEMORY=${XCI_MEMORY_SIZE:-65536} declare -r DISK=${XCI_DISK_SIZE:-500} |