diff --git a/deploy-guide/source/deploymenthost.rst b/deploy-guide/source/deploymenthost.rst index fc9db4b8a9..10d8f27a51 100644 --- a/deploy-guide/source/deploymenthost.rst +++ b/deploy-guide/source/deploymenthost.rst @@ -25,7 +25,6 @@ Install one of the following supported operating systems on the deployment hosts: * `Ubuntu server 16.04 (Xenial Xerus) LTS 64-bit `_ -* `Ubuntu server 14.04 (Trusty Tahr) LTS 64-bit `_ Configure at least one network interface to access the Internet or suitable local repositories. diff --git a/deploy-guide/source/overview-requirements.rst b/deploy-guide/source/overview-requirements.rst index aa1e3d2f23..5cc8130785 100644 --- a/deploy-guide/source/overview-requirements.rst +++ b/deploy-guide/source/overview-requirements.rst @@ -11,16 +11,9 @@ Software requirements Ensure that all hosts within an OpenStack-Ansible (OSA) environment meet the following minimum requirements: -* Ubuntu 16.04 LTS (Xenial Xerus) or Ubuntu 14.04 LTS (Trusty Tahr) +* Ubuntu 16.04 LTS (Xenial Xerus) - * OpenStack-Ansible is tested regularly against the latest point releases of - Ubuntu 16.04 LTS and Ubuntu 14.04 LTS. - * Linux kernel version ``3.13.0-34-generic`` or later is required. - * For Trusty hosts, you must enable the ``trusty-backports`` or the - repositories in ``/etc/apt/sources.list`` or - ``/etc/apt/sources.list.d/``. For detailed instructions, see the - `Ubuntu documentation `_. +* Linux kernel version ``3.13.0-34-generic`` or later is required. * Secure Shell (SSH) client and server that support public key authentication diff --git a/deploy-guide/source/targethosts-prepare.rst b/deploy-guide/source/targethosts-prepare.rst index 8817d04234..8923daa8d7 100644 --- a/deploy-guide/source/targethosts-prepare.rst +++ b/deploy-guide/source/targethosts-prepare.rst @@ -13,7 +13,6 @@ Install one of the following supported operating systems on the target host: * Ubuntu server 16.04 (Xenial Xerus) LTS 64-bit -* Ubuntu server 14.04 (Trusty Tahr) LTS 64-bit Configure at least one network interface to access the Internet or suitable local repositories. diff --git a/doc/source/developer-docs/installation-hosts-limited-connectivity.rst b/doc/source/developer-docs/installation-hosts-limited-connectivity.rst index ad8a38964b..d5c0039cf3 100644 --- a/doc/source/developer-docs/installation-hosts-limited-connectivity.rst +++ b/doc/source/developer-docs/installation-hosts-limited-connectivity.rst @@ -54,9 +54,8 @@ packages. We advise mirroring the repositories that host these packages. Ubuntu repositories to mirror: -- trusty -- trusty-updates -- trusty-backports +- xenial +- xenial-updates Galera-related repositories to mirror: diff --git a/doc/source/developer-docs/scripts.rst b/doc/source/developer-docs/scripts.rst index e765b416a9..f4f3d726bf 100644 --- a/doc/source/developer-docs/scripts.rst +++ b/doc/source/developer-docs/scripts.rst @@ -213,8 +213,8 @@ following jobs: * ``gate-openstack-ansible-linters-ubuntu-xenial``: This job executes the `Lint Tests`_. -* ``gate-openstack-ansible-openstack-ansible-aio-ubuntu-trusty``: where - ``aio`` is the scenario, ``ubuntu`` is the distribution, and ``trusty`` +* ``gate-openstack-ansible-openstack-ansible-aio-ubuntu-xenial``: where + ``aio`` is the scenario, ``ubuntu`` is the distribution, and ``xenial`` is the version of the distribution. The same test is executed against multiple distribution versions, and diff --git a/playbooks/openstack-hosts-setup.yml b/playbooks/openstack-hosts-setup.yml index cd4aef997f..ff4dfe7d87 100644 --- a/playbooks/openstack-hosts-setup.yml +++ b/playbooks/openstack-hosts-setup.yml @@ -22,10 +22,9 @@ - name: Check for a supported Operating System assert: that: - - ansible_distribution_release | lower == 'trusty' or - ansible_distribution_release | lower == 'xenial' or - "{{ ansible_os_family | lower }}-{{ ansible_distribution_major_version | lower }}" == "redhat-7" - msg: "The only supported platforms for this release are Ubuntu 14.04 LTS (Trusty), Ubuntu 16.04 LTS (Xenial) and CentOS 7 (WIP)" + - (ansible_distribution == 'Ubuntu' and ansible_distribution_release == 'xenial') or + (ansible_os_family == 'RedHat' and ansible_distribution_major_version == '7') + msg: "The only supported platforms for this release are Ubuntu 16.04 LTS (Xenial) and CentOS 7 (WIP)" roles: - role: "openstack_hosts" tags: diff --git a/playbooks/roles/system_crontab_coordination/meta/main.yml b/playbooks/roles/system_crontab_coordination/meta/main.yml index 234099dfd5..a646c2755d 100644 --- a/playbooks/roles/system_crontab_coordination/meta/main.yml +++ b/playbooks/roles/system_crontab_coordination/meta/main.yml @@ -22,7 +22,7 @@ galaxy_info: platforms: - name: Ubuntu versions: - - trusty + - xenial categories: - cloud - openstack diff --git a/tests/roles/bootstrap-host/tasks/check-requirements.yml b/tests/roles/bootstrap-host/tasks/check-requirements.yml index 5691ec9a0c..5cf0d97fde 100644 --- a/tests/roles/bootstrap-host/tasks/check-requirements.yml +++ b/tests/roles/bootstrap-host/tasks/check-requirements.yml @@ -16,10 +16,9 @@ - name: Check for a supported Operating System assert: that: - - ansible_distribution | lower == 'ubuntu' - - ansible_distribution_release | lower == 'trusty' or - ansible_distribution_release | lower == 'xenial' - msg: "The only supported platforms for this release are Ubuntu 14.04 LTS (Trusty) and Ubuntu 16.04 LTS (Xenial)" + - (ansible_distribution == 'Ubuntu' and ansible_distribution_release == 'xenial') or + (ansible_os_family == 'RedHat' and ansible_distribution_major_version == '7') + msg: "The only supported platforms for this release are Ubuntu 16.04 LTS (Xenial) and CentOS 7 (WIP)" tags: - check-operating-system diff --git a/tests/roles/bootstrap-host/templates/user_variables.aio.yml.j2 b/tests/roles/bootstrap-host/templates/user_variables.aio.yml.j2 index d427d13d07..cd70c077f5 100644 --- a/tests/roles/bootstrap-host/templates/user_variables.aio.yml.j2 +++ b/tests/roles/bootstrap-host/templates/user_variables.aio.yml.j2 @@ -83,7 +83,7 @@ repo_build_git_cache: {{ repo_build_git_cache }} # The container backing store is set to 'overlayfs' to speed up the # AIO build time. -lxc_container_backing_store: "{{ ((ansible_kernel | version_compare('3.18.0-0-generic', '<')) or (ansible_distribution_release | lower == 'trusty')) | ternary('dir', 'overlayfs') }}" +lxc_container_backing_store: "{{ (ansible_kernel | version_compare('3.18.0-0-generic', '<')) | ternary('dir', 'overlayfs') }}" ## Enable LBaaSv2 in the AIO neutron_plugin_base: