diff --git a/Vagrantfile b/Vagrantfile index f989614..ec1f163 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.provision "shell", inline: <<-SHELL sudo su - cd /vagrant diff --git a/bindep.txt b/bindep.txt index 02d792c..080da07 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/meta/main.yml b/meta/main.yml index 0a1dba1..e70cd3e 100644 --- a/meta/main.yml +++ b/meta/main.yml @@ -9,7 +9,6 @@ galaxy_info: platforms: - name: Ubuntu versions: - - trusty - xenial # Below are all categories currently available. Just as with # the platforms above, uncomment those that apply to your role. diff --git a/tasks/magnum_init_common.yml b/tasks/magnum_init_common.yml index 02b6cc4..701b3cc 100644 --- a/tasks/magnum_init_common.yml +++ b/tasks/magnum_init_common.yml @@ -14,11 +14,6 @@ # See the License for the specific language governing permissions and # limitations under the License. -- include: magnum_init_upstart.yml - static: no - when: - - ansible_service_mgr == 'upstart' - - include: magnum_init_systemd.yml static: no when: diff --git a/tasks/magnum_init_upstart.yml b/tasks/magnum_init_upstart.yml deleted file mode 100644 index e81f01d..0000000 --- a/tasks/magnum_init_upstart.yml +++ /dev/null @@ -1,29 +0,0 @@ ---- -# Copyright 2016, Ian Cordasco -# -# 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: Template the init script - template: - src: "upstart-init.j2" - dest: "/etc/init/{{ program_name }}.conf" - mode: "0644" - owner: "root" - group: "root" - register: upstart_init - -- name: Reload init scripts - command: initctl reload-configuration - when: upstart_init | changed - notify: - - Restart magnum services diff --git a/templates/upstart-init.j2 b/templates/upstart-init.j2 deleted file mode 100644 index d8347a8..0000000 --- a/templates/upstart-init.j2 +++ /dev/null @@ -1,42 +0,0 @@ -# {{ ansible_managed }} - -description "{{ program_name }}" -author "Kevin Carter " - -start on runlevel [2345] -stop on runlevel [016] - -respawn -respawn limit 10 5 - -# Set the RUNBIN environment variable -env RUNBIN="{{ magnum_bin }}/{{ program_name }}" - -# 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 }}" - - . {{ magnum_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 \ - --chuid {{ system_user }} \ - --make-pidfile \ - --pidfile /var/run/{{ program_name }}/{{ program_name }}.pid \ - --exec "{{ program_override|default('$RUNBIN') }}" \ - -- {{ program_config_options|default('') }} \ - --log-file=/var/log/magnum/{{ program_name }}.log