diff --git a/doc/source/install/index.rst b/doc/source/install/index.rst index 5237c284c..4c4bbcbef 100644 --- a/doc/source/install/index.rst +++ b/doc/source/install/index.rst @@ -20,7 +20,7 @@ Installation and use of bifrost is split into roughly three steps: Supported operating systems: -* Ubuntu 14.04, 14.10, 15.04, 16.04 +* Ubuntu 16.04, 18.04 * Red Hat Enterprise Linux (RHEL) 7 * CentOS 7 * Fedora 22 diff --git a/playbooks/roles/bifrost-ironic-install/defaults/required_defaults_Ubuntu_15.04.yml b/playbooks/roles/bifrost-ironic-install/defaults/required_defaults_Ubuntu_15.04.yml deleted file mode 100644 index ff67dda1c..000000000 --- a/playbooks/roles/bifrost-ironic-install/defaults/required_defaults_Ubuntu_15.04.yml +++ /dev/null @@ -1,4 +0,0 @@ ---- -init_template: systemd_template.j2 -init_dest_dir: /lib/systemd/system/ -init_ext: .service diff --git a/playbooks/roles/bifrost-ironic-install/defaults/required_defaults_Ubuntu_15.10.yml b/playbooks/roles/bifrost-ironic-install/defaults/required_defaults_Ubuntu_15.10.yml deleted file mode 100644 index ff67dda1c..000000000 --- a/playbooks/roles/bifrost-ironic-install/defaults/required_defaults_Ubuntu_15.10.yml +++ /dev/null @@ -1,4 +0,0 @@ ---- -init_template: systemd_template.j2 -init_dest_dir: /lib/systemd/system/ -init_ext: .service diff --git a/playbooks/roles/bifrost-ironic-install/defaults/required_defaults_Ubuntu_16.04.yml b/playbooks/roles/bifrost-ironic-install/defaults/required_defaults_Ubuntu_16.04.yml index 643075f6d..971fd6b69 100644 --- a/playbooks/roles/bifrost-ironic-install/defaults/required_defaults_Ubuntu_16.04.yml +++ b/playbooks/roles/bifrost-ironic-install/defaults/required_defaults_Ubuntu_16.04.yml @@ -4,9 +4,10 @@ init_dest_dir: /lib/systemd/system/ init_ext: .service required_packages: - mariadb-server - - python-dev - - python-mysqldb - - python-configparser + - python3-dev + - python3-mysqldb + - python3-pymysql + - python3-setuptools - libffi-dev - libxslt1-dev - libssl-dev @@ -25,12 +26,9 @@ required_packages: - genisoimage - kpartx - qemu-utils - - python-openwsman - debootstrap - uuid-runtime - curl - - python-pip - - python-pymysql - dnsmasq # NOTE(TheJulia): The above entry for dnsmasq must be the last entry in the # package list as the installation causes name resolution changes that can diff --git a/playbooks/roles/bifrost-ironic-install/defaults/required_defaults_Ubuntu_18.04.yml b/playbooks/roles/bifrost-ironic-install/defaults/required_defaults_Ubuntu_18.04.yml index 667f49af4..5a956497b 100644 --- a/playbooks/roles/bifrost-ironic-install/defaults/required_defaults_Ubuntu_18.04.yml +++ b/playbooks/roles/bifrost-ironic-install/defaults/required_defaults_Ubuntu_18.04.yml @@ -4,9 +4,10 @@ init_dest_dir: /lib/systemd/system/ init_ext: .service required_packages: - mariadb-server - - python-dev - - python-mysqldb - - python-configparser + - python3-dev + - python3-mysqldb + - python3-pymysql + - python3-setuptools - libffi-dev - libxslt1-dev - libssl-dev @@ -29,8 +30,6 @@ required_packages: - debootstrap - uuid-runtime - curl - - python-pip - - python-pymysql - dnsmasq # NOTE(TheJulia): The above entry for dnsmasq must be the last entry in the # package list as the installation causes name resolution changes that can diff --git a/playbooks/roles/bifrost-ironic-install/tasks/install.yml b/playbooks/roles/bifrost-ironic-install/tasks/install.yml index c1ecb4b80..b126d662f 100644 --- a/playbooks/roles/bifrost-ironic-install/tasks/install.yml +++ b/playbooks/roles/bifrost-ironic-install/tasks/install.yml @@ -115,7 +115,6 @@ - skip_install is not defined - enable_venv | bool == false - (ansible_distribution == 'CentOS' and ansible_distribution_major_version|version_compare('7', '<=')) or - (ansible_distribution == 'Ubuntu' and ansible_distribution_version|version_compare('14.10', '==')) or (ansible_distribution == 'Fedora' and ansible_distribution_version|version_compare('25', '>=')) - name: "Install extra packages for ironic" diff --git a/playbooks/roles/bifrost-keystone-install/defaults/required_defaults_Ubuntu_15.04.yml b/playbooks/roles/bifrost-keystone-install/defaults/required_defaults_Ubuntu_15.04.yml deleted file mode 100644 index ff67dda1c..000000000 --- a/playbooks/roles/bifrost-keystone-install/defaults/required_defaults_Ubuntu_15.04.yml +++ /dev/null @@ -1,4 +0,0 @@ ---- -init_template: systemd_template.j2 -init_dest_dir: /lib/systemd/system/ -init_ext: .service diff --git a/playbooks/roles/bifrost-keystone-install/defaults/required_defaults_Ubuntu_15.10.yml b/playbooks/roles/bifrost-keystone-install/defaults/required_defaults_Ubuntu_15.10.yml deleted file mode 100644 index ff67dda1c..000000000 --- a/playbooks/roles/bifrost-keystone-install/defaults/required_defaults_Ubuntu_15.10.yml +++ /dev/null @@ -1,4 +0,0 @@ ---- -init_template: systemd_template.j2 -init_dest_dir: /lib/systemd/system/ -init_ext: .service diff --git a/playbooks/roles/bifrost-keystone-install/defaults/required_defaults_Ubuntu_16.04.yml b/playbooks/roles/bifrost-keystone-install/defaults/required_defaults_Ubuntu_16.04.yml index 90104d087..2f199ddaa 100644 --- a/playbooks/roles/bifrost-keystone-install/defaults/required_defaults_Ubuntu_16.04.yml +++ b/playbooks/roles/bifrost-keystone-install/defaults/required_defaults_Ubuntu_16.04.yml @@ -4,9 +4,10 @@ init_dest_dir: /lib/systemd/system/ init_ext: .service required_packages: - mariadb-server - - python-dev - - python-mysqldb - - python-configparser + - python3-dev + - python3-mysqldb + - python3-pymysql + - python3-setuptools - libffi-dev - libxslt1-dev - libssl-dev @@ -15,6 +16,4 @@ required_packages: - uwsgi - uwsgi-core # - python-django-uwsgi - This may not be needed - - uwsgi-plugin-python - - python-pip - - python-pymysql + - uwsgi-plugin-python3 diff --git a/playbooks/roles/bifrost-keystone-install/defaults/required_defaults_Ubuntu_18.04.yml b/playbooks/roles/bifrost-keystone-install/defaults/required_defaults_Ubuntu_18.04.yml index 90104d087..205019e2d 100644 --- a/playbooks/roles/bifrost-keystone-install/defaults/required_defaults_Ubuntu_18.04.yml +++ b/playbooks/roles/bifrost-keystone-install/defaults/required_defaults_Ubuntu_18.04.yml @@ -4,9 +4,10 @@ init_dest_dir: /lib/systemd/system/ init_ext: .service required_packages: - mariadb-server - - python-dev - - python-mysqldb - - python-configparser + - python3-dev + - python3-mysqldb + - python3-pymysql + - python3-setuputils - libffi-dev - libxslt1-dev - libssl-dev @@ -15,6 +16,4 @@ required_packages: - uwsgi - uwsgi-core # - python-django-uwsgi - This may not be needed - - uwsgi-plugin-python - - python-pip - - python-pymysql + - uwsgi-plugin-python3