Remove Trusty support from os_sahara role

Change-Id: I01d2fbf66a0e415ea8f5a7a9906d31707ea320fa
Implements: blueprint trusty-removal
This commit is contained in:
Andy McCrae 2016-12-15 13:07:01 +00:00
parent afbed4793c
commit 0d3ca83ea0
9 changed files with 3 additions and 108 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 = 4096
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

@ -7,7 +7,7 @@ OpenStack-Ansible sahara role
configure-sahara.rst
This role installs the following Upstart services:
This role installs the following Systemd services:
* sahara-api
* sahara-engine

View File

@ -15,17 +15,14 @@
service:
name: "sahara-api"
state: "restarted"
pattern: "sahara-api"
- name: Restart sahara engine
service:
name: "sahara-engine"
state: "restarted"
pattern: "sahara-engine"
- name: Restart sahara services
service:
name: "{{ item }}"
state: "restarted"
pattern: "{{ item }}"
with_items: "{{ sahara_service_names }}"

View File

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

View File

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

View File

@ -1,32 +0,0 @@
---
# 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: "sahara-upstart-init.j2"
dest: "/etc/init/{{ program_name }}.conf"
mode: "0644"
owner: "root"
group: "root"
register: upstart_init
notify:
- Restart sahara services
- name: Reload init scripts
shell: |
initctl reload-configuration
when: upstart_init | changed
notify:
- Restart sahara services
tags:
- skip_ansible_lint ## ANSIBLE0013 skipping lint because shell is required

View File

@ -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="{{ sahara_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 }}"
. {{ sahara_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/sahara/{{ program_name }}.log

View File

@ -1,22 +0,0 @@
# Copyright 2016, Intel Corporation.
#
# 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.
## APT Cache options
cache_timeout: 600
# Common apt packages
sahara_distro_packages:
- rpcbind
- rsync
- git