diff --git a/environments/standalone.yaml b/environments/standalone.yaml index 6097e27765..68e43e0309 100644 --- a/environments/standalone.yaml +++ b/environments/standalone.yaml @@ -8,6 +8,7 @@ resource_registry: # Manage SELinux OS::TripleO::Services::SELinux: ../puppet/services/selinux.yaml + OS::TripleO::Services::OpenStackClients: ../puppet/services/openstack-clients.yaml # Disable non-openstack services that are enabled by default OS::TripleO::Services::HAproxy: OS::Heat::None diff --git a/environments/standalone/standalone-overcloud.yaml b/environments/standalone/standalone-overcloud.yaml index d8830e9469..6cbdc6461e 100644 --- a/environments/standalone/standalone-overcloud.yaml +++ b/environments/standalone/standalone-overcloud.yaml @@ -93,6 +93,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: ../../puppet/services/openstack-clients.yaml OS::TripleO::Services::PankoApi: OS::Heat::None OS::TripleO::Services::SELinux: ../../puppet/services/selinux.yaml OS::TripleO::Services::SaharaApi: OS::Heat::None diff --git a/environments/standalone/standalone-tripleo.yaml b/environments/standalone/standalone-tripleo.yaml index 29f5f57e84..4478ceda4b 100644 --- a/environments/standalone/standalone-tripleo.yaml +++ b/environments/standalone/standalone-tripleo.yaml @@ -101,6 +101,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: ../../puppet/services/openstack-clients.yaml OS::TripleO::Services::PankoApi: OS::Heat::None OS::TripleO::Services::SELinux: ../../puppet/services/selinux.yaml OS::TripleO::Services::SaharaApi: OS::Heat::None diff --git a/environments/undercloud.yaml b/environments/undercloud.yaml index 6b0ad74996..f590095eb3 100644 --- a/environments/undercloud.yaml +++ b/environments/undercloud.yaml @@ -11,6 +11,7 @@ resource_registry: # We managed this in instack-undercloud, so we need to manage it here. OS::TripleO::Services::SELinux: ../puppet/services/selinux.yaml + OS::TripleO::Services::OpenStackClients: ../puppet/services/openstack-clients.yaml # services we disable by default on the undercloud OS::TripleO::Services::AodhApi: OS::Heat::None diff --git a/overcloud-resource-registry-puppet.j2.yaml b/overcloud-resource-registry-puppet.j2.yaml index d665b2a197..1925cfd7a8 100644 --- a/overcloud-resource-registry-puppet.j2.yaml +++ b/overcloud-resource-registry-puppet.j2.yaml @@ -279,6 +279,7 @@ resource_registry: OS::TripleO::Services::NovaIronic: OS::Heat::None OS::TripleO::Services::TripleoPackages: puppet/services/tripleo-packages.yaml OS::TripleO::Services::TripleoFirewall: puppet/services/tripleo-firewall.yaml + OS::TripleO::Services::OpenStackClients: OS::Heat::None OS::TripleO::Services::OpenDaylightApi: OS::Heat::None OS::TripleO::Services::OpenDaylightOvs: OS::Heat::None OS::TripleO::Services::SensuClient: OS::Heat::None diff --git a/puppet/services/openstack-clients.yaml b/puppet/services/openstack-clients.yaml new file mode 100644 index 0000000000..fada9aa42f --- /dev/null +++ b/puppet/services/openstack-clients.yaml @@ -0,0 +1,55 @@ +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 + step_config: | + include ::aodh::client + include ::barbican::client + include ::cinder::client + include ::designate::client + include ::glance::client + include ::gnocchi::client + include ::heat::client + include ::ironic::client + include ::keystone::client + include ::manila::client + include ::mistral::client + include ::neutron::client + include ::nova::client + include ::openstacklib::openstackclient + include ::sahara::client + include ::swift::client + include ::zaqar::client diff --git a/releasenotes/notes/openstack-client-service-86d28dab98f1763f.yaml b/releasenotes/notes/openstack-client-service-86d28dab98f1763f.yaml new file mode 100644 index 0000000000..037620f253 --- /dev/null +++ b/releasenotes/notes/openstack-client-service-86d28dab98f1763f.yaml @@ -0,0 +1,11 @@ +--- +fixes: + - | + The previous installation method for the undercloud installed some extra + OpenStack clients during the installation. Since we did not have an + equivalent way in the containerized version of the undercloud, + we've added a new TripleO 'service' to install all of the OpenStack + clients on a system. OS::TripleO::Services::OpenStackClients has been + added which can be added to a custom role to install the clients. By + default, only the Undercloud and Standalone roles will have this + available. diff --git a/roles/Standalone.yaml b/roles/Standalone.yaml index 840c980e08..e4481d0c7f 100644 --- a/roles/Standalone.yaml +++ b/roles/Standalone.yaml @@ -146,6 +146,7 @@ - OS::TripleO::Services::OctaviaWorker - OS::TripleO::Services::OpenDaylightApi - OS::TripleO::Services::OpenDaylightOvs + - OS::TripleO::Services::OpenStackClients - OS::TripleO::Services::OsloMessagingNotify - OS::TripleO::Services::OsloMessagingRpc - OS::TripleO::Services::Pacemaker diff --git a/roles/Undercloud.yaml b/roles/Undercloud.yaml index 4cb2725ac5..fd52bc7fe2 100644 --- a/roles/Undercloud.yaml +++ b/roles/Undercloud.yaml @@ -71,6 +71,7 @@ - OS::TripleO::Services::NovaPlacement - OS::TripleO::Services::NovaScheduler - OS::TripleO::Services::Novajoin + - OS::TripleO::Services::OpenStackClients - OS::TripleO::Services::OsloMessagingNotify - OS::TripleO::Services::OsloMessagingRpc - OS::TripleO::Services::PankoApi diff --git a/roles_data_undercloud.yaml b/roles_data_undercloud.yaml index 67c091074c..1cb760659e 100644 --- a/roles_data_undercloud.yaml +++ b/roles_data_undercloud.yaml @@ -74,6 +74,7 @@ - OS::TripleO::Services::NovaPlacement - OS::TripleO::Services::NovaScheduler - OS::TripleO::Services::Novajoin + - OS::TripleO::Services::OpenStackClients - OS::TripleO::Services::OsloMessagingNotify - OS::TripleO::Services::OsloMessagingRpc - OS::TripleO::Services::PankoApi diff --git a/sample-env-generator/standalone.yaml b/sample-env-generator/standalone.yaml index 6fa9d3d6dd..e8f459470b 100644 --- a/sample-env-generator/standalone.yaml +++ b/sample-env-generator/standalone.yaml @@ -58,6 +58,8 @@ environments: # Manage SELinux OS::TripleO::Services::SELinux: ../../puppet/services/selinux.yaml + OS::TripleO::Services::OpenStackClients: ../../puppet/services/openstack-clients.yaml + # Disable non-openstack services that are enabled by default OS::TripleO::Services::HAproxy: OS::Heat::None OS::TripleO::Services::Keepalived: OS::Heat::None @@ -175,6 +177,8 @@ environments: # Manage SELinux OS::TripleO::Services::SELinux: ../../puppet/services/selinux.yaml + OS::TripleO::Services::OpenStackClients: ../../puppet/services/openstack-clients.yaml + # Disable non-openstack services that are enabled by default OS::TripleO::Services::Kubernetes::Master: OS::Heat::None OS::TripleO::Services::Kubernetes::Worker: OS::Heat::None