openstack/kolla-ansible
Code Issues Proposed changes

Merge "Remove Ubuntu Trusty 14.04 related code"

Browse Source
This commit is contained in:
Jenkins 2017-06-28 15:49:41 +00:00 committed by Gerrit Code Review
commit 161607f97c
2 changed files with 0 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
ansible/roles/baremetal/tasks/install.yml
View File

@ -35,21 +35,6 @@
with_items: "{{ debian_pkg_install }}" with_items: "{{ debian_pkg_install }}"
when: ansible_os_family == 'Debian' when: ansible_os_family == 'Debian'
- name: Install wily kernel
package: name=linux-generic-lts-wily state=latest
register: kernel_updated
become: True
when:
- ansible_distribution|lower == "ubuntu" | bool
- ansible_distribution_release|lower == "trusty" | bool
- name: Set reboot required
set_fact:
reboot_required: True
when:
- kernel_updated is defined
- kernel_updated.changed
- name: Install deltarpm packages - name: Install deltarpm packages
package: name={{item}} state=installed package: name={{item}} state=installed
become: True become: True

18
ansible/roles/baremetal/tasks/post-install.yml
View File

@ -5,35 +5,17 @@
state=directory state=directory
recurse=yes recurse=yes
become: True become: True
when: (ansible_distribution == "Ubuntu" and ansible_distribution_major_version > "14") or
(ansible_os_family == "RedHat") or (ansible_distribution == "Debian")
- name: Configure docker service - name: Configure docker service
become: True become: True
template: template:
src=docker_systemd_service.j2 src=docker_systemd_service.j2
dest=/etc/systemd/system/docker.service.d/kolla.conf dest=/etc/systemd/system/docker.service.d/kolla.conf
when: (ansible_distribution == "Ubuntu" and ansible_distribution_major_version > "14") or
(ansible_os_family == "RedHat") or (ansible_distribution == "Debian")
register: docker_configured register: docker_configured
- name: Reload docker service file - name: Reload docker service file
become: True become: True
command: systemctl daemon-reload command: systemctl daemon-reload
when: (ansible_distribution == "Ubuntu" and ansible_distribution_major_version > "14") or
(ansible_os_family == "RedHat") or (ansible_distribution == "Debian")
- name: Configure docker service
become: True
template:
src=docker_defaults.j2
dest=/etc/default/docker
when: (ansible_distribution == "Ubuntu" and ansible_distribution_major_version < "15")
- name: Docker mount shared
command: mount --make-shared /run
become: True
when: (ansible_distribution == "Ubuntu" and ansible_distribution_major_version < "15")
- name: Get stat of libvirtd apparmor profile - name: Get stat of libvirtd apparmor profile
stat: path=/etc/apparmor.d/usr.sbin.libvirtd stat: path=/etc/apparmor.d/usr.sbin.libvirtd