Remove Trusty support from os_barbican role

Change-Id: I06c3e77609d73d1788f9e961c25e8684aa84fbb7
Implements: blueprint trusty-removal
This commit is contained in:
Andy McCrae 2016-12-15 11:40:11 +00:00
parent 010c9c2b82
commit 01a37b78b5
8 changed files with 3 additions and 78 deletions

2
Vagrantfile vendored
View File

@ -1,5 +1,5 @@
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

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

@ -13,4 +13,4 @@ container_skel:
- barbican_api
properties:
service_name: barbican
container_release: trusty
container_release: xenial

View File

@ -17,7 +17,6 @@
service:
name: "apache2"
state: "restarted"
pattern: "apache2"
register: apache_restart
until: apache_restart|success
retries: 5

View File

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

View File

@ -13,11 +13,6 @@
# See the License for the specific language governing permissions and
# limitations under the License.
- include: barbican_init_upstart.yml
static: no
when:
- ansible_service_mgr == 'upstart'
- include: barbican_init_systemd.yml
static: no
when:

View File

@ -1,27 +0,0 @@
---
# Copyright 2016, Ian Cordasco
#
# 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: Template the init script
template:
src: "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

View File

@ -1,41 +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="{{ barbican_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 }}"
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('') }} \
--logto={{ log_directory }}/{{ program_name }}.log