Remove Trusty support from os_trove role

Change-Id: I5f9d920cc99bcc62859663434b2615c317d8fbdc
Implements: blueprint trusty-removal
This commit is contained in:
Andy McCrae 2016-12-15 15:08:54 +00:00
parent 8b8cfcea78
commit bfdbbf6065
8 changed files with 1 additions and 133 deletions

8
Vagrantfile vendored
View File

@ -3,14 +3,6 @@ Vagrant.configure(2) do |config|
v.memory = 2048
v.cpus = 2
end
config.vm.define "ubuntu1404" do |trusty|
trusty.vm.box = "ubuntu/trusty64"
trusty.vm.provision "shell", inline: <<-SHELL
sudo su -
cd /vagrant
./run_tests.sh
SHELL
end
config.vm.define "ubuntu1604" do |xenial|
xenial.vm.box = "ubuntu/xenial64"

View File

@ -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]

View File

@ -19,7 +19,6 @@
service:
name: "{{ trove_api_program_name }}"
state: "restarted"
pattern: "{{ trove_api_program_name }}"
failed_when: false
when: not trove_use_mod_wsgi | bool
@ -27,21 +26,18 @@
service:
name: "{{ trove_conductor_service_name }}"
state: "restarted"
pattern: "{{ trove_conductor_service_name }}"
failed_when: false
- name: Restart trove taskmanager service
service:
name: "{{ trove_taskmanager_service_name }}"
state: "restarted"
pattern: "{{ trove_taskmanager_service_name }}"
failed_when: false
- name: Restart Apache
service:
name: "apache2"
state: "restarted"
pattern: "apache2"
when: trove_use_mod_wsgi | bool
register: apache_restart
until: apache_restart|success

View File

@ -9,7 +9,6 @@ galaxy_info:
platforms:
- name: Ubuntu
versions:
- trusty
- xenial
galaxy_tags:
- cloud

View File

@ -16,11 +16,6 @@
# (c) 2016 Donovan Francesco <donovan.francesco@is.co.za>
# (c) 2016 Paul Stevens <paul.stevens@is.co.za>
- include: trove_init_upstart.yml
static: no
when:
- ansible_service_mgr == 'upstart'
- include: trove_init_systemd.yml
static: no
when:

View File

@ -1,39 +0,0 @@
---
# Copyright 2016 Internet Solutions (Pty) Ltd
#
# 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.
#
# (c) 2016 Donovan Francesco <donovan.francesco@is.co.za>
# (c) 2016 Paul Stevens <paul.stevens@is.co.za>
- name: Place the init script
template:
src: "trove-upstart-init.j2"
dest: "/etc/init/{{ program_name }}.conf"
mode: "0644"
owner: "root"
group: "root"
register: upstart_init
notify:
- Restart trove API services
- Restart trove conductor service
- Restart trove taskmanager service
- Restart Apache
- name: Reload init scripts
command: initctl reload-configuration
when: upstart_init | changed
notify:
- Restart trove API services
- Restart trove conductor service
- Restart trove taskmanager service
- Restart Apache

View File

@ -1,44 +0,0 @@
# {{ ansible_managed }}
# vim:set ft=upstart ts=2 et:
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="{{ trove_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 }}"
. {{ trove_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('') }} \
--log-file=/var/log/trove/{{ program_name }}.log

View File

@ -1,31 +0,0 @@
---
# Copyright 2016 Internet Solutions (Pty) Ltd
#
# 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.
#
# (c) 2016 Donovan Francesco <donovan.francesco@is.co.za>
# (c) 2016 Paul Stevens <paul.stevens@is.co.za>
cache_timeout: 600
trove_distro_packages:
- apache2
- apache2-utils
- libapache2-mod-wsgi
- git
- build-essential
- python-dev
- python-software-properties
- python-pip
- mysql-client
- libxslt1-dev
- qemu-utils