Remove Trusty support from os_neutron role

Change-Id: I68190e4d5bbb99ceaa139229fa39b7499644df6e
Implements: blueprint trusty-removal

Vagrantfile

@@ -10,7 +10,7 @@
 #  TOX_ENV=func_ovs vagrant up
 #
 Vagrant.configure(2) do |config|
-  config.vm.box = "ubuntu/trusty64"
+  config.vm.box = "ubuntu/xenial64"
   config.vm.provider "virtualbox" do |v|
     v.memory = 2048
     v.cpus = 2

bindep.txt

@@ -32,7 +32,7 @@ libselinux-python [platform:rpm]
 # For SSL SNI support
 python-pyasn1               [platform:dpkg]
 python-openssl              [platform:dpkg]
-python-ndg-httpsclient      [platform:ubuntu !platform:ubuntu-trusty]
+python-ndg-httpsclient      [platform:ubuntu]
 python2-pyasn1              [platform:rpm]
 pyOpenSSL                   [platform:rpm]
 python-ndg_httpsclient      [platform:rpm]

doc/source/app-openvswitch.rst

@@ -39,7 +39,7 @@ Configuring bridges (Linux Bridge)
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
 The following is an example of how to configure a bridge (example: ``br-mgmt``)
-with a Linux Bridge on Ubuntu 14.04 or 16.04 LTS:
+with a Linux Bridge on Ubuntu 16.04 LTS:
 
 ``/etc/network/interfaces``
 
@@ -83,7 +83,7 @@ Another configuration method routes everything with Open vSwitch. The bridge
 (example: ``br-mgmt``) can be an Open vSwitch itself.
 
 The following is an example of how to configure a bridge (example: ``br-mgmt``)
-with Open vSwitch on Ubuntu 14.04 or 16.04 LTS: *
+with Open vSwitch on Ubuntu 16.04 LTS: *
 
 ``/etc/network/interfaces``
 

doc/source/index.rst

@@ -14,7 +14,7 @@ Neutron role for OpenStack-Ansible
 :tags: openstack, neutron, cloud, ansible
 :category: \*nix
 
-This role installs the following Upstart services:
+This role installs the following Systemd services:
 
   * neutron-server
   * neutron-agents

handlers/main.yml

@@ -17,7 +17,6 @@
   service:
     name: "{{ item.value.service_name }}"
     state: restarted
-    pattern: "{{ item.value.service_name }}"
   with_dict: "{{ neutron_services }}"
   failed_when: false
   notify:

meta/main.yml

@@ -22,7 +22,6 @@ galaxy_info:
   platforms:
     - name: Ubuntu
       versions:
-        - trusty
         - xenial
   categories:
     - cloud

tasks/calico_init.yml

@@ -24,8 +24,6 @@
   when:
     - neutron_services['calico-felix']['group'] in group_names
     - neutron_services['calico-felix'].service_en | bool
-  tags:
-    - upstart-init
 
 - include: neutron_init_common.yml
   vars:
@@ -38,5 +36,3 @@
   when:
     - neutron_services['calico-dhcp-agent']['group'] in group_names
     - neutron_services['calico-dhcp-agent'].service_en | bool
-  tags:
-    - upstart-init

tasks/neutron_db_setup.yml

@@ -41,7 +41,6 @@
   service:
     name: "neutron-server"
     state: stopped
-    pattern: "neutron-server"
   delegate_to: "{{ item }}"
   with_items: "{{ groups[neutron_services['neutron-server']['group']] }}"
   when: (neutron_migrations is defined and neutron_migrations['run_contract']|bool) or neutron_plugin_type.split('.')[0] != 'ml2'
@@ -76,7 +75,6 @@
   service:
     name: "neutron-server"
     state: started
-    pattern: "neutron-server"
   delegate_to: "{{ item }}"
   with_items: "{{ groups[neutron_services['neutron-server']['group']] }}"
   when: (neutron_migrations is defined and neutron_migrations['run_contract']|bool) or neutron_plugin_type.split('.')[0] != 'ml2'

tasks/neutron_init_common.yml

@@ -13,10 +13,6 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-- include: neutron_init_upstart.yml
-  when:
-    - ansible_service_mgr == 'upstart'
-
 - include: neutron_init_systemd.yml
   when:
     - ansible_service_mgr == 'systemd'

tasks/neutron_init_upstart.yml

@@ -1,27 +0,0 @@
----
-# 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: Place the init script
-  template:
-    src: "neutron-upstart-init.j2"
-    dest: "/etc/init/{{ program_name }}.conf"
-    mode: "0644"
-    owner: "root"
-    group: "root"
-  register: upstart_init
-
-- name: Reload init scripts
-  command: initctl reload-configuration
-  when: upstart_init | changed

templates/neutron-upstart-init.j2

@@ -1,42 +0,0 @@
-# {{ ansible_managed }}
-
-description "{{ program_name }}"
-author "Kevin Carter <kevin.carter@rackspace.com>"
-
-start on runlevel [2345]
-stop on runlevel [016]
-
-respawn
-respawn limit 10 5
-
-# Set the RUNBIN environment variable
-env RUNBIN="{{ neutron_bin }}/{{ program_name }}"
-
-# Change directory to service users home
-chdir "{{ service_home }}"
-
-# Pre start actions
-pre-start script
-  mkdir -p "/var/run/{{ program_name }}"
-  chown {{ system_user }}:{{ system_group }} "/var/run/{{ program_name }}"
-
-  mkdir -p "/var/lock/{{ program_name }}"
-  chown {{ system_user }}:{{ system_group }} "/var/lock/{{ program_name }}"
-
-  . {{ neutron_bin }}/activate
-
-
-end script
-
-# Post stop actions
-post-stop script
-  rm "/var/run/{{ program_name }}/{{ program_name }}.pid"
-end script
-
-# Run the start up job
-exec start-stop-daemon --start \
-                       --chuid {{ system_user }} \
-                       --make-pidfile \
-                       --pidfile /var/run/{{ program_name }}/{{ program_name }}.pid \
-                       --exec "{{ program_override|default('$RUNBIN') }}" \
-                       -- {{ program_config_options|default('') }}

vars/ubuntu-14.04.yml

@@ -1,57 +0,0 @@
----
-# Copyright 2016, Walmart Stores, 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.
-
-# Ubuntu Cloud Archive variables
-# There are no UCA packages for Trusty beyond Mitaka, so the selected
-# release here has to remain at Mitaka.
-uca_openstack_release: mitaka
-uca_repo_dist: "{{ ansible_lsb.codename }}-updates/{{ uca_openstack_release }}"
-uca_repo: "deb {{ uca_apt_repo_url }} {{ uca_repo_dist }} main"
-
-neutron_ovs_distro_packages:
-  - openvswitch-common
-  - openvswitch-switch
-
-neutron_driver_vpnaas: neutron_vpnaas.services.vpn.device_drivers.ipsec.OpenSwanDriver
-neutron_vpnaas_service_provider: VPN:openswan:neutron_vpnaas.services.vpn.service_drivers.ipsec.IPsecVPNDriver:default
-
-## APT Cache options
-cache_timeout: 600
-
-neutron_distro_packages:
-  - conntrack
-  - dnsmasq-base
-  - dnsmasq-utils
-  - ebtables
-  - ipset
-  - iputils-arping
-  - keepalived
-  - libpq-dev
-  - radvd
-
-neutron_lxb_distro_packages:
-  - bridge-utils
-
-neutron_lbaas_distro_packages:
-  - haproxy
-
-neutron_vpnaas_distro_packages:
-  - openswan
-
-neutron_remove_distro_packages:
-  - conntrackd
-
-neutron_lbaasv2_initscript_path: "/etc/init/neutron-lbaasv2-agent.conf"
-neutron_lbaasv2_agent_servicename: "neutron-lbaasv2-agent"