From 2e0af5858553ca81a2f41d7d0c820ba9d9d13413 Mon Sep 17 00:00:00 2001 From: Alex Schultz Date: Thu, 14 Feb 2019 13:51:29 -0700 Subject: [PATCH] Move openstack clients service Moving the service that installs all the openstack clients to the deployment directory. Change-Id: I5cfecf0217232380319a68e3689a7fe7d945b15a Related-Blueprint: services-yaml-flattening --- .../clients/openstack-clients-baremetal-puppet.yaml | 0 environments/standalone.yaml | 2 +- environments/standalone/standalone-overcloud.yaml | 2 +- environments/standalone/standalone-tripleo.yaml | 2 +- environments/undercloud.yaml | 2 +- sample-env-generator/standalone.yaml | 4 ++-- 6 files changed, 6 insertions(+), 6 deletions(-) rename puppet/services/openstack-clients.yaml => deployment/clients/openstack-clients-baremetal-puppet.yaml (100%) diff --git a/puppet/services/openstack-clients.yaml b/deployment/clients/openstack-clients-baremetal-puppet.yaml similarity index 100% rename from puppet/services/openstack-clients.yaml rename to deployment/clients/openstack-clients-baremetal-puppet.yaml diff --git a/environments/standalone.yaml b/environments/standalone.yaml index 3a8bbd22c8..95c3016869 100644 --- a/environments/standalone.yaml +++ b/environments/standalone.yaml @@ -8,7 +8,7 @@ resource_registry: # Manage SELinux OS::TripleO::Services::SELinux: ../deployment/selinux/selinux-baremetal-puppet.yaml - OS::TripleO::Services::OpenStackClients: ../puppet/services/openstack-clients.yaml + OS::TripleO::Services::OpenStackClients: ../deployment/clients/openstack-clients-baremetal-puppet.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 501e8e5d96..4dfd86ef70 100644 --- a/environments/standalone/standalone-overcloud.yaml +++ b/environments/standalone/standalone-overcloud.yaml @@ -93,7 +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::OpenStackClients: ../../deployment/clients/openstack-clients-baremetal-puppet.yaml OS::TripleO::Services::PankoApi: OS::Heat::None OS::TripleO::Services::SELinux: ../../deployment/selinux/selinux-baremetal-puppet.yaml OS::TripleO::Services::SaharaApi: OS::Heat::None diff --git a/environments/standalone/standalone-tripleo.yaml b/environments/standalone/standalone-tripleo.yaml index 6a7111dbe1..53f85979a0 100644 --- a/environments/standalone/standalone-tripleo.yaml +++ b/environments/standalone/standalone-tripleo.yaml @@ -112,7 +112,7 @@ resource_registry: OS::TripleO::Services::MistralEventEngine: OS::Heat::None OS::TripleO::Services::MistralExecutor: OS::Heat::None OS::TripleO::Services::OVNDBs: ../../docker/services/ovn-dbs.yaml - OS::TripleO::Services::OpenStackClients: ../../puppet/services/openstack-clients.yaml + OS::TripleO::Services::OpenStackClients: ../../deployment/clients/openstack-clients-baremetal-puppet.yaml OS::TripleO::Services::PankoApi: OS::Heat::None OS::TripleO::Services::Podman: ../../deployment/podman/podman-baremetal-ansible.yaml OS::TripleO::Services::Redis: OS::Heat::None diff --git a/environments/undercloud.yaml b/environments/undercloud.yaml index ce1630bf6f..b146345f07 100644 --- a/environments/undercloud.yaml +++ b/environments/undercloud.yaml @@ -18,7 +18,7 @@ resource_registry: # We managed this in instack-undercloud, so we need to manage it here. OS::TripleO::Services::SELinux: ../deployment/selinux/selinux-baremetal-puppet.yaml - OS::TripleO::Services::OpenStackClients: ../puppet/services/openstack-clients.yaml + OS::TripleO::Services::OpenStackClients: ../deployment/clients/openstack-clients-baremetal-puppet.yaml # services we disable by default on the undercloud OS::TripleO::Services::AodhApi: OS::Heat::None diff --git a/sample-env-generator/standalone.yaml b/sample-env-generator/standalone.yaml index 8612fccd16..7a082f25ab 100644 --- a/sample-env-generator/standalone.yaml +++ b/sample-env-generator/standalone.yaml @@ -68,7 +68,7 @@ environments: # Manage SELinux OS::TripleO::Services::SELinux: ../../deployment/selinux/selinux-baremetal-puppet.yaml - OS::TripleO::Services::OpenStackClients: ../../puppet/services/openstack-clients.yaml + OS::TripleO::Services::OpenStackClients: ../../deployment/clients/openstack-clients-baremetal-puppet.yaml # Activate container image prepare OS::TripleO::Services::ContainerImagePrepare: ../../deployment/container-image-prepare/container-image-prepare-baremetal-ansible.yaml @@ -194,7 +194,7 @@ environments: # Manage SELinux OS::TripleO::Services::SELinux: ../../deployment/selinux/selinux-baremetal-puppet.yaml - OS::TripleO::Services::OpenStackClients: ../../puppet/services/openstack-clients.yaml + OS::TripleO::Services::OpenStackClients: ../../deployment/clients/openstack-clients-baremetal-puppet.yaml # Disable non-openstack services that are enabled by default OS::TripleO::Services::Kubernetes::Master: OS::Heat::None