From 42838c971c436e912beac08fe713e29d8774bad5 Mon Sep 17 00:00:00 2001 From: Andy McCrae Date: Thu, 15 Dec 2016 11:51:35 +0000 Subject: [PATCH] Remove Trusty support from os_glance role Change-Id: If44365b0c00588a40802afe12f937b0c5ae797f8 Implements: blueprint trusty-removal --- Vagrantfile | 2 +- bindep.txt | 2 +- doc/source/index.rst | 2 +- handlers/main.yml | 7 ----- meta/main.yml | 1 - tasks/glance_init_common.yml | 4 --- tasks/glance_init_upstart.yml | 26 ------------------- templates/glance-upstart-init.j2 | 44 -------------------------------- vars/ubuntu-14.04.yml | 23 ----------------- 9 files changed, 3 insertions(+), 108 deletions(-) delete mode 100644 tasks/glance_init_upstart.yml delete mode 100644 templates/glance-upstart-init.j2 delete mode 100644 vars/ubuntu-14.04.yml diff --git a/Vagrantfile b/Vagrantfile index 54f0e352..6b92f5ba 100644 --- a/Vagrantfile +++ b/Vagrantfile @@ -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 diff --git a/bindep.txt b/bindep.txt index fe589259..ee6c1ca9 100644 --- a/bindep.txt +++ b/bindep.txt @@ -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] diff --git a/doc/source/index.rst b/doc/source/index.rst index 41bd427f..f9a98c1a 100644 --- a/doc/source/index.rst +++ b/doc/source/index.rst @@ -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 diff --git a/handlers/main.yml b/handlers/main.yml index 3e37f17f..1e8bc2c7 100644 --- a/handlers/main.yml +++ b/handlers/main.yml @@ -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] diff --git a/meta/main.yml b/meta/main.yml index 0468e442..fbab820b 100644 --- a/meta/main.yml +++ b/meta/main.yml @@ -22,7 +22,6 @@ galaxy_info: platforms: - name: Ubuntu versions: - - trusty - xenial - name: EL versions: diff --git a/tasks/glance_init_common.yml b/tasks/glance_init_common.yml index f6eb25cb..5820ecdb 100644 --- a/tasks/glance_init_common.yml +++ b/tasks/glance_init_common.yml @@ -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' diff --git a/tasks/glance_init_upstart.yml b/tasks/glance_init_upstart.yml deleted file mode 100644 index 18cc94e9..00000000 --- a/tasks/glance_init_upstart.yml +++ /dev/null @@ -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 diff --git a/templates/glance-upstart-init.j2 b/templates/glance-upstart-init.j2 deleted file mode 100644 index 1b7dd694..00000000 --- a/templates/glance-upstart-init.j2 +++ /dev/null @@ -1,44 +0,0 @@ -# {{ ansible_managed }} - - -description "{{ item.value.service_name }}" -author "Kevin Carter " - -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 - diff --git a/vars/ubuntu-14.04.yml b/vars/ubuntu-14.04.yml deleted file mode 100644 index 96ff60dd..00000000 --- a/vars/ubuntu-14.04.yml +++ /dev/null @@ -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