Remove Trusty support from os_ceilometer role
As a part of removing Trusty from OpenStack-Ansible we shall aim to remove this from all the roles. Testing has already been removed for Trusty in the integrated build and all individual repositories on master (Ocata), as such we can now go ahead and remove the support within the roles. Change-Id: Ia564599a02eeafecc5614271fe4afbb1eb812aea Implements: blueprint trusty-removal
This commit is contained in:
parent
601a9957cb
commit
17cd41e1cd
|
@ -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
|
||||
|
|
|
@ -18,16 +18,10 @@
|
|||
notify:
|
||||
- Restart ceilometer services
|
||||
|
||||
- name: Reload upstart init scripts
|
||||
command: initctl reload-configuration
|
||||
notify:
|
||||
- Restart ceilometer services
|
||||
|
||||
- name: Restart ceilometer services
|
||||
service:
|
||||
name: "{{ item.0.service_name }}"
|
||||
state: "restarted"
|
||||
pattern: "{{ item.0.service_name }}"
|
||||
with_subelements:
|
||||
- "{{ ceilometer_services }}"
|
||||
- group
|
||||
|
@ -37,7 +31,6 @@
|
|||
service:
|
||||
name: "apache2"
|
||||
state: "restarted"
|
||||
pattern: "apache2"
|
||||
register: apache_restart
|
||||
until: apache_restart | success
|
||||
retries: 5
|
||||
|
|
|
@ -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: ceilometer_init_upstart.yml
|
||||
when:
|
||||
- ansible_service_mgr == 'upstart'
|
||||
|
||||
- include: ceilometer_init_systemd.yml
|
||||
when:
|
||||
- ansible_service_mgr == 'systemd'
|
||||
|
@ -25,7 +21,6 @@
|
|||
service:
|
||||
name: "{{ item.0.service_name }}"
|
||||
state: "restarted"
|
||||
pattern: "{{ item.0.service_name }}"
|
||||
with_subelements:
|
||||
- "{{ ceilometer_services }}"
|
||||
- group
|
||||
|
|
|
@ -1,28 +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: "ceilometer-upstart-init.j2"
|
||||
dest: "/etc/init/{{ item.0.service_name }}.conf"
|
||||
mode: "0644"
|
||||
owner: "root"
|
||||
group: "root"
|
||||
with_subelements:
|
||||
- "{{ ceilometer_services }}"
|
||||
- group
|
||||
when: inventory_hostname in groups[item.1]
|
||||
notify:
|
||||
- Reload upstart init scripts
|
Loading…
Reference in New Issue