From af4b7ba6a9c02acfee8a74373f22a7d988152b3c Mon Sep 17 00:00:00 2001 From: micafer Date: Thu, 4 Oct 2018 08:10:15 +0200 Subject: [PATCH 1/5] Kill ubuntu apt boot processes --- contextualization/basic.yml | 5 +++++ contextualization/conf-ansible.yml | 5 +++++ 2 files changed, 10 insertions(+) diff --git a/contextualization/basic.yml b/contextualization/basic.yml index 43924abb6..f3d812e7c 100644 --- a/contextualization/basic.yml +++ b/contextualization/basic.yml @@ -8,6 +8,11 @@ register: python_exists changed_when: false + # Ubuntu 16 have an annoying apt boot process + - name: Delete apt processes + raw: sudo killall apt ; sleep 1 ; sudo rm -f /var/lib/apt/lists/lock && sudo rm -f /var/lib/dpkg/lock && sudo dpkg --configure -a ; sudo apt-get -f -y install + ignore_errors: yes + - name: Bootstrap with python raw: sudo apt update; sudo apt install -y python; sudo yum install -y python; sudo zypper -n install python python-xml ignore_errors: yes diff --git a/contextualization/conf-ansible.yml b/contextualization/conf-ansible.yml index df701b9be..cfe056af9 100644 --- a/contextualization/conf-ansible.yml +++ b/contextualization/conf-ansible.yml @@ -14,6 +14,11 @@ register: python_exists changed_when: false + # Ubuntu 16 have an annoying apt boot process + - name: Delete apt processes + raw: sudo killall apt ; sleep 1 ; sudo rm -f /var/lib/apt/lists/lock && sudo rm -f /var/lib/dpkg/lock && sudo dpkg --configure -a ; sudo apt-get -f -y install + ignore_errors: yes + - name: Bootstrap with python raw: sudo apt update; sudo apt install -y python; sudo yum install -y python; sudo zypper -n install python python-xml ignore_errors: yes From 400617c882027a12386010e54af1d81a975cd2f8 Mon Sep 17 00:00:00 2001 From: micafer Date: Thu, 4 Oct 2018 08:10:29 +0200 Subject: [PATCH 2/5] Minor change --- IM/tosca/Tosca.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/IM/tosca/Tosca.py b/IM/tosca/Tosca.py index 218a2ddf6..4aec1cfcc 100644 --- a/IM/tosca/Tosca.py +++ b/IM/tosca/Tosca.py @@ -225,7 +225,7 @@ def _order_deploys(self, radl): else: priv.append(d) - # This is patch, we need a solution for that + # This is patch, we need an actual solution for that wn = [] fe = [] for d in pub: From 3220869162e73b160560263442a6b994897819de Mon Sep 17 00:00:00 2001 From: micafer Date: Thu, 4 Oct 2018 11:43:12 +0200 Subject: [PATCH 3/5] Fix test --- test/unit/Tosca.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/unit/Tosca.py b/test/unit/Tosca.py index b4b97d441..15ee1c27b 100755 --- a/test/unit/Tosca.py +++ b/test/unit/Tosca.py @@ -80,7 +80,7 @@ def test_tosca_to_radl(self): self.assertEqual(lrms_wn.getValue("spot"), 'no') self.assertEqual(lrms_wn.getValue("instance_type"), 'some_type') - self.assertEqual([d.id for d in radl.deploys], ['other_server', 'lrms_server', 'lrms_wn']) + self.assertEqual([d.id for d in radl.deploys][2], 'lrms_wn') def test_tosca_get_outputs(self): """Test TOSCA get_outputs function""" From 4b17ca35249b6684d1f47300bdb2e0d44337ca28 Mon Sep 17 00:00:00 2001 From: micafer Date: Thu, 4 Oct 2018 15:29:26 +0200 Subject: [PATCH 4/5] Update changelog --- changelog | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/changelog b/changelog index d05768a0f..b9a06aa51 100644 --- a/changelog +++ b/changelog @@ -436,3 +436,10 @@ IM 1.7.5: * Fix error deleting OCCI infrastructure: Volume deleting returns forbidden and takes too long * Fix error with OCCI server 2.0.4 authentication error * Fix problem installing specific branch of Ansible galaxy roles + * Fix error in REST API in case of strange char in ansible output + * Add support to disk.*.image_url in OpenStack connector + * Fix error detecting ansible process end + * Enable to specify spot to EC2 instances in TOSCA + * Get EC2 instances info from ec2instances.info + * Fix error geting the subnets of the default VPC on EC2 conn + * Add volume_id to TOSCA BlockStorage type From 7992f40341a6f5fe58b881e13979a0a4440a8011 Mon Sep 17 00:00:00 2001 From: micafer Date: Thu, 4 Oct 2018 15:33:23 +0200 Subject: [PATCH 5/5] Update changelod --- changelog | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/changelog b/changelog index b9a06aa51..f2a0e2e0f 100644 --- a/changelog +++ b/changelog @@ -436,10 +436,10 @@ IM 1.7.5: * Fix error deleting OCCI infrastructure: Volume deleting returns forbidden and takes too long * Fix error with OCCI server 2.0.4 authentication error * Fix problem installing specific branch of Ansible galaxy roles - * Fix error in REST API in case of strange char in ansible output - * Add support to disk.*.image_url in OpenStack connector - * Fix error detecting ansible process end - * Enable to specify spot to EC2 instances in TOSCA + * Fix error in REST API in case of strange char in ansible output + * Add support to disk.*.image_url in OpenStack connector + * Fix error detecting ansible process end + * Enable to specify spot to EC2 instances in TOSCA * Get EC2 instances info from ec2instances.info * Fix error geting the subnets of the default VPC on EC2 conn * Add volume_id to TOSCA BlockStorage type