Squashed 'vendor/ansible/' changes from 6c0345a..83c7266

83c7266 Merge pull request #270 from mapuri/contiv 1e1b4e5 bump up the versions for cluster and netplugin ef14646 Merge pull request #269 from mapuri/lab 75bd4e8 use a custom private key to avoid vagrant issues ee90ea5 fix vagrant role ddcb0d1 bump up vbox and vagrant versions 5e57a03 Merge pull request #268 from contiv/upgrade-go 345d714 ansible: install go 1.7 211d8d3 Merge commit 'e15a9440e17fcb218f75f1ac5ac3e326b4e1a094' 493fd30 vendor in recent ansible changes f65c406 update vendor/ansible to recent ansible/master 5030fc5 update vendor/ansible to recent ansible/master 7ea3598 update vendor/ansible to recent ansible/master b1a8e5b update vendor/ansible to recent ansible/master fb2c4e0 Merge commit '7e064b99abe55b707114799f98a19a22f7816c48' into vendor_ansible_9th_march d6bb2d2 Merge commit 'b91216974b6f0b76ec7664a4087b35da5d1131bf' git-subtree-dir: vendor/ansible git-subtree-split: 83c726655a5bd3c50df03ec3441410b5a6dcdab4
contiv-experimental · Aug 30, 2016 · dc5936b · dc5936b
1 parent 90d10cf
commit dc5936b
Show file tree

Hide file tree

Showing 8 changed files with 67 additions and 10 deletions.
diff --git a/Vagrantfile b/Vagrantfile
@@ -30,6 +30,8 @@ puts "Host environment: #{host_env}"
 Vagrant.configure(2) do |config|
     (0..2).each do |n|
         node_name = "host#{n}"
+        config.ssh.insert_key = false
+        config.ssh.private_key_path = "./test/files/insecure_private_key"
         config.vm.define node_name do |node|
             case n
             when 0

diff --git a/roles/contiv_cluster/defaults/main.yml b/roles/contiv_cluster/defaults/main.yml
@@ -10,7 +10,7 @@ clusterm_client_port: 9007
 clusterm_args_file: "clusterm.args"
 clusterm_conf_file: "clusterm.conf"
 
-contiv_cluster_version: "v0.1-08-05-2016.08-44-24.UTC"
+contiv_cluster_version: "v0.1-08-30-2016.08-32-01.UTC"
 contiv_cluster_tar_file: "cluster-{{ contiv_cluster_version }}.tar.bz2"
 contiv_cluster_src_file: "https://github.com/contiv/cluster/releases/download/{{ contiv_cluster_version }}/{{ contiv_cluster_tar_file }}"
 contiv_cluster_dest_file: "/tmp/{{ contiv_cluster_tar_file }}"
diff --git a/roles/contiv_network/defaults/main.yml b/roles/contiv_network/defaults/main.yml
@@ -17,7 +17,7 @@ vxlan_port: 4789
 netplugin_rule_comment: "contiv network traffic"
 
 aci_gw_image: "contiv/aci-gw"
-contiv_network_version: "v0.1-08-10-2016.10-55-19.UTC"
+contiv_network_version: "v0.1-08-17-2016.09-11-39.UTC"
 contiv_network_tar_file: "netplugin-{{ contiv_network_version }}.tar.bz2"
 contiv_network_src_file: "https://github.com/contiv/netplugin/releases/download/{{ contiv_network_version }}/{{ contiv_network_tar_file }}"
 contiv_network_dest_file: "/tmp/{{ contiv_network_tar_file }}"

diff --git a/roles/dev/tasks/os_agnostic_tasks.yml b/roles/dev/tasks/os_agnostic_tasks.yml
@@ -1,14 +1,14 @@
 - name: Set Go version
   set_fact:
-    go_version: "1.6.2"
+    go_version: "1.7"
 
-- name: download Golang v1.6
+- name: "download Golang {{ go_version }}"
   get_url:
     validate_certs: "{{ validate_certs }}"
     url: "https://storage.googleapis.com/golang/go{{ go_version }}.linux-amd64.tar.gz"
     dest: "/tmp/go{{ go_version }}.linux-amd64.tar.gz"
 
-- name: install Golang
+- name: "install Golang {{ go_version }}"
   shell: "rm -rf go/ && tar xfvz /tmp/go{{ go_version }}.linux-amd64.tar.gz"
   args:
     chdir: /usr/local/

diff --git a/roles/test/defaults/main.yml b/roles/test/defaults/main.yml
@@ -1,12 +1,13 @@
 ---
 # role variable for the test environment packages
 
-vbox_major_version: "5.0.24"
-vbox_version_ubuntu: "5.0_{{ vbox_major_version }}-108355"
+vbox_package_version: "5.1"
+vbox_major_version: "{{ vbox_package_version }}.4"
+vbox_version_ubuntu: "{{ vbox_package_version }}_{{ vbox_major_version }}-110228"
 vbox_version_ubuntu_dist_version:
     vivid: "{{ vbox_version_ubuntu }}~Ubuntu~trusty"
     wily:  "{{ vbox_version_ubuntu }}~Ubuntu~wily"
     xenial:  "{{ vbox_version_ubuntu }}~Ubuntu~xenial"
-vbox_version_redhat: "5.0-{{ vbox_major_version }}_108355"
-vagrant_version: "1.8.1"
+vbox_version_redhat: "{{ vbox_package_version }}-{{ vbox_major_version }}_110228"
+vagrant_version: "1.8.5"
 packer_version: "0.10.0"
diff --git a/roles/test/tasks/redhat_tasks.yml b/roles/test/tasks/redhat_tasks.yml
@@ -5,6 +5,19 @@
     dest: /tmp/VirtualBox-{{ vbox_major_version }}.rpm
     force: no
 
+- name: check for installed vbox (redhat)
+  shell: yum list installed | grep -i virtualbox | awk '{print $1}'
+  register: vbox_installed_version
+
+- name: stop vbox service if it is running
+  service: name=vbox state=stopped
+  when: not (vbox_installed_version.stdout | match('.*{{vbox_package_version}}.*'))
+  ignore_errors: yes
+
+- name: uninstall VBox (redhat)
+  yum: name="{{ vbox_installed_version.stdout }}" state=absent
+  when: not (vbox_installed_version.stdout | match('.*{{vbox_package_version}}.*'))
+
 - name: install VBox (redhat)
   yum: name=/tmp/VirtualBox-{{ vbox_major_version }}.rpm state=present
 

diff --git a/roles/test/tasks/ubuntu_tasks.yml b/roles/test/tasks/ubuntu_tasks.yml
@@ -5,6 +5,20 @@
     dest: /tmp/virtualbox-{{ vbox_major_version }}.deb
     force: no
 
+- name: check for installed vbox (ubuntu)
+  shell: VBoxManage --version
+  register: vbox_installed_version
+  ignore_errors: yes
+
+- name: stop vbox service if it is running (ubuntu)
+  service: name=vbox state=stopped
+  when: not (vbox_installed_version.stdout | match('.*{{vbox_package_version}}.*'))
+  ignore_errors: yes
+
+- name: uninstall VBox (ubuntu)
+  apt: name='virtualbox-*' state=absent
+  when: not (vbox_installed_version.stdout | match('.*{{vbox_package_version}}.*'))
+
 - name: install VBox (debian)
   apt: deb=/tmp/virtualbox-{{ vbox_major_version }}.deb state=present
 
@@ -20,7 +34,7 @@
 - name: download vagrant (debian)
   get_url:
     validate_certs: "{{ validate_certs }}"
-    url: https://releases.hashicorp.com/vagrant/1.8.1/vagrant_{{ vagrant_version }}_x86_64.deb
+    url: https://releases.hashicorp.com/vagrant/{{ vagrant_version }}/vagrant_{{ vagrant_version }}_x86_64.deb
     dest: /tmp/vagrant_{{ vagrant_version }}.deb
     force: no
 

diff --git a/test/files/insecure_private_key b/test/files/insecure_private_key
@@ -0,0 +1,27 @@
+-----BEGIN RSA PRIVATE KEY-----
+MIIEogIBAAKCAQEA6NF8iallvQVp22WDkTkyrtvp9eWW6A8YVr+kz4TjGYe7gHzI
+w+niNltGEFHzD8+v1I2YJ6oXevct1YeS0o9HZyN1Q9qgCgzUFtdOKLv6IedplqoP
+kcmF0aYet2PkEDo3MlTBckFXPITAMzF8dJSIFo9D8HfdOV0IAdx4O7PtixWKn5y2
+hMNG0zQPyUecp4pzC6kivAIhyfHilFR61RGL+GPXQ2MWZWFYbAGjyiYJnAmCP3NO
+Td0jMZEnDkbUvxhMmBYSdETk1rRgm+R4LOzFUGaHqHDLKLX+FIPKcF96hrucXzcW
+yLbIbEgE98OHlnVYCzRdK8jlqm8tehUc9c9WhQIBIwKCAQEA4iqWPJXtzZA68mKd
+ELs4jJsdyky+ewdZeNds5tjcnHU5zUYE25K+ffJED9qUWICcLZDc81TGWjHyAqD1
+Bw7XpgUwFgeUJwUlzQurAv+/ySnxiwuaGJfhFM1CaQHzfXphgVml+fZUvnJUTvzf
+TK2Lg6EdbUE9TarUlBf/xPfuEhMSlIE5keb/Zz3/LUlRg8yDqz5w+QWVJ4utnKnK
+iqwZN0mwpwU7YSyJhlT4YV1F3n4YjLswM5wJs2oqm0jssQu/BT0tyEXNDYBLEF4A
+sClaWuSJ2kjq7KhrrYXzagqhnSei9ODYFShJu8UWVec3Ihb5ZXlzO6vdNQ1J9Xsf
+4m+2ywKBgQD6qFxx/Rv9CNN96l/4rb14HKirC2o/orApiHmHDsURs5rUKDx0f9iP
+cXN7S1uePXuJRK/5hsubaOCx3Owd2u9gD6Oq0CsMkE4CUSiJcYrMANtx54cGH7Rk
+EjFZxK8xAv1ldELEyxrFqkbE4BKd8QOt414qjvTGyAK+OLD3M2QdCQKBgQDtx8pN
+CAxR7yhHbIWT1AH66+XWN8bXq7l3RO/ukeaci98JfkbkxURZhtxV/HHuvUhnPLdX
+3TwygPBYZFNo4pzVEhzWoTtnEtrFueKxyc3+LjZpuo+mBlQ6ORtfgkr9gBVphXZG
+YEzkCD3lVdl8L4cw9BVpKrJCs1c5taGjDgdInQKBgHm/fVvv96bJxc9x1tffXAcj
+3OVdUN0UgXNCSaf/3A/phbeBQe9xS+3mpc4r6qvx+iy69mNBeNZ0xOitIjpjBo2+
+dBEjSBwLk5q5tJqHmy/jKMJL4n9ROlx93XS+njxgibTvU6Fp9w+NOFD/HvxB3Tcz
+6+jJF85D5BNAG3DBMKBjAoGBAOAxZvgsKN+JuENXsST7F89Tck2iTcQIT8g5rwWC
+P9Vt74yboe2kDT531w8+egz7nAmRBKNM751U/95P9t88EDacDI/Z2OwnuFQHCPDF
+llYOUI+SpLJ6/vURRbHSnnn8a/XG+nzedGH5JGqEJNQsz+xT2axM0/W/CRknmGaJ
+kda/AoGANWrLCz708y7VYgAtW2Uf1DPOIYMdvo6fxIB5i9ZfISgcJ/bbCUkFrhoH
++vq/5CIWxCPp0f85R4qxxQ5ihxJ0YDQT9Jpx4TMss4PSavPaBH3RXow5Ohe+bYoQ
+NE5OgEXk2wVfZczCZpigBKbKZHNYcelXtTt/nP3rsCuGcM4h53s=
+-----END RSA PRIVATE KEY-----