Remove Trusty support from os_heat role
Change-Id: If665515b30bfbd6b618c70357963df28d3d7de54 Implements: blueprint trusty-removal
This commit is contained in:
parent
bcf5e2c4da
commit
b77c406c69
2
Vagrantfile
vendored
2
Vagrantfile
vendored
@ -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
|
||||
|
@ -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]
|
||||
|
@ -18,15 +18,9 @@
|
||||
notify:
|
||||
- Restart heat services
|
||||
|
||||
- name: Reload upstart init scripts
|
||||
command: initctl reload-configuration
|
||||
notify:
|
||||
- Restart heat services
|
||||
|
||||
- name: Restart heat services
|
||||
service:
|
||||
name: "{{ item.value.service_name }}"
|
||||
state: "restarted"
|
||||
pattern: "{{ item.value.service_name }}"
|
||||
with_dict: "{{ heat_services }}"
|
||||
when: inventory_hostname in groups[item.value.group]
|
||||
|
@ -22,7 +22,6 @@ galaxy_info:
|
||||
platforms:
|
||||
- name: Ubuntu
|
||||
versions:
|
||||
- trusty
|
||||
- xenial
|
||||
categories:
|
||||
- cloud
|
||||
|
@ -13,10 +13,6 @@
|
||||
# See the License for the specific language governing permissions and
|
||||
# limitations under the License.
|
||||
|
||||
- include: heat_init_upstart.yml
|
||||
when:
|
||||
- ansible_service_mgr == 'upstart'
|
||||
|
||||
- include: heat_init_systemd.yml
|
||||
when:
|
||||
- ansible_service_mgr == 'systemd'
|
||||
|
@ -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: "heat-upstart-init.j2"
|
||||
dest: "/etc/init/{{ item.value.service_name }}.conf"
|
||||
mode: "0644"
|
||||
owner: "root"
|
||||
group: "root"
|
||||
with_dict: "{{ heat_services }}"
|
||||
when: inventory_hostname in groups[item.value.group]
|
||||
notify:
|
||||
- Reload upstart init scripts
|
@ -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="{{ heat_bin }}/{{ item.value.service_name }}"
|
||||
|
||||
# Change directory to service users home
|
||||
chdir "{{ heat_system_home_folder }}"
|
||||
|
||||
# Pre start actions
|
||||
pre-start script
|
||||
mkdir -p "/var/run/{{ item.value.service_name }}"
|
||||
chown {{ heat_system_user_name }}:{{ heat_system_group_name }} "/var/run/{{ item.value.service_name }}"
|
||||
|
||||
mkdir -p "/var/lock/{{ item.value.service_name }}"
|
||||
chown {{ heat_system_user_name }}:{{ heat_system_group_name }} "/var/lock/{{ item.value.service_name }}"
|
||||
|
||||
. {{ heat_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 {{ heat_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/{{ heat_service_name }}/{{ item.value.service_name }}.log
|
||||
|
@ -1,21 +0,0 @@
|
||||
---
|
||||
# Copyright 2014, 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.
|
||||
|
||||
## APT Cache options
|
||||
cache_timeout: 600
|
||||
|
||||
heat_distro_packages:
|
||||
- rsync
|
||||
- libxslt1.1
|
Loading…
x
Reference in New Issue
Block a user