Remove Trusty support from os_keystone role
Change-Id: I5ad6944b5e43aa46582acf313ac8793ab4d226f7 Implements: blueprint trusty-removal
This commit is contained in:
Andy McCrae
parent
6a96998fff
commit
6a6e377853
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]
|
||||
|
||||
@ -17,7 +17,6 @@
|
||||
service:
|
||||
name: "{{ keystone_system_service_name }}"
|
||||
state: restarted
|
||||
pattern: "{{ keystone_system_service_name }}"
|
||||
register: _restart
|
||||
until: _restart|success
|
||||
retries: 5
|
||||
@ -77,7 +76,6 @@
|
||||
service:
|
||||
name: "{{ keystone_system_service_name }}"
|
||||
state: restarted
|
||||
pattern: "{{ keystone_system_service_name }}"
|
||||
register: _restart
|
||||
until: _restart|success
|
||||
retries: 5
|
||||
@ -121,7 +119,6 @@
|
||||
service:
|
||||
name: "shibd"
|
||||
state: "restarted"
|
||||
pattern: "shibd"
|
||||
register: shibd_restart
|
||||
until: shibd_restart|success
|
||||
retries: 5
|
||||
|
||||
@ -22,7 +22,6 @@ galaxy_info:
|
||||
platforms:
|
||||
- name: Ubuntu
|
||||
versions:
|
||||
- trusty
|
||||
- xenial
|
||||
- name: EL
|
||||
versions:
|
||||
|
||||
@ -13,11 +13,6 @@
|
||||
# See the License for the specific language governing permissions and
|
||||
# limitations under the License.
|
||||
|
||||
- include: keystone_init_upstart.yml
|
||||
static: no
|
||||
when:
|
||||
- ansible_service_mgr == 'upstart'
|
||||
|
||||
- include: keystone_init_systemd.yml
|
||||
static: no
|
||||
when:
|
||||
|
||||
@ -1,38 +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: "keystone-uwsgi_upstart.conf.j2"
|
||||
dest: "/etc/init/{{ program_name }}.conf"
|
||||
mode: "0644"
|
||||
owner: "root"
|
||||
group: "root"
|
||||
register: upstart_init
|
||||
notify:
|
||||
- Restart Keystone APIs on first node
|
||||
- Restart Keystone APIs on other nodes
|
||||
- Restart service on first node
|
||||
- Restart service on other nodes
|
||||
|
||||
- name: Reload init scripts
|
||||
command: initctl reload-configuration
|
||||
changed_when: false
|
||||
when: upstart_init | changed
|
||||
notify:
|
||||
- Restart Keystone APIs on first node
|
||||
- Restart Keystone APIs on other nodes
|
||||
- Restart service on first node
|
||||
- Restart service on other nodes
|
||||
@ -17,7 +17,6 @@
|
||||
service:
|
||||
name: "{{ keystone_system_service_name }}"
|
||||
state: stopped
|
||||
pattern: "{{ keystone_system_service_name }}"
|
||||
failed_when: false
|
||||
|
||||
- name: Disable default configuration
|
||||
|
||||
@ -1,44 +0,0 @@
|
||||
# {{ ansible_managed }}
|
||||
|
||||
# vim:set ft=upstart ts=2 et:
|
||||
|
||||
description "{{ program_name }} under uWSGI"
|
||||
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="{{ keystone_bin }}/uwsgi"
|
||||
|
||||
# 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 }}"
|
||||
|
||||
. {{ keystone_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 \
|
||||
--make-pidfile \
|
||||
--pidfile /var/run/{{ program_name }}/{{ program_name }}.pid \
|
||||
--exec "{{ program_override|default('$RUNBIN') }}" \
|
||||
-- --ini "/etc/uwsgi/{{ program_name }}.ini" \
|
||||
--logto /var/log/keystone/{{ program_name }}.log \
|
||||
-- {{ program_config_options|default('') }}
|
||||
@ -1,70 +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.
|
||||
|
||||
keystone_distro_packages:
|
||||
- debhelper
|
||||
- dh-apparmor
|
||||
- docutils-common
|
||||
- git
|
||||
- libffi-dev
|
||||
- libjs-sphinxdoc
|
||||
- libjs-underscore
|
||||
- libldap2-dev
|
||||
- libsasl2-dev
|
||||
- libxslt1.1
|
||||
- libxslt1-dev
|
||||
- libxml2-dev
|
||||
- python-dev
|
||||
- rsync
|
||||
|
||||
keystone_apache_distro_packages:
|
||||
- apache2
|
||||
- apache2-utils
|
||||
|
||||
keystone_mod_wsgi_distro_packages:
|
||||
- libapache2-mod-wsgi
|
||||
|
||||
keystone_mod_proxy_uwsgi_distro_packages:
|
||||
- libapache2-mod-proxy-uwsgi
|
||||
|
||||
keystone_nginx_distro_packages:
|
||||
- nginx-full
|
||||
|
||||
keystone_idp_distro_packages:
|
||||
- ssl-cert
|
||||
- xmlsec1
|
||||
|
||||
keystone_sp_distro_packages:
|
||||
- libapache2-mod-shib2
|
||||
|
||||
keystone_developer_mode_distro_packages:
|
||||
- build-essential
|
||||
|
||||
keystone_apache_default_sites:
|
||||
- "/etc/apache2/sites-enabled/000-default.conf"
|
||||
|
||||
keystone_apache_site_available: "/etc/apache2/sites-available/keystone-httpd.conf"
|
||||
keystone_apache_site_enabled: "/etc/apache2/sites-enabled/keystone-httpd.conf"
|
||||
keystone_apache_conf: "/etc/apache2/apache2.conf"
|
||||
keystone_apache_security_conf: "/etc/apache2/conf-available/security.conf"
|
||||
|
||||
keystone_apache_configs:
|
||||
- { src: "keystone-ports.conf.j2", dest: "/etc/apache2/ports.conf" }
|
||||
- { src: "keystone-httpd.conf.j2", dest: "/etc/apache2/sites-available/keystone-httpd.conf" }
|
||||
- { src: "keystone-httpd-mpm.conf.j2", dest: "/etc/apache2/mods-available/mpm_{{ keystone_httpd_mpm_backend }}.conf" }
|
||||
|
||||
keystone_nginx_conf_path: "sites-available"
|
||||
|
||||
keystone_system_service_name: apache2
|
||||
Loading…
Reference in New Issue
Block a user