Move openvswitch into deployments

Change-Id: I87b061f1491fbc6a11740b229c17156a5a68a94a Related-Blueprint: services-yaml-flattening
2019-04-23 13:57:41 -04:00 · 2019-04-23 13:57:41 -04:00 · 48ca0b4ace
commit 48ca0b4ace
parent fc81bf0fbd
3 changed files with 2 additions and 2 deletions
--- a/deployment/deprecated/opendaylight/opendaylight-ovs-baremetal-puppet.yaml
+++ b/deployment/deprecated/opendaylight/opendaylight-ovs-baremetal-puppet.yaml
@ -134,7 +134,7 @@ conditions:

 resources:
  Ovs:
-    type: ./openvswitch.yaml
+    type: ../../openvswitch/openvswitch-baremetal-puppet.yaml
    properties:
      ServiceData: {get_param: ServiceData}
      ServiceNetMap: {get_param: ServiceNetMap}
--- a/deployment/neutron/neutron-ovs-dpdk-agent-container-puppet.yaml
+++ b/deployment/neutron/neutron-ovs-dpdk-agent-container-puppet.yaml
@ -100,7 +100,7 @@ resources:
              VhostuserSocketUser: {get_param: VhostuserSocketUser}

  Ovs:
-    type: ../../puppet/services/openvswitch.yaml
+    type: ../openvswitch/openvswitch-baremetal-puppet.yaml
    properties:
      ServiceNetMap: {get_param: ServiceNetMap}
      DefaultPasswords: {get_param: DefaultPasswords}
--- a/deployment/openvswitch/openvswitch-baremetal-puppet.yaml
+++ b/deployment/openvswitch/openvswitch-baremetal-puppet.yaml