Squashed 'ansible/' changes from 5936e26..b9e9302

b9e9302 Merge pull request contiv-experimental#197 from mapuri/docker 8ce63b8 bump up versions of contiv services a4ce37f Add support for installing Docker CS engine 641fef9 Merge pull request contiv-experimental#196 from vvb/ovs_fix 135dfdb using the latest openvswitch rpm as in openstak-kilo repo git-subtree-dir: ansible git-subtree-split: b9e930270ae327e27fa66f2325f0fded4844f10b
erikh · May 19, 2016 · c6e54a3 · c6e54a3
1 parent e38bd9c
commit c6e54a3
Show file tree

Hide file tree

Showing 8 changed files with 51 additions and 16 deletions.
diff --git a/roles/base/tasks/redhat_tasks.yml b/roles/base/tasks/redhat_tasks.yml
@@ -10,6 +10,7 @@
     update_cache: true
     state: latest
   with_items:
+    - yum-utils
     - ntp
     - unzip
     - bzip2

diff --git a/roles/contiv_cluster/defaults/main.yml b/roles/contiv_cluster/defaults/main.yml
@@ -9,7 +9,7 @@ collins_guest_port: 9000
 clusterm_args_file: "clusterm.args"
 clusterm_conf_file: "clusterm.conf"
 
-contiv_cluster_version: "v0.1-05-12-2016.08-27-16.UTC"
+contiv_cluster_version: "v0.1-05-14-2016.00-33-02.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
@@ -16,7 +16,7 @@ bgp_port: 179
 vxlan_port: 4789
 netplugin_rule_comment: "contiv network traffic"
 
-contiv_network_version: "v0.1-05-08-2016.20-28-46.UTC"
+contiv_network_version: "v0.1-05-16-2016.08-29-25.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/contiv_network/tasks/ovs.yml b/roles/contiv_network/tasks/ovs.yml
@@ -8,15 +8,15 @@
     url: "{{ item.url }}"
   with_items:
     - {
-        url: "https://cisco.box.com/shared/static/51eo9dcw04qx2y1f14n99y4yt5kug3q4.rpm",
-        dest: /tmp/openvswitch-2.3.1-1.x86_64.rpm
+        url: "https://cisco.box.com/shared/static/zzmpe1zesdpf270k9pml40rlm4o8fs56.rpm",
+        dest: /tmp/openvswitch-2.3.1-2.el7.x86_64.rpm
       }
   when: ansible_os_family == "RedHat"
   tags:
     - prebake-for-dev
 
 - name: install ovs (redhat)
-  yum: name=/tmp/openvswitch-2.3.1-1.x86_64.rpm state=present
+  yum: name=/tmp/openvswitch-2.3.1-2.el7.x86_64.rpm state=present
   when: ansible_os_family == "RedHat"
   tags:
     - prebake-for-dev

diff --git a/roles/contiv_storage/defaults/main.yml b/roles/contiv_storage/defaults/main.yml
@@ -2,7 +2,7 @@
 
 # Role defaults for contiv_storage
 
-contiv_storage_version: "v0.0.0-05-12-2016.08-24-33.UTC"
+contiv_storage_version: "v0.0.0-05-12-2016.07-23-53.UTC"
 contiv_storage_tar_file: "volplugin-{{ contiv_storage_version }}.tar.bz2"
 contiv_storage_src_file: "https://github.com/contiv/volplugin/releases/download/{{ contiv_storage_version }}/{{ contiv_storage_tar_file }}"
 contiv_storage_dest_file: "/tmp/{{ contiv_storage_tar_file }}"
diff --git a/roles/docker/tasks/main.yml b/roles/docker/tasks/main.yml
@@ -9,20 +9,12 @@
   tags:
     - prebake-for-dev
 
-- name: install docker (debian)
-  shell: curl https://get.docker.com | sed 's/docker-engine/--force-yes docker-engine={{ docker_version }}-0~{{ ansible_distribution_release }}/' | bash
+- include: ubuntu_install_tasks.yml
   when: (ansible_os_family == "Debian") and not (docker_installed_version.stdout | match("Docker version {{ docker_version }}, build.*"))
   tags:
     - prebake-for-dev
 
-- name: remove docker (redhat)
-  yum: name=docker-engine state=absent
-  when: (ansible_os_family == "RedHat") and not (docker_installed_version.stdout | match("Docker version {{ docker_version }}, build.*"))
-  tags:
-    - prebake-for-dev
-
-- name: install docker (redhat)
-  shell: curl https://get.docker.com | sed 's/docker-engine/docker-engine-{{ docker_version }}/' | bash
+- include: redhat_install_tasks.yml
   when: (ansible_os_family == "RedHat") and not (docker_installed_version.stdout | match("Docker version {{ docker_version }}, build.*"))
   tags:
     - prebake-for-dev

diff --git a/roles/docker/tasks/redhat_install_tasks.yml b/roles/docker/tasks/redhat_install_tasks.yml
@@ -0,0 +1,22 @@
+---
+# This role contains tasks for installing docker service
+#
+
+- name: add docker's public key for CS-engine (redhat)
+  rpm_key:
+    key: "https://sks-keyservers.net/pks/lookup?op=get&search=0xee6d536cf7dc86e2d7d56f59a178ac6c6238f52e"
+    state: present
+    validate_certs: "{{ validate_certs }}"
+
+- name: add docker CS-engine repos (redhat)
+  shell: yum-config-manager --add-repo https://packages.docker.com/{{ item }}/yum/repo/main/centos/7
+  become: true
+  with_items:
+    - "1.10"
+    - "1.11"
+
+- name: remove docker (redhat)
+  yum: name=docker-engine state=absent
+
+- name: install docker (redhat)
+  shell: curl https://get.docker.com | sed 's/docker-engine/docker-engine-{{ docker_version }}/' | bash
diff --git a/roles/docker/tasks/ubuntu_install_tasks.yml b/roles/docker/tasks/ubuntu_install_tasks.yml
@@ -0,0 +1,20 @@
+---
+# This role contains tasks for installing docker service
+#
+
+- name: add docker's public key for CS-engine (debian)
+  apt_key:
+    url: "https://sks-keyservers.net/pks/lookup?op=get&search=0xee6d536cf7dc86e2d7d56f59a178ac6c6238f52e"
+    state: present
+    validate_certs: "{{ validate_certs }}"
+
+- name: add docker CS-engine repos (debian)
+  apt_repository:
+    repo: "deb https://packages.docker.com/{{ item }}/apt/repo ubuntu-{{ ansible_distribution_release }} main"
+    state: present
+  with_items:
+    - "1.10"
+    - "1.11"
+
+- name: install docker (debian)
+  shell: curl https://get.docker.com | sed 's/docker-engine/--force-yes docker-engine={{ docker_version }}-0~{{ ansible_distribution_release }}/' | bash