diff --git a/ansible/roles/baremetal/tasks/install.yml b/ansible/roles/baremetal/tasks/install.yml index 240a356ac6..ea3e7d9a9c 100644 --- a/ansible/roles/baremetal/tasks/install.yml +++ b/ansible/roles/baremetal/tasks/install.yml @@ -35,21 +35,6 @@ with_items: "{{ debian_pkg_install }}" 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 package: name={{item}} state=installed become: True diff --git a/ansible/roles/baremetal/tasks/post-install.yml b/ansible/roles/baremetal/tasks/post-install.yml index d85f583445..fec915dfe8 100644 --- a/ansible/roles/baremetal/tasks/post-install.yml +++ b/ansible/roles/baremetal/tasks/post-install.yml @@ -5,35 +5,17 @@ state=directory recurse=yes 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 become: True template: src=docker_systemd_service.j2 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 - name: Reload docker service file become: True 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 stat: path=/etc/apparmor.d/usr.sbin.libvirtd