From d799f4193dee18e06b6bf1b68982c9a566c7224e Mon Sep 17 00:00:00 2001 From: Dan Prince Date: Wed, 24 Apr 2019 14:06:29 -0400 Subject: [PATCH] Move vpp, and veritas-hyperscale into deployment Change-Id: I5fbd66958a912db29c3e8fee025eaecebc067b71 Related-Blueprint: services-yaml-flattening --- .../veritas-hyperscale-controller-baremetal-puppet.yaml | 0 .../vpp.yaml => deployment/vpp/vpp-baremetal-puppet.yaml | 0 environments/neutron-ml2-vpp.yaml | 2 +- environments/services/vpp.yaml | 3 +-- environments/veritas-hyperscale/veritas-hyperscale-config.yaml | 2 +- 5 files changed, 3 insertions(+), 4 deletions(-) rename puppet/services/veritas-hyperscale-controller.yaml => deployment/veritas-hyperscale/veritas-hyperscale-controller-baremetal-puppet.yaml (100%) rename puppet/services/vpp.yaml => deployment/vpp/vpp-baremetal-puppet.yaml (100%) diff --git a/puppet/services/veritas-hyperscale-controller.yaml b/deployment/veritas-hyperscale/veritas-hyperscale-controller-baremetal-puppet.yaml similarity index 100% rename from puppet/services/veritas-hyperscale-controller.yaml rename to deployment/veritas-hyperscale/veritas-hyperscale-controller-baremetal-puppet.yaml diff --git a/puppet/services/vpp.yaml b/deployment/vpp/vpp-baremetal-puppet.yaml similarity index 100% rename from puppet/services/vpp.yaml rename to deployment/vpp/vpp-baremetal-puppet.yaml diff --git a/environments/neutron-ml2-vpp.yaml b/environments/neutron-ml2-vpp.yaml index e2c5a39017..dc62ce99c5 100644 --- a/environments/neutron-ml2-vpp.yaml +++ b/environments/neutron-ml2-vpp.yaml @@ -6,7 +6,7 @@ resource_registry: OS::TripleO::Services::NeutronVppAgent: ../deployment/neutron/neutron-vpp-agent-baremetal-puppet.yaml OS::TripleO::Services::Etcd: ../deployment/etcd/etcd-container-puppet.yaml # FIXME(bogdando): switch it, once it is containerized - OS::TripleO::Services::Vpp: ../puppet/services/vpp.yaml + OS::TripleO::Services::Vpp: ../deployment/vpp/vpp-baremetal-puppet.yaml parameter_defaults: #Comma delimited list of :. diff --git a/environments/services/vpp.yaml b/environments/services/vpp.yaml index 1844c55a5a..8435dc3706 100644 --- a/environments/services/vpp.yaml +++ b/environments/services/vpp.yaml @@ -1,6 +1,5 @@ resource_registry: - # FIXME(bogdando): switch it, once it is containerized - OS::TripleO::Services::Vpp: ../../puppet/services/vpp.yaml + OS::TripleO::Services::Vpp: ../../deployment/vpp/vpp-baremetal-puppet.yaml #parameter_defaults: #VPP main thread core pinning diff --git a/environments/veritas-hyperscale/veritas-hyperscale-config.yaml b/environments/veritas-hyperscale/veritas-hyperscale-config.yaml index ef67e22f8c..2fd4bf09e1 100644 --- a/environments/veritas-hyperscale/veritas-hyperscale-config.yaml +++ b/environments/veritas-hyperscale/veritas-hyperscale-config.yaml @@ -16,7 +16,7 @@ # Veritas HyperScale packages for controller. resource_registry: # FIXME(bogdando): switch it, once it is containerized - OS::TripleO::Services::VRTSHyperScale: ../../puppet/services/veritas-hyperscale-controller.yaml + OS::TripleO::Services::VRTSHyperScale: ../../deployment/veritas-hyperscale/veritas-hyperscale-controller-baremetal-puppet.yaml parameter_defaults: EnablePackageInstall: true