Remove Trusty support from os_cinder role
Change-Id: I1959caae206dab450e50dd6f9d7a11137f1d8281 Implements: blueprint trusty-removal
This commit is contained in:
parent
6b4ec4f02e
commit
6683a8db26
2
Vagrantfile
vendored
2
Vagrantfile
vendored
@ -1,5 +1,5 @@
|
|||||||
Vagrant.configure(2) do |config|
|
Vagrant.configure(2) do |config|
|
||||||
config.vm.box = "ubuntu/trusty64"
|
config.vm.box = "ubuntu/xenial64"
|
||||||
config.vm.provider "virtualbox" do |v|
|
config.vm.provider "virtualbox" do |v|
|
||||||
v.memory = 2048
|
v.memory = 2048
|
||||||
v.cpus = 2
|
v.cpus = 2
|
||||||
|
@ -34,7 +34,7 @@ libselinux-python [platform:rpm]
|
|||||||
# For SSL SNI support
|
# For SSL SNI support
|
||||||
python-pyasn1 [platform:dpkg]
|
python-pyasn1 [platform:dpkg]
|
||||||
python-openssl [platform:dpkg]
|
python-openssl [platform:dpkg]
|
||||||
python-ndg-httpsclient [platform:ubuntu !platform:ubuntu-trusty]
|
python-ndg-httpsclient [platform:ubuntu]
|
||||||
python2-pyasn1 [platform:rpm]
|
python2-pyasn1 [platform:rpm]
|
||||||
pyOpenSSL [platform:rpm]
|
pyOpenSSL [platform:rpm]
|
||||||
python-ndg_httpsclient [platform:rpm]
|
python-ndg_httpsclient [platform:rpm]
|
||||||
|
@ -18,17 +18,10 @@
|
|||||||
notify:
|
notify:
|
||||||
- Restart cinder services
|
- Restart cinder services
|
||||||
|
|
||||||
- name: Reload upstart init scripts
|
|
||||||
command: initctl reload-configuration
|
|
||||||
changed_when: false
|
|
||||||
notify:
|
|
||||||
- Restart cinder services
|
|
||||||
|
|
||||||
- name: Restart cinder services
|
- name: Restart cinder services
|
||||||
service:
|
service:
|
||||||
name: "{{ item.value.service_name }}"
|
name: "{{ item.value.service_name }}"
|
||||||
state: restarted
|
state: restarted
|
||||||
pattern: "{{ item.value.service_name }}"
|
|
||||||
with_dict: "{{ cinder_services }}"
|
with_dict: "{{ cinder_services }}"
|
||||||
when:
|
when:
|
||||||
- inventory_hostname in groups[item.value.group]
|
- inventory_hostname in groups[item.value.group]
|
||||||
@ -38,4 +31,3 @@
|
|||||||
service:
|
service:
|
||||||
name: "{{ tgt_service_name }}"
|
name: "{{ tgt_service_name }}"
|
||||||
state: restarted
|
state: restarted
|
||||||
pattern: tgtd
|
|
||||||
|
@ -22,7 +22,6 @@ galaxy_info:
|
|||||||
platforms:
|
platforms:
|
||||||
- name: Ubuntu
|
- name: Ubuntu
|
||||||
versions:
|
versions:
|
||||||
- trusty
|
|
||||||
- xenial
|
- xenial
|
||||||
- name: EL
|
- name: EL
|
||||||
versions:
|
versions:
|
||||||
|
@ -14,10 +14,6 @@
|
|||||||
# See the License for the specific language governing permissions and
|
# See the License for the specific language governing permissions and
|
||||||
# limitations under the License.
|
# limitations under the License.
|
||||||
|
|
||||||
- include: cinder_init_upstart.yml
|
|
||||||
when:
|
|
||||||
- ansible_service_mgr == 'upstart'
|
|
||||||
|
|
||||||
- include: cinder_init_systemd.yml
|
- include: cinder_init_systemd.yml
|
||||||
when:
|
when:
|
||||||
- ansible_service_mgr == 'systemd'
|
- ansible_service_mgr == 'systemd'
|
||||||
|
@ -1,28 +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.
|
|
||||||
|
|
||||||
- name: Place the init script
|
|
||||||
template:
|
|
||||||
src: "cinder-upstart-init.j2"
|
|
||||||
dest: "/etc/init/{{ item.value.service_name }}.conf"
|
|
||||||
mode: "0644"
|
|
||||||
owner: "root"
|
|
||||||
group: "root"
|
|
||||||
with_dict: "{{ cinder_services }}"
|
|
||||||
when:
|
|
||||||
- inventory_hostname in groups[item.value.group]
|
|
||||||
- "{{ item.value.condition | default(true) }}"
|
|
||||||
notify:
|
|
||||||
- Reload upstart init scripts
|
|
@ -1,42 +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="{{ cinder_bin }}/{{ item.value.service_name }}"
|
|
||||||
|
|
||||||
# Change directory to service users home
|
|
||||||
chdir "{{ cinder_system_home_folder }}"
|
|
||||||
|
|
||||||
# Pre start actions
|
|
||||||
pre-start script
|
|
||||||
mkdir -p "/var/run/{{ item.value.service_name }}"
|
|
||||||
chown {{ cinder_system_user_name }}:{{ cinder_system_group_name }} "/var/run/{{ item.value.service_name }}"
|
|
||||||
|
|
||||||
mkdir -p "/var/lock/{{ item.value.service_name }}"
|
|
||||||
chown {{ cinder_system_user_name }}:{{ cinder_system_group_name }} "/var/lock/{{ item.value.service_name }}"
|
|
||||||
|
|
||||||
. {{ cinder_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 {{ cinder_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/cinder/{{ item.value.service_name }}.log
|
|
@ -1,39 +0,0 @@
|
|||||||
---
|
|
||||||
# Copyright 2016, 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
|
|
||||||
|
|
||||||
# service names
|
|
||||||
tgt_service_name: tgt
|
|
||||||
|
|
||||||
# Common apt packages
|
|
||||||
cinder_distro_packages:
|
|
||||||
- libpq-dev
|
|
||||||
- libkmod-dev
|
|
||||||
- libkmod2
|
|
||||||
- libxslt1-dev
|
|
||||||
- nfs-common
|
|
||||||
- rpcbind
|
|
||||||
- zlib1g
|
|
||||||
- zlibc
|
|
||||||
|
|
||||||
cinder_volume_distro_packages:
|
|
||||||
- qemu-utils
|
|
||||||
|
|
||||||
cinder_lvm_volume_distro_packages:
|
|
||||||
- dmeventd
|
|
||||||
- parted
|
|
||||||
- tgt
|
|
Loading…
Reference in New Issue
Block a user