openstack
/
tripleo-heat-templates
Code Issues Proposed changes

Use ansible to install client packages 

This change deprecates the puppet process to install the openstack
service clients and transitions to the ansible role for installing
client packages.

Story: 2005984
Task: 34437

Change-Id: I3ba4eb6e3352e117450fc0130de3e547df93fe84
Signed-off-by: Kevin Carter <kecarter@redhat.com>
This commit is contained in:
Kevin Carter 2020-01-15 13:47:15 -06:00
parent d2c3e098c7
commit c0b1055b10
No known key found for this signature in database
GPG Key ID: CE94BD890A47B20A
7 changed files with 46 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
deployment/clients/openstack-clients-baremetal-ansible.yaml Normal file
View File

@ -0,0 +1,40 @@
heat_template_version: rocky
description: >
Install the OpenStack clients with puppet
parameters:
ServiceNetMap:
default: {}
description: Mapping of service_name -> network name. Typically set
via parameter_defaults in the resource registry. This
mapping overrides those in ServiceNetMapDefaults.
type: json
DefaultPasswords:
default: {}
type: json
RoleName:
default: ''
description: Role name on which the service is applied
type: string
RoleParameters:
default: {}
description: Parameters specific to the role
type: json
EndpointMap:
default: {}
description: Mapping of service endpoint -> protocol. Typically set
via parameter_defaults in the resource registry.
type: json
ServiceData:
default: {}
description: Dictionary packing service data
type: json
outputs:
role_data:
description: Role data for the OpenStack clients
value:
service_name: openstack_clients
host_prep_tasks:
- include_role:
name: tripleo-clients-install

0
deployment/clients/openstack-clients-baremetal-puppet.yaml → deployment/deprecated/clients/openstack-clients-baremetal-puppet.yaml
View File

2
environments/standalone.yaml
View File

@ -7,7 +7,7 @@ resource_registry:
OS::TripleO::Network::Ports::ControlPlaneVipPort: ../deployed-server/deployed-neutron-port.yaml
OS::TripleO::Standalone::Net::SoftwareConfig: ../net-config-standalone.yaml
OS::TripleO::Services::OpenStackClients: ../deployment/clients/openstack-clients-baremetal-puppet.yaml
OS::TripleO::Services::OpenStackClients: ../deployment/clients/openstack-clients-baremetal-ansible.yaml
# Disable non-openstack services that are enabled by default
OS::TripleO::Services::HAproxy: OS::Heat::None

2
environments/standalone/standalone-overcloud.yaml
View File

@ -92,7 +92,7 @@ resource_registry:
OS::TripleO::Services::MistralEngine: OS::Heat::None
OS::TripleO::Services::MistralEventEngine: OS::Heat::None
OS::TripleO::Services::MistralExecutor: OS::Heat::None
OS::TripleO::Services::OpenStackClients: ../../deployment/clients/openstack-clients-baremetal-puppet.yaml
OS::TripleO::Services::OpenStackClients: ../../deployment/clients/openstack-clients-baremetal-ansible.yaml
OS::TripleO::Services::SaharaApi: OS::Heat::None
OS::TripleO::Services::SaharaEngine: OS::Heat::None
OS::TripleO::Services::Zaqar: OS::Heat::None

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

@ -103,7 +103,7 @@ resource_registry:
OS::TripleO::Services::MistralEventEngine: OS::Heat::None
OS::TripleO::Services::MistralExecutor: OS::Heat::None
OS::TripleO::Services::OVNDBs: ../../deployment/ovn/ovn-dbs-container-puppet.yaml
OS::TripleO::Services::OpenStackClients: ../../deployment/clients/openstack-clients-baremetal-puppet.yaml
OS::TripleO::Services::OpenStackClients: ../../deployment/clients/openstack-clients-baremetal-ansible.yaml
OS::TripleO::Services::Podman: ../../deployment/podman/podman-baremetal-ansible.yaml
OS::TripleO::Services::Rear: OS::Heat::None
OS::TripleO::Services::Redis: OS::Heat::None

2
environments/undercloud.yaml
View File

@ -21,7 +21,7 @@ resource_registry:
OS::TripleO::Services::NeutronCorePlugin: ../deployment/neutron/neutron-plugin-ml2-container-puppet.yaml
OS::TripleO::Docker::NeutronMl2PluginBase: ../deployment/neutron/neutron-plugin-ml2.yaml
OS::TripleO::Services::OpenStackClients: ../deployment/clients/openstack-clients-baremetal-puppet.yaml
OS::TripleO::Services::OpenStackClients: ../deployment/clients/openstack-clients-baremetal-ansible.yaml
# services we disable by default on the undercloud
OS::TripleO::Services::AodhApi: OS::Heat::None

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

@ -58,7 +58,7 @@ environments:
# OVN
OS::TripleO::Services::OVNDBs: ../../deployment/ovn/ovn-dbs-container-puppet.yaml
OS::TripleO::Services::OpenStackClients: ../../deployment/clients/openstack-clients-baremetal-puppet.yaml
OS::TripleO::Services::OpenStackClients: ../../deployment/clients/openstack-clients-baremetal-ansible.yaml
# Disable Docker
OS::TripleO::Services::Docker: OS::Heat::None
@ -184,7 +184,7 @@ environments:
resource_registry:
OS::TripleO::Standalone::Net::SoftwareConfig: ../../net-config-bridge.yaml
OS::TripleO::Services::OpenStackClients: ../../deployment/clients/openstack-clients-baremetal-puppet.yaml
OS::TripleO::Services::OpenStackClients: ../../deployment/clients/openstack-clients-baremetal-ansible.yaml
# Disable non-openstack services that are enabled by default
OS::TripleO::Services::Kubernetes::Master: OS::Heat::None