Remove Trusty support from os_glance role

Change-Id: If44365b0c00588a40802afe12f937b0c5ae797f8
Implements: blueprint trusty-removal
This commit is contained in:
Andy McCrae 2016-12-15 11:51:35 +00:00
parent 786102c8be
commit 42838c971c
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 = 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

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

View File

@ -18,16 +18,9 @@
notify:
- Restart glance services
- name: Reload upstart init scripts
command: initctl reload-configuration
changed_when: false
notify:
- Restart glance services
- name: Restart glance services
service:
name: "{{ item.value.service_name }}"
state: "restarted"
pattern: "{{ item.value.service_name }}"
with_dict: "{{ glance_services }}"
when: inventory_hostname in groups[item.value.group]

View File

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

View File

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

View File

@ -1,26 +0,0 @@
---
# Copyright 2015, 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: "glance-upstart-init.j2"
dest: "/etc/init/{{ item.value.service_name }}.conf"
mode: "0644"
owner: "root"
group: "root"
with_dict: "{{ glance_services }}"
when: inventory_hostname in groups[item.value.group]
notify:
- Reload upstart init scripts

View File

@ -1,44 +0,0 @@
# {{ ansible_managed }}
description "{{ item.value.service_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="{{ glance_bin }}/{{ item.value.service_name }}"
# Change directory to service users home
chdir "{{ glance_system_user_home }}"
# Pre start actions
pre-start script
mkdir -p "/var/run/{{ item.value.service_name }}"
chown {{ glance_system_user_name }}:{{ glance_system_group_name }} "/var/run/{{ item.value.service_name }}"
mkdir -p "/var/lock/{{ item.value.service_name }}"
chown {{ glance_system_user_name }}:{{ glance_system_group_name }} "/var/lock/{{ item.value.service_name }}"
. {{ glance_bin }}/activate
end script
# Post stop actions
post-stop script
rm "/var/run/{{ item.value.service_name }}/{{ item.value.service_name }}.pid"
end script
# Run the start up job
exec start-stop-daemon --start \
--chuid {{ glance_system_user_name }} \
--make-pidfile \
--pidfile /var/run/{{ item.value.service_name }}/{{ item.value.service_name }}.pid \
--exec "{{ program_override|default('$RUNBIN') }}" \
-- {{ program_config_options|default('') }} \
--log-file=/var/log/{{ glance_service_name }}/{{ item.value.service_name }}.log

View File

@ -1,23 +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
glance_distro_packages:
- rpcbind
- rsync
- git
- nfs-common