openstack
/
tripleo-heat-templates
Code Issues Proposed changes

Disable Docker in default Standalone environments 

Podman is the default in standalone generated environments
(e.g. environments/standalone/standalone-tripleo.yaml), however since we
haven't made it the default in overcloud-resource-registry-puppet.j2.yaml
until we get CentOS8, docker was still being deployed because the
roles/Standalone.yaml used to contain the Docker service.

This patch aims to make sure we disable Docker.
Note: for scenario004 & 012, we need to enable Docker as Pacemaker is
enabled and the job runs on CentOS7.

Closes-Bug: #1835411
Change-Id: Ib34ba24c84f34a1533a90189d5154825c6dfa868
This commit is contained in:
Emilien Macchi 2019-07-04 09:04:22 -04:00
parent 250e172f29
commit 41e6757708
4 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
ci/environments/scenario004-standalone.yaml
View File

@ -4,6 +4,7 @@ resource_registry:
OS::TripleO::Services::CinderVolume: OS::Heat::None OS::TripleO::Services::CinderVolume: OS::Heat::None
OS::TripleO::Services::Redis: OS::Heat::None OS::TripleO::Services::Redis: OS::Heat::None
OS::TripleO::Services::Horizon: OS::Heat::None OS::TripleO::Services::Horizon: OS::Heat::None
OS::TripleO::Services::Docker: ../../deployment/deprecated/docker/docker-baremetal-ansible.yaml
OS::TripleO::Services::CephMgr: ../../deployment/ceph-ansible/ceph-mgr.yaml OS::TripleO::Services::CephMgr: ../../deployment/ceph-ansible/ceph-mgr.yaml
OS::TripleO::Services::CephMon: ../../deployment/ceph-ansible/ceph-mon.yaml OS::TripleO::Services::CephMon: ../../deployment/ceph-ansible/ceph-mon.yaml
OS::TripleO::Services::CephOSD: ../../deployment/ceph-ansible/ceph-osd.yaml OS::TripleO::Services::CephOSD: ../../deployment/ceph-ansible/ceph-osd.yaml

1
ci/environments/scenario012-standalone.yaml
View File

@ -1,6 +1,7 @@
resource_registry: resource_registry:
OS::TripleO::Controller::Net::SoftwareConfig: ../common/net-config-multinode.yaml OS::TripleO::Controller::Net::SoftwareConfig: ../common/net-config-multinode.yaml
OS::TripleO::Compute::Net::SoftwareConfig: ../common/net-config-multinode.yaml OS::TripleO::Compute::Net::SoftwareConfig: ../common/net-config-multinode.yaml
OS::TripleO::Services::Docker: ../../deployment/deprecated/docker/docker-baremetal-ansible.yaml
OS::TripleO::Services::NovaIronic: ../../deployment/nova/nova-ironic-container-puppet.yaml OS::TripleO::Services::NovaIronic: ../../deployment/nova/nova-ironic-container-puppet.yaml
OS::TripleO::Services::IronicApi: ../../deployment/ironic/ironic-api-container-puppet.yaml OS::TripleO::Services::IronicApi: ../../deployment/ironic/ironic-api-container-puppet.yaml
OS::TripleO::Services::IronicConductor: ../../deployment/ironic/ironic-conductor-container-puppet.yaml OS::TripleO::Services::IronicConductor: ../../deployment/ironic/ironic-conductor-container-puppet.yaml

1
environments/standalone/standalone-tripleo.yaml
View File

@ -75,6 +75,7 @@ resource_registry:
OS::TripleO::Services::DesignateProducer: OS::Heat::None OS::TripleO::Services::DesignateProducer: OS::Heat::None
OS::TripleO::Services::DesignateSink: OS::Heat::None OS::TripleO::Services::DesignateSink: OS::Heat::None
OS::TripleO::Services::DesignateWorker: OS::Heat::None OS::TripleO::Services::DesignateWorker: OS::Heat::None
OS::TripleO::Services::Docker: OS::Heat::None
OS::TripleO::Services::DockerRegistry: ../../deployment/image-serve/image-serve-baremetal-ansible.yaml OS::TripleO::Services::DockerRegistry: ../../deployment/image-serve/image-serve-baremetal-ansible.yaml
OS::TripleO::Services::GnocchiApi: OS::Heat::None OS::TripleO::Services::GnocchiApi: OS::Heat::None
OS::TripleO::Services::GnocchiMetricd: OS::Heat::None OS::TripleO::Services::GnocchiMetricd: OS::Heat::None

2
sample-env-generator/standalone.yaml
View File

@ -64,6 +64,8 @@ environments:
OS::TripleO::Services::OpenStackClients: ../../deployment/clients/openstack-clients-baremetal-puppet.yaml OS::TripleO::Services::OpenStackClients: ../../deployment/clients/openstack-clients-baremetal-puppet.yaml
# Disable Docker
OS::TripleO::Services::Docker: OS::Heat::None
# Activate container image prepare # Activate container image prepare
OS::TripleO::Services::ContainerImagePrepare: ../../deployment/container-image-prepare/container-image-prepare-baremetal-ansible.yaml OS::TripleO::Services::ContainerImagePrepare: ../../deployment/container-image-prepare/container-image-prepare-baremetal-ansible.yaml
OS::TripleO::Services::Podman: ../../deployment/podman/podman-baremetal-ansible.yaml OS::TripleO::Services::Podman: ../../deployment/podman/podman-baremetal-ansible.yaml