From 37c9b910669ea57af83148e739b7d651147b57e7 Mon Sep 17 00:00:00 2001 From: Chris Roberts Date: Wed, 9 Jun 2021 09:13:14 -0700 Subject: [PATCH 1/7] Delete VMware content that is no longer required --- website/content/vmware/reseller.mdx | 86 ------- website/pages/vmware/index.jsx | 352 ---------------------------- 2 files changed, 438 deletions(-) delete mode 100644 website/content/vmware/reseller.mdx delete mode 100644 website/pages/vmware/index.jsx diff --git a/website/content/vmware/reseller.mdx b/website/content/vmware/reseller.mdx deleted file mode 100644 index 010468479..000000000 --- a/website/content/vmware/reseller.mdx +++ /dev/null @@ -1,86 +0,0 @@ ---- -layout: vmware -page_title: Reseller Information - VMware Plugin -description: |- - This page is intended to answer questions commonly needed by resellers. If you - are a reseller all required information should be on this page. ---- - -# Reseller Information - -This page is intended to answer questions commonly needed by resellers. If you -are a reseller all required information should be on this page. - -## Quote - -Each license is a one-time cost of `$79` USD per seat. All orders must be placed -using US currency. - -## Self-serve purchase - -Licenses can be purchased in our [self service portal](http://www.vagrantup.com/vmware#buy-now) -with a credit card. - -## Reseller Discounts - -We do not offer reseller discounts. Volume pricing is available for those who -qualify. - -## Volume Pricing - -We offer volume pricing when purchasing 1 or more sets of 150 licenses. If you -or your organization plans to purchase 1 or more sets of 150 licenses, please -contact sales@hashicorp.com to learn more about volume discounts before making your -purchase. - -## Purchase Orders - -Although we prefer the self-serve purchase, for 1 or more sets of 150 licenses, we -can do PO. Please contact sales@hashicorp.com for a quote. - -The following product SKU is available: - -- `HCVAVDA` - Vagrant VMware Desktop Plugin - -Failure to include all required information or proper product SKUs may result in -delayed processing. - -You are responsible for license distribution to the end user. HashiCorp will -provide you with a downloadable license file and instructions, but it is the -reseller's responsibility to distribute to the customer. - -## Seats - -A single seat can be used on two computers (such as a desktop and a laptop) -for a single person. The license is valid forever with access to free -maintenance updates. - -## Upgrade Pricing & Eligibility - -Future major updates may require an upgrade fee. Typically this upgrade fee is -\$49 USD, but that is subject to change. Customers may check their license -upgrade eligibility by visiting the -[license upgrade center](http://license.hashicorp.com/upgrade/vmware2015) and -entering the email address with which they made the purchase. For licenses -purchased by a reseller, only the reseller can request the license upgrade. - -## Licenses - -After a successful purchase, license files and associated installation -instructions will be generated and emailed to you. - -## Company Details - -Business name: - - HashiCorp, Inc. - -Business website and support: - - www.hashicorp.com - support@hashicorp.com - -Our current registered business address is: - - 101 2nd Street #700 - San Francisco, CA 94105 diff --git a/website/pages/vmware/index.jsx b/website/pages/vmware/index.jsx deleted file mode 100644 index 2193a66fa..000000000 --- a/website/pages/vmware/index.jsx +++ /dev/null @@ -1,352 +0,0 @@ -import s from './style.module.css' -import Button from '@hashicorp/react-button' -import VMWarePurchaseForm from 'components/vmware-purchase-form' -import Head from 'next/head' -import HashiHead from '@hashicorp/react-head' - -export default function VmwareIndex() { - return ( - <> - -
-
-
- Vagrant Logo - + - VMware Logo -
-

- Supercharged Development Environments -

-

- Use Vagrant with VMware for improved stability, performance, and - support. -

-
-
-
-
- -
-
-
Benefits
-

VMware Makes Your Life Better

-
    -
  • -

    Same Vagrant Workflow

    -

    - vagrant up, vagrant ssh,{' '} - vagrant destroy - the same Vagrant workflow you - know and love. Vastly improve your work environments without - having to re-educate your team. -

    -
    • -
  • -

    Rock Solid Stability

    -

    - The VMware hypervisor has been in production use since 1999. All - their products share the same, robust core that powers the - world‘s largest organizations. With the VMware provider, - Vagrant now runs on the strength of the same foundation. -

    -
    • -
  • -

    Professional Support

    -

    - Every purchase of the Vagrant VMware provider comes with direct - email support. VMware products themselves are eligible for - professional support from VMware. Someone always has your back - in case things are not working as well as they should be. -

    -
    • -
  • -

    Unparalleled Performance

    -

    - VMware screams, with industry-leading performance - 1 based on the same hypervisor technology in use by - 98% of the Fortune 500. Get all the performance gains paired - with the ease of use of Vagrant. -

    -
    • -
  • -

    Uncompromised Portability

    -

    - VMware virtual machines run on Mac OS X, Windows, and Linux. - Vagrant provides support for both VMware Fusion (Mac OS X) and - VMware Workstation (Linux and Windows), which are able to run - the same virtual machines across multiple platforms. -

    -
    • -
  • -

    Vagrant ♥ Open Source

    -

    - Vagrant is free and open source. While the VMware providers are - not, the revenue is used to continue to develop, support, and - grow Vagrant and the community around it. -

    -
    • -
- - 1 According to{' '} - - this article in MacWorld - {' '} - vs. Parallels Desktop 7 - -
-
- -
-
-
Buy Now
-

Pricing & Purchase

-

- Price: $79 per seat. -

-

- A single seat can be used on two computers (such as a desktop and a - laptop) for a single person. The license is valid forever with - access to free maintenance updates. Future major updates may require - an upgrade fee. -

-

- Enter the number of seats you wish to purchase below. Then, click - the buy button and complete the order. Instructions to install and - download the software will be emailed to you. -

-
-

- VMware Fusion 12 / VMware Workstation 16 or lower -

- -
- -

- The provider license does not include a license to the VMware - software, which must be purchased separately. If you are buying - over 150 licenses, contact{' '} - sales@hashicorp.com for - volume pricing. By purchasing this license, you agree to the{' '} - EULA and - the HashiCorp{' '} - Privacy Policy and{' '} - - Terms of Service - - . -

-

- Previous plugin versions may not support the latest VMware - products. Please visit the{' '} - - license upgrade center - {' '} - to check if your license requires an upgrade before you upgrade - your VMware products. -

-

- For reseller information,{' '} - - click here - - . -

- -
-
- -
-
-
FAQ
-

Frequently Asked Questions

-
    -
  • -

    Do you offer a trial for the Vagrant VMware plugins?

    -

    - We do not offer a trial mechanism at this time, but we do offer - a 30-day, no questions asked, 100% money-back guarantee. If you - are not satisfied with the product, contact us within 30 days - and you will receive a full refund. -

    -
    • -
  • -

    - Do you offer educational discounts on the Vagrant VMware - plugins? -

    -

    - We offer an academic discount of 10% for the Vagrant VMware - plugins. However, we require proof that you are a current - student or employee in academia. Please contact support with{' '} - any one of the following forms of proof: -

    -
      -
    • A picture of your current university ID
      • -
    • - An email from your official .edu school email - address -
      • -
    • - A copy of something on university letterhead indicating you - are currently enrolled as a student -
      • -
    -
    • -
  • -

    I already own a license, am I eligible for an upgrade?

    -

    - Existing license holders may check their upgrade eligibility by - visiting{' '} - - the license upgrade center - - . If you are eligible for an upgrade, the system will generate a - unique discount code that may be used when purchasing the new - license. -

    -
    • -
  • -

    Do I need to pay for upgrades to my license?

    -

    - The Vagrant VMware plugin licenses are valid for specific VMware - product versions at the time of purchase. When new versions of - VMware products are released, significant changes to the plugin - code are often required to support this new version. For this - reason, you may need to upgrade your current license to work - with the new version of the VMware product. Customers can check - their license upgrade eligibility by visiting the{' '} - - License Upgrade Center - {' '} - and entering the email address with which they made the original - purchase. -

    -

    - Please note: your existing license will continue to work with - all previous versions of the VMware products. If you do not wish - to update at this time, you can rollback your VMware - installation to an older version. -

    -
    • -
  • -

    Where can I find the EULA for the Vagrant VMware Plugins?

    -

    - The{' '} - - EULA for the Vagrant VMware plugins - {' '} - is available on the Vagrant website. -

    -
    • -
  • -

    Do you offer incentives for resellers?

    -

    - All our reseller information can be found on the{' '} - Reseller Information page. -

    -
    • -
  • -

    - Do you offer bulk/volume discounts for the Vagrant VMware - plugins? -

    -

    - We certainly do!{' '} - - Email support - {' '} - with the number of licenses you need and we can give you bulk - pricing information. Please note that bulk pricing requires the - purchase of - at least 150 seats. -

    -
    • -
  • -

    Does this include the VMware software?

    -

    - The Vagrant VMware Plugin requires the separate purchase of - VMware Fusion/Workstation from VMware. The VMware product is not - bundled with the plugin. -

    -
    • -
  • -

    - Why is the Vagrant VMware plugin not working with my trial - version of VMware Fusion/Workstation? -

    -

    - While we have not been able to isolate to a specific issue or - cause, the Vagrant VMware Fusion and Vagrant VMware Workstation - plugins are sometimes incompatible with the trial versions of - the VMware products. -

    -

    - Please try restarting your computer and running the VMware - software manually. Occasionally you must accept the license - agreement before VMware will run. If you do not see any errors - when opening the VMware GUI, you may need to purchase the full - version to use the plugin. We apologize for the inconvenience. -

    -
    • -
  • -

    Can I use VMware Workstation Player?

    -

    - Some features of the Vagrant VMware Workstation plugin - will work with VMware Player, but it is not officially - supported. Vagrant interacts with VMware via the VMware API, and - some versions of VMware Workstation Player do not support those - APIs. When in doubt, please purchase VMware Workstation Pro to - use all the features supported by the integration. -

    -
    • -
  • -

    - Do I need VMware Fusion/Workstation Pro or just the regular - version? -

    -

    - The Vagrant VMware plugin is compatible with both the regular - and Pro versions of VMware Fusion and VMware Workstation. - However, some advanced features (such as linked clones), are - only supported by the Pro versions of the VMware software. -

    -

    - Please consult the VMware documentation to determine which - features are supported by the Pro and non-Pro versions to - determine which product you need to purchase. -

    -
    • -
-
-
- -
-
-
Issues
-

Known Issues

-
    -
  • -

    Big Sur

    -

    - There are some notable issues for the VMWare provider on Mac OS Big - Sur. For more information please refer to the known issues section - in the documentation for Big Sur: -

    - Please also see the "Known Issues" section of the - VMWare 12 relese notes. -

    -
    • -
-
-
- - ) -} From 48016e49c87890f2aedf9e0da56f25c6dc5a286e Mon Sep 17 00:00:00 2001 From: Chris Roberts Date: Wed, 9 Jun 2021 09:13:41 -0700 Subject: [PATCH 2/7] Remove license related content from the documentation --- website/content/docs/providers/vmware/faq.mdx | 46 ------------------- .../content/docs/providers/vmware/index.mdx | 12 ++--- .../docs/providers/vmware/installation.mdx | 39 ---------------- 3 files changed, 4 insertions(+), 93 deletions(-) diff --git a/website/content/docs/providers/vmware/faq.mdx b/website/content/docs/providers/vmware/faq.mdx index 9ed694de5..c23540fdf 100644 --- a/website/content/docs/providers/vmware/faq.mdx +++ b/website/content/docs/providers/vmware/faq.mdx @@ -8,52 +8,6 @@ description: |- # Frequently Asked Questions -## Q: Can Vagrant VMware Plugin work without internet? - -No, Vagrant VMware plugin requires a new license every 6 weeks. Vagrant will try to renew the -license automatically. If you are on an environment without internet, after 4 weeks Vagrant will emit a warning, -and after 6 weeks, the VMware plugin will stop working. You can install a new license to reactive vagrant. - -## Q: I purchased a Vagrant VMware plugin license, but I did not receive an email? - -First, please check your JUNK or SPAM folders. Since the license comes from an -automated system, it might have been flagged as spam by your email provider. If -you do not see the email there, please [contact support](mailto:support@hashicorp.com?subject=License Not Received) -and include the original order number. - -## Q: Do I need to keep the Vagrant VMware plugin license file on disk? - -After you have installed the Vagrant VMware plugin license, it is safe to remove -your copy from disk. Vagrant copies the license into its structure for reference -on boot. - -## Q: Do I need to purchase a separate license for VMware Fusion/Workstation - -Yes. The Vagrant VMware desktop plugin license is only valid the for the Vagrant -plugin and cannot be used to license the VMware Fusion or VMware Workstation -application. - -## Q: I lost my original email, where can I download my Vagrant VMware plugin license again? - -Please [contact support](mailto:support@hashicorp.com?subject=Lost My License&body=Hello support! I seem to have misplaced my Vagrant VMware license. Could you please send it to me? Thanks!). **Note:** -please contact support using the email address with which you made the -original purchase. If you use an alternate email, you will be asked to verify -that you are the owner of the requested license. - -## Q: I upgraded my VMware product and now my license is invalid? - -The Vagrant VMware plugin licenses are valid for specific VMware product -versions at the time of purchase. When new versions of VMware products are -released, significant changes to the plugin code are often required to support -this new version. For this reason, you may need to upgrade your current license -to work with the new version of the VMware product. Customers can check their -license upgrade eligibility by visiting the [License Upgrade Center](https://license.hashicorp.com/upgrade/vmware) -and entering the email address with which they made the original purchase. - -Your existing license will continue to work with all previous versions of the -VMware products. If you do not wish to update at this time, you can rollback -your VMware installation to an older version. - ## Q: How do I upgrade my currently installed Vagrant VMware plugin? You can update the Vagrant VMware plugin to the latest version by re-running the diff --git a/website/content/docs/providers/vmware/index.mdx b/website/content/docs/providers/vmware/index.mdx index cfddfebd9..fccf07d26 100644 --- a/website/content/docs/providers/vmware/index.mdx +++ b/website/content/docs/providers/vmware/index.mdx @@ -17,19 +17,15 @@ and [VMware Workstation](https://www.vmware.com/products/workstation/)  Vagrant to power VMware based machines and take advantage of the improved stability and performance that VMware software offers. -Learn more about the VMware providers on the -[VMware provider](/vmware) page on -the Vagrant website. +The Vagrant VMWare plugin is now open sourced under the MPL. The code +repository for the Vagrant VMware plugin is available on [GitHub](https://github.com/hashicorp/vagrant-vmware-desktop). This provider is a drop-in replacement for VirtualBox. However, there are some VMware-specific things such as box formats, configurations, etc. that are documented here. -For the most up-to-date information on compatibility and supported versions of -VMware Fusion and VMware Workstation, please visit the -[Vagrant VMware product page](/vmware). Please note -that VMware Fusion and VMware Workstation are third-party products that must be -purchased and installed separately prior to using the provider. +Please note that VMware Fusion and VMware Workstation are third-party products +that must be purchased and installed separately prior to using the provider. Use the navigation to the left to find a specific VMware topic to read more about. diff --git a/website/content/docs/providers/vmware/installation.mdx b/website/content/docs/providers/vmware/installation.mdx index bafbbb635..a480b2544 100644 --- a/website/content/docs/providers/vmware/installation.mdx +++ b/website/content/docs/providers/vmware/installation.mdx @@ -27,37 +27,6 @@ $ vagrant plugin install vagrant-vmware-desktop For more information on plugin installation, please see the [Vagrant plugin usage documentation](/docs/plugins/usage). -The Vagrant VMware plugin is a commercial product provided by -[HashiCorp](https://www.hashicorp.com) and **requires the purchase of a license** -to operate. To purchase a license, please visit the -[Vagrant VMware provider](/vmware#buy-now) page. Upon -purchasing a license, you will receive a license file in your inbox. Download -this file and save it to a temporary location on your computer. - -~> **Warning!** You cannot use your VMware product license as a -Vagrant VMware plugin license. They are separate commercial products, each -requiring their own license. - -After installing the Vagrant VMware Desktop plugin for your system, you -will need to install the license: - -```shell-session -$ vagrant plugin license vagrant-vmware-desktop ~/license.lic -``` - -The first parameter is the name of the plugin, and the second parameter is the -path to the license file on disk. Please be sure to replace `~/license.lic` -with the path where you temporarily saved the downloaded license file to disk. -After you have installed the plugin license, you may remove the temporary file. - -To verify the license installation, run: - -```shell-session -$ vagrant -``` - -If the license is not installed correctly, you will see an error message. - ## Upgrading to v1.x It is **extremely important** that the VMware plugin is upgraded to 1.0.0 or @@ -93,11 +62,3 @@ Desktop plugin: ```shell-session $ vagrant plugin update vagrant-vmware-desktop ``` - -## Support - -If you have any issues purchasing, installing, or using the Vagrant VMware -plugins, please [contact support](mailto:support@hashicorp.com). To -expedite the support process, please include the -[Vagrant debug output](/docs/other/debugging) as a Gist if -applicable. This will help us more quickly diagnose your issue. From eff23ac10b80136ee811c31db552239fb4f2d2a0 Mon Sep 17 00:00:00 2001 From: Chris Roberts Date: Wed, 9 Jun 2021 09:16:30 -0700 Subject: [PATCH 3/7] Add FAQ entry on license requirement --- website/content/docs/providers/vmware/faq.mdx | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/website/content/docs/providers/vmware/faq.mdx b/website/content/docs/providers/vmware/faq.mdx index c23540fdf..d671882b3 100644 --- a/website/content/docs/providers/vmware/faq.mdx +++ b/website/content/docs/providers/vmware/faq.mdx @@ -20,3 +20,13 @@ $ vagrant plugin install vagrant-vmware-desktop To upgrade the Vagrant VMware utility, download the latest version from the [Vagrant VMware utility downloads page](/vmware/downloads) and install the system package to your local system. + +## Q: Do I need a license for the Vagrant VMware plugin? + +No, the Vagrant VMware plugin has been open sourced under the MPL. A license +is no longer required for using the Vagrant VMware plugin. If the plugin you +are using still requires a license, simply upgrade your plugin: + +``` +$ vagrant plugin update vagrant-vmware-desktop +``` From a4798e6b9a7f4f45fd30ec9b326da1300b9b2fe2 Mon Sep 17 00:00:00 2001 From: Chris Roberts Date: Wed, 9 Jun 2021 09:16:47 -0700 Subject: [PATCH 4/7] Remove reseller page from vmware specific nav --- website/data/vmware-nav-data.json | 4 ---- 1 file changed, 4 deletions(-) diff --git a/website/data/vmware-nav-data.json b/website/data/vmware-nav-data.json index 42f8a2d11..6de622fa8 100644 --- a/website/data/vmware-nav-data.json +++ b/website/data/vmware-nav-data.json @@ -1,8 +1,4 @@ [ - { - "title": "Reselling", - "path": "reseller" - }, { "title": "EULA", "path": "eula" From a87b0ff7379c0b606eb5135a98f451db6ce651a6 Mon Sep 17 00:00:00 2001 From: Chris Roberts Date: Wed, 9 Jun 2021 09:17:01 -0700 Subject: [PATCH 5/7] Add redirects to push requests from vmware content to docs content --- website/redirects.next.js | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/website/redirects.next.js b/website/redirects.next.js index 162159c56..8c2e6d1c1 100644 --- a/website/redirects.next.js +++ b/website/redirects.next.js @@ -105,6 +105,16 @@ module.exports = [ destination: '/downloads', permanent: true, }, + { + source: '/vmware', + destination: '/docs/providers/vmware', + permanent: true, + }, + { + source: '/vmware/reseller', + destination: '/docs/providers/vmware', + permanent: true, + }, // disallow '.html' or '/index.html' in favor of cleaner, simpler paths { source: '/:path*/index', destination: '/:path*', permanent: true }, { source: '/:path*.html', destination: '/:path*', permanent: true }, From 83c7426215b1fdae882728e1cb38d4b72f474957 Mon Sep 17 00:00:00 2001 From: Chris Roberts Date: Wed, 9 Jun 2021 09:24:24 -0700 Subject: [PATCH 6/7] Remove vmware link from subnav --- website/data/subnav.js | 5 ----- 1 file changed, 5 deletions(-) diff --git a/website/data/subnav.js b/website/data/subnav.js index cc081d320..f559e3e35 100644 --- a/website/data/subnav.js +++ b/website/data/subnav.js @@ -9,11 +9,6 @@ export default [ url: '/docs', type: 'inbound', }, - { - text: 'VMware', - url: '/vmware', - type: 'inbound', - }, { text: 'Community', url: '/community', From 05fe9045973e4228234184ab7736572e881e72f2 Mon Sep 17 00:00:00 2001 From: Chris Roberts Date: Wed, 9 Jun 2021 09:29:53 -0700 Subject: [PATCH 7/7] Fix name capitalization --- website/content/docs/providers/vmware/index.mdx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/website/content/docs/providers/vmware/index.mdx b/website/content/docs/providers/vmware/index.mdx index fccf07d26..cfedf0d8a 100644 --- a/website/content/docs/providers/vmware/index.mdx +++ b/website/content/docs/providers/vmware/index.mdx @@ -17,7 +17,7 @@ and [VMware Workstation](https://www.vmware.com/products/workstation/)  Vagrant to power VMware based machines and take advantage of the improved stability and performance that VMware software offers. -The Vagrant VMWare plugin is now open sourced under the MPL. The code +The Vagrant VMware plugin is now open sourced under the MPL. The code repository for the Vagrant VMware plugin is available on [GitHub](https://github.com/hashicorp/vagrant-vmware-desktop). This provider is a drop-in replacement for VirtualBox. However, there are some