Merge "Refactor setup_docker_host.sh as host_prep_tasks"

This commit is contained in:
Jenkins 2017-08-18 09:17:15 +00:00 committed by Gerrit Code Review
commit 9436d87e7e
5 changed files with 13 additions and 41 deletions

View File

@ -1,11 +0,0 @@
#!/bin/bash
set -eux
# This file contains setup steps that can't be or have not yet been moved to
# puppet
# Disable libvirtd since it conflicts with nova_libvirt container
/usr/bin/systemctl disable libvirtd.service
/usr/bin/systemctl stop libvirtd.service
# Disable virtlogd since it conflicts with nova_virtlogd container
/usr/bin/systemctl disable virtlogd.service
/usr/bin/systemctl stop virtlogd.service

View File

@ -1,19 +0,0 @@
heat_template_version: pike
resources:
userdata:
type: OS::Heat::MultipartMime
properties:
parts:
- config: {get_resource: setup_docker_host}
setup_docker_host:
type: OS::Heat::SoftwareConfig
properties:
group: script
config: {get_file: ./setup_docker_host.sh}
outputs:
OS::stack_id:
value: {get_resource: userdata}

View File

@ -243,6 +243,19 @@ outputs:
file: file:
path: /etc/ceph path: /etc/ceph
state: directory state: directory
- name: check if libvirt is installed
command: /usr/bin/rpm -q libvirt-daemon
failed_when: false
register: libvirt_installed
- name: make sure libvirt services are disabled
service:
name: "{{ item }}"
state: stopped
enabled: no
with_items:
- libvirtd.service
- virtlogd.socket
when: libvirt_installed.rc == 0
upgrade_tasks: upgrade_tasks:
- name: Stop and disable libvirtd service - name: Stop and disable libvirtd service
tags: step2 tags: step2

View File

@ -1,11 +1,6 @@
# This environment contains the services that can work with TLS-everywhere. # This environment contains the services that can work with TLS-everywhere.
resource_registry: resource_registry:
# This can be used when you don't want to run puppet on the host,
# e.g atomic, but it has been replaced with OS::TripleO::Services::Docker
# OS::TripleO::NodeUserData: ../docker/firstboot/setup_docker_host.yaml
OS::TripleO::Services::Docker: ../puppet/services/docker.yaml OS::TripleO::Services::Docker: ../puppet/services/docker.yaml
# The compute node still needs extra initialization steps
OS::TripleO::Compute::NodeUserData: ../docker/firstboot/setup_docker_host.yaml
# Default Neutron ML2 puppet plugin to use when NeutronCorePlugin is set to ML2 # Default Neutron ML2 puppet plugin to use when NeutronCorePlugin is set to ML2
OS::TripleO::Docker::NeutronMl2PluginBase: ../puppet/services/neutron-plugin-ml2.yaml OS::TripleO::Docker::NeutronMl2PluginBase: ../puppet/services/neutron-plugin-ml2.yaml

View File

@ -1,10 +1,4 @@
resource_registry: resource_registry:
# This can be used when you don't want to run puppet on the host,
# e.g atomic, but it has been replaced with OS::TripleO::Services::Docker
# OS::TripleO::NodeUserData: ../docker/firstboot/setup_docker_host.yaml
# The compute node still needs extra initialization steps
OS::TripleO::Compute::NodeUserData: ../docker/firstboot/setup_docker_host.yaml
OS::TripleO::Services::Docker: ../puppet/services/docker.yaml OS::TripleO::Services::Docker: ../puppet/services/docker.yaml
# Default Neutron ML2 puppet plugin to use when NeutronCorePlugin is set to ML2 # Default Neutron ML2 puppet plugin to use when NeutronCorePlugin is set to ML2
OS::TripleO::Docker::NeutronMl2PluginBase: ../puppet/services/neutron-plugin-ml2.yaml OS::TripleO::Docker::NeutronMl2PluginBase: ../puppet/services/neutron-plugin-ml2.yaml