Merge "Fix nosdn-fdio deployment errors"

diff --git a/apex/overcloud/overcloud_deploy.py b/apex/overcloud/overcloud_deploy.py
index a9494d2..518df0d 100644 (file)
--- a/apex/overcloud/overcloud_deploy.py
+++ b/apex/overcloud/overcloud_deploy.py
@@ -547,7 +547,7 @@ def create_congress_cmds(overcloud_file):
         else:
             cmd = "{} \"{}\" {}".format(driver, driver, ds_cfg)
         if driver == 'nova':
-            cmd += '--config api_version="2.34"'
+            cmd += ' --config api_version="2.34"'
         logging.debug("Congress command created: {}".format(cmd))
         cmds.append(cmd)
     return cmds

diff --git a/build/Makefile b/build/Makefile
index 7cc8736..5f07833 100644 (file)
--- a/build/Makefile
+++ b/build/Makefile
@@ -271,7 +271,11 @@ iso:       iso-clean images rpms $(CENTISO)
        @ln $(RPMUDR) $(BUILD_DIR)/centos/Packages
        @ln $(RPMODL) $(BUILD_DIR)/centos/Packages
        # add packages to the centos packages
-       cd $(BUILD_DIR)/centos/Packages && yumdownloader openvswitch jq python34 python34-libs python34-PyYAML python34-setuptools ipxe-roms-qemu python34-jinja2 python34-markupsafe ansible python34-six python34-cffi python34-idna python34-pycparser python-crypto python-httplib2 python-jinja2 python-keyczar python-paramiko sshpass python-ecdsa python34-ply
+       cd $(BUILD_DIR)/centos/Packages && yumdownloader openvswitch jq python34 python34-libs python34-PyYAML python34-setuptools
+       cd $(BUILD_DIR)/centos/Packages && yumdownloader python34-jinja2 python34-markupsafe ansible python34-six python34-cffi
+       cd $(BUILD_DIR)/centos/Packages && yumdownloader ipxe-roms-qemu python34-idna python34-pycparser python-crypto python-httplib2
+       cd $(BUILD_DIR)/centos/Packages && yumdownloader python-jinja2 python-keyczar python-paramiko sshpass python-ecdsa python34-ply
+       cd $(BUILD_DIR)/centos/Packages && yumdownloader libvirt-python python-lxml
        cd $(BUILD_DIR)/centos/Packages && curl -O http://artifacts.opnfv.org/apex/dependencies/python3-ipmi-0.3.0-1.noarch.rpm
        cd $(BUILD_DIR)/centos/Packages && curl -O http://artifacts.opnfv.org/apex/dependencies/python34-asn1crypto-0.22.0-1.el7.centos.noarch.rpm
        cd $(BUILD_DIR)/centos/Packages && curl -O http://artifacts.opnfv.org/apex/dependencies/python34-cryptography-2.0.3-1.el7.centos.x86_64.rpm

diff --git a/build/overcloud-full.sh b/build/overcloud-full.sh
index 8efe822..36e9565 100755 (executable)
--- a/build/overcloud-full.sh
+++ b/build/overcloud-full.sh
@@ -42,7 +42,7 @@ git clone https://gerrit.opnfv.org/gerrit/vswitchperf vsperf
 tar czf vsperf.tar.gz vsperf
 
 # Increase disk size by 1200MB to accommodate more packages
-qemu-img resize overcloud-full_build.qcow2 +1200MB
+qemu-img resize overcloud-full_build.qcow2 +1200M
 
 # expand file system to max disk size
 # installing forked apex-puppet-tripleo

diff --git a/lib/ansible/playbooks/deploy_dependencies.yml b/lib/ansible/playbooks/deploy_dependencies.yml
index 6db94ab..8a57521 100644 (file)
--- a/lib/ansible/playbooks/deploy_dependencies.yml
+++ b/lib/ansible/playbooks/deploy_dependencies.yml
@@ -1,6 +1,12 @@
 ---
 - hosts: localhost
   tasks:
+    - yum:
+        name: "{{ item }}"
+        state: present
+      with_items:
+        - python-lxml
+        - libvirt-python
     - sysctl:
         name: net.ipv4.ip_forward
         state: present
@@ -30,21 +36,24 @@
         state: present
       with_items: '{{ virsh_enabled_networks }}'
     - virt_net:
-        command: define
+        state: present
         name: '{{ item }}'
         xml: '{{ lookup("template", "virsh_network_ovs.xml.j2") }}'
-        autostart: yes
       with_items: '{{ virsh_enabled_networks }}'
     - virt_net:
-        command: create
+        state: active
         name: '{{ item }}'
+        autostart: yes
       with_items: '{{ virsh_enabled_networks }}'
     - virt_pool:
         name: default
-        command: define
         autostart: yes
-        state: active
+        state: present
         xml: '{{ lookup("template", "virsh_pool.xml.j2") }}'
+    - virt_pool:
+        name: default
+        autostart: yes
+        state: active
     - lineinfile:
         path: /etc/modprobe.d/kvm_intel.conf
         line: 'options kvm-intel nested=1'

diff --git a/lib/ansible/playbooks/post_deploy_undercloud.yml b/lib/ansible/playbooks/post_deploy_undercloud.yml
index ba0746b..d6b8805 100644 (file)
--- a/lib/ansible/playbooks/post_deploy_undercloud.yml
+++ b/lib/ansible/playbooks/post_deploy_undercloud.yml
@@ -115,4 +115,3 @@
       become_user: stack
       when: congress
       with_items: "{{ congress_datasources }}"
-      ignore_errors: yes