Merge "Add 16.04 support"

defaults/main.yml

@@ -150,26 +150,6 @@ ironic_pip_packages:
   - pycrypto
   - python-memcached
 
-ironic_api_apt_packages:
-  - apache2
-  - apache2-utils
-  - libapache2-mod-wsgi
-
-ironic_conductor_apt_packages:
-  - libxml2-dev
-  - syslinux
-  - syslinux-common
-  - libxslt1-dev
-  - qemu-utils
-  - libpq-dev
-  - python-yaml
-  - open-iscsi
-  - ipmitool
-  - tftpd-hpa
-
-ironic_conductor_standalone_apt_packages:
-  - isc-dhcp-server
-
 ## RabbitMQ info
 ironic_rabbitmq_userid: ironic
 ironic_rabbitmq_vhost: /ironic

meta/main.yml

@@ -22,6 +22,7 @@ galaxy_info:
   - name: Ubuntu
     versions:
     - trusty
+    - xenial
   categories:
   - cloud
   - baremetal
@@ -33,6 +34,8 @@ dependencies:
   - role: pip_install
     when:
       - ironic_developer_mode | bool
-  - apt_package_pinning
+  - role: apt_package_pinning
+    when:
+      - ansible_pkg_mgr == 'apt'
   - galera_client
   - openstack_openrc

releasenotes/notes/ironic-1604-support-b9ebb12ee4d78275.yaml

@@ -0,0 +1,3 @@
+---
+features:
+  - The ``ironic`` role now supports Ubuntu 16.04 and SystemD.

tasks/ironic_api_install.yml

@@ -13,15 +13,11 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-- name: Install ironic-api specific apt packages
+- include: ironic_install_apt.yml
-  apt:
+  when:
-    pkg: "{{ item }}"
+    - ansible_pkg_mgr == 'apt'
-    state: latest
+  vars:
-  register: install_packages
+    apt_pkgs: "{{ ironic_api_apt_packages }}"
-  until: install_packages|success
-  retries: 5
-  delay: 2
-  with_items: "{{ ironic_api_apt_packages }}"
   tags:
     - ironic-install
     - ironic-api

tasks/ironic_conductor_install.yml

@@ -13,30 +13,22 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-- name: Install ironic-conductor specific apt packages
+- include: ironic_install_apt.yml
-  apt:
+  when:
-    pkg: "{{ item }}"
+    - ansible_pkg_mgr == 'apt'
-    state: latest
+  vars:
-  register: install_packages
+    apt_pkgs: "{{ ironic_conductor_apt_packages }}"
-  until: install_packages|success
-  retries: 5
-  delay: 2
-  with_items: "{{ ironic_conductor_apt_packages }}"
   tags:
     - ironic-install
     - ironic-conductor
     - ironic-apt-packages
 
-- name: Install ironic-conductor standalone apt packages
+- include: ironic_install_apt.yml
-  apt:
+  when:
-    pkg: "{{ item }}"
+    - ansible_pkg_mgr == 'apt'
-    state: latest
+    - ironic_standalone
-  register: install_packages
+  vars:
-  until: install_packages|success
+    apt_pkgs: "{{ ironic_conductor_standalone_apt_packages }}"
-  retries: 5
-  delay: 2
-  with_items: "{{ ironic_conductor_standalone_apt_packages }}"
-  when: ironic_standalone
   tags:
     - ironic-install
     - ironic-conductor

tasks/ironic_conductor_post_install.yml

@@ -56,7 +56,7 @@
 ## there is no idempotent way of doing this without several tasks
 ## which is a wasted effort.
 - name: Copy syslinux pxlinux.0
-  command: cp /usr/lib/syslinux/pxelinux.0 /tftpboot/pxelinux.0
+  command: "cp {{ ironic_pxelinux_path }} /tftpboot/pxelinux.0"
   tags:
     - tftpd-hpa
 
@@ -65,6 +65,6 @@
 ## there is no idempotent way of doing this without several tasks
 ## which is a wasted effort.
 - name: Copy syslinux chain.c32
-  command: cp /usr/lib/syslinux/chain.c32 /tftpboot/chain.c32
+  command: "cp {{ ironic_chainc32_path }} /tftpboot/chain.c32"
   tags:
     - tftpd-hpa

tasks/ironic_init.yml

@@ -13,7 +13,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-- include: ironic_upstart_common_init.yml
+- include: ironic_init_common.yml
   vars:
     program_name: "{{ ironic_conductor_program_name }}"
     service_name: "{{ ironic_service_name }}"

tasks/ironic_init_common.yml

@@ -0,0 +1,31 @@
+---
+# Copyright 2016, Rackspace US, Inc.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+- include: ironic_init_upstart.yml
+  when: pid1_name == "init"
+  tags:
+    - ironic-init
+
+- include: ironic_init_systemd.yml
+  when: pid1_name == "systemd"
+  tags:
+    - ironic-init
+
+- name: Load service
+  service:
+   name: "{{ program_name }}"
+   enabled: "yes"
+  notify:
+    - Restart ironic services

tasks/ironic_init_systemd.yml

@@ -0,0 +1,48 @@
+---
+# Copyright 2016, Rackspace US, Inc.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+- name: Create ironic TEMP dirs
+  file:
+    path: "{{ item.path }}/{{ program_name }}"
+    state: directory
+    owner: "{{ system_user }}"
+    group: "{{ system_group }}"
+    mode: "2755"
+  with_items:
+    - { path: "/var/run" }
+    - { path: "/var/lock" }
+
+- name: Create tempfile.d entry
+  template:
+    src: "ironic-systemd-tempfiles.j2"
+    dest: "/etc/tmpfiles.d/ironic.conf"
+    mode: "0644"
+    owner: "root"
+    group: "root"
+
+- name: Place the systemd init script
+  template:
+    src: "ironic-systemd-init.j2"
+    dest: "/etc/systemd/system/{{ program_name }}.service"
+    mode: "0644"
+    owner: "root"
+    group: "root"
+  register: systemd_init
+
+- name: Reload the systemd daemon
+  command: "systemctl daemon-reload"
+  when: systemd_init | changed
+  notify:
+    - Restart ironic services

tasks/ironic_init_upstart.yml

@@ -20,27 +20,13 @@
     mode: "0644"
     owner: "root"
     group: "root"
+  register: upstart_init
   notify:
     - Restart ironic services
-  tags:
-    - upstart-init
-    - ironic-init
 
 - name: Reload init scripts
   shell: |
     initctl reload-configuration
+  when: upstart_init | changed
   notify:
     - Restart ironic services
-  tags:
-    - upstart-init
-    - ironic-init
-
-- name: Load service
-  service:
-   name: "{{ program_name }}"
-   enabled: "yes"
-  notify:
-    - Restart ironic services
-  tags:
-    - upstart-init
-    - ironic-init

tasks/ironic_install.yml

@@ -26,6 +26,17 @@
     - ironic-install
     - ironic-pip-packages
 
+- include: ironic_install_apt.yml
+  when:
+    - ansible_pkg_mgr == 'apt'
+    - ironic_developer_mode | bool
+  vars:
+    apt_pkgs: "{{ ironic_developer_apt_packages }}"
+  tags:
+    - ironic-install
+    - ironic-apt
+    - ironic-apt-packages
+
 - name: Clone requirements git repository
   git:
     repo: "{{ ironic_requirements_git_repo }}"

tasks/ironic_install_apt.yml

@@ -0,0 +1,39 @@
+---
+# Copyright 2016, Rackspace US, Inc.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+- name: Update apt sources
+  apt:
+    update_cache: yes
+    cache_valid_time: "{{ cache_timeout }}"
+  register: apt_update
+  until: apt_update|success
+  retries: 5
+  delay: 2
+  tags:
+    - ironic-apt-packages
+
+- name: Install apt packages
+  apt:
+    pkg: "{{ item }}"
+    state: latest
+  register: install_packages
+  until: install_packages|success
+  retries: 5
+  delay: 2
+  with_items:
+    - "{{ apt_pkgs }}"
+  tags:
+    - ironic-install
+    - ironic-apt-packages

tasks/main.yml

@@ -13,33 +13,56 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-  - include: ironic_pre_install.yml
+- name: Check init system
-  - include: ironic_install.yml
+  command: cat /proc/1/comm
+  register: _pid1_name
+  tags:
+    - always
 
-  - include: ironic_api_install.yml
+- name: Set the name of pid1
-    when: >
+  set_fact:
-      inventory_hostname in groups['ironic_api']
+    pid1_name: "{{ _pid1_name.stdout }}"
+  tags:
+    - always
 
-  - include: ironic_conductor_install.yml
+- name: Gather variables for each operating system
-    when: >
+  include_vars: "{{ item }}"
-      inventory_hostname in groups['ironic_conductor']
+  with_first_found:
+    - "{{ ansible_distribution | lower }}-{{ ansible_distribution_version | lower }}.yml"
+    - "{{ ansible_distribution | lower }}-{{ ansible_distribution_major_version | lower }}.yml"
+    - "{{ ansible_os_family | lower }}-{{ ansible_distribution_major_version | lower }}.yml"
+    - "{{ ansible_distribution | lower }}.yml"
+    - "{{ ansible_os_family | lower }}.yml"
+  tags:
+    - always
 
-  - include: ironic_post_install.yml
+- include: ironic_pre_install.yml
+- include: ironic_install.yml
 
-  - include: ironic_api_post_install.yml
+- include: ironic_api_install.yml
-    when: >
+  when: >
-      inventory_hostname in groups['ironic_api']
+    inventory_hostname in groups['ironic_api']
 
-  - include: ironic_conductor_post_install.yml
+- include: ironic_conductor_install.yml
-    when: >
+  when: >
-      inventory_hostname in groups['ironic_conductor']
+    inventory_hostname in groups['ironic_conductor']
 
-  - include: ironic_db_setup.yml
+- include: ironic_post_install.yml
-    when: >
-      inventory_hostname == groups['ironic_conductor'][0]
 
-  - include: ironic_upstart_init.yml
+- include: ironic_api_post_install.yml
+  when: >
+    inventory_hostname in groups['ironic_api']
 
-  - include: ironic_service_setup.yml
+- include: ironic_conductor_post_install.yml
-    when: >
+  when: >
-      inventory_hostname == groups['ironic_api'][0]
+    inventory_hostname in groups['ironic_conductor']
+
+- include: ironic_db_setup.yml
+  when: >
+    inventory_hostname == groups['ironic_conductor'][0]
+
+- include: ironic_init.yml
+
+- include: ironic_service_setup.yml
+  when: >
+    inventory_hostname == groups['ironic_api'][0]

templates/ironic-systemd-init.j2

@@ -0,0 +1,25 @@
+# {{ ansible_managed }}
+
+[Unit]
+Description=ironic openstack service
+After=syslog.target
+After=network.target
+
+[Service]
+Type=simple
+User={{ system_user }}
+Group={{ system_group }}
+
+{% if program_override is defined %}
+ExecStart={{ program_override }} {{ program_config_options|default('') }} --log-file=/var/log/ironic/{{ program_name }}.log
+{% else %}
+ExecStart={{ ironic_bin }}/{{ program_name }} {{ program_config_options|default('') }} --log-file=/var/log/ironic/{{ program_name }}.log
+{% endif %}
+
+# Give a reasonable amount of time for the server to start up/shut down
+TimeoutSec=300
+Restart=on-failure
+RestartSec=150
+
+[Install]
+WantedBy=multi-user.target

templates/ironic-systemd-tempfiles.j2

@@ -0,0 +1,4 @@
+# {{ ansible_managed }}
+
+D /var/lock/{{ program_name }} 2755 {{ system_user }} {{ system_group }}
+D /var/run/{{ program_name }} 2755 {{ system_user }} {{ system_group }}

vars/ubuntu-14.04.yml

@@ -0,0 +1,42 @@
+---
+# Copyright 2016, Rackspace US, Inc.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+cache_timeout: 600
+
+ironic_developer_apt_packages:
+  - git-core
+
+ironic_api_apt_packages:
+  - apache2
+  - apache2-utils
+  - libapache2-mod-wsgi
+
+ironic_conductor_apt_packages:
+  - libxml2-dev
+  - syslinux
+  - syslinux-common
+  - libxslt1-dev
+  - qemu-utils
+  - libpq-dev
+  - python-yaml
+  - open-iscsi
+  - ipmitool
+  - tftpd-hpa
+
+ironic_conductor_standalone_apt_packages:
+  - isc-dhcp-server
+
+ironic_pxelinux_path: "/usr/lib/syslinux/pxelinux.0"
+ironic_chainc32_path: "/usr/lib/syslinux/chain.c32"

vars/ubuntu-16.04.yml

@@ -0,0 +1,44 @@
+---
+# Copyright 2016, Rackspace US, Inc.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+cache_timeout: 600
+
+ironic_developer_apt_packages:
+  - git-core
+  - libffi-dev
+
+ironic_api_apt_packages:
+  - apache2
+  - apache2-utils
+  - libapache2-mod-wsgi
+
+ironic_conductor_apt_packages:
+  - libxml2-dev
+  - syslinux
+  - syslinux-common
+  - pxelinux
+  - libxslt1-dev
+  - qemu-utils
+  - libpq-dev
+  - python-yaml
+  - open-iscsi
+  - ipmitool
+  - tftpd-hpa
+
+ironic_conductor_standalone_apt_packages:
+  - isc-dhcp-server
+
+ironic_pxelinux_path: "/usr/lib/PXELINUX/pxelinux.0"
+ironic_chainc32_path: "/usr/lib/syslinux/modules/efi64/chain.c32"