Merge pull request #1178 from magento/lk_1016_cloud-config-mgmt2-2

Update content for config mgmt - pipeline deploy for cloud 2.2

Author: Lori Krell

guides/v2.0/cloud/project/new-relic.md

@@ -15,7 +15,7 @@ github_link: cloud/project/new-relic.md
 You can mix the higher level data captured by New Relic APM with the deeper method and call dive data from [Blackfire Profiler]({{page.baseurl}}cloud/project/project-integrate-blackfire.html). Using these two tools together in Staging and Production environments, you gain a better view into your store performance.
 
 <div class="bs-callout bs-callout-info" id="info" markdown="1">
-You receiv New Relic APM with your {{site.data.var.ece}} subscription. You do not need to purchase or install install the New Relic extension (different than the APM service).
+You receive New Relic APM with your {{site.data.var.ece}} subscription. You do not need to purchase or install install the New Relic extension (different than the APM service).
 </div>
 
 ## Key features {#features}
@@ -55,7 +55,7 @@ Add New Relic to `.magento.app.yaml`:
 
     runtime:
       extensions:
-          - newrelic
+        - newrelic
 3. Save and push the changes to deploy across Staging and Production.
 
 You may also need to install the New Relic APM agent into Production and Staging environments. For instructions on installing the agent, see New Relic's [Agent installation guide](https://docs.newrelic.com/docs/agents/manage-apm-agents/installation/install-agent){:target="_blank"}. Access both environments via SSH and install the agent.

guides/v2.1/cloud/live/paypal-onboarding.md

@@ -71,10 +71,3 @@ With the account configured and authenticated, you can enable and disable PayPal
 
 ## PayPal variables {#deploy}
 When using the PayPal on-boarding tool with {{site.data.var.ece}} 2.1.8 and later 2.1.x versions, we automatically include a variable in `.magento.app.yaml` to correctly connect your PayPal module with PayPal services.
-
-If you are upgrading to {{site.data.var.ece}} 2.2, you need to add this variable to `magento.app.yaml` in the environment variables section.
-
-  # Environment variables
-  variables:
-    env:
-      CONFIG__DEFAULT__PAYPAL_ONBOARDING__MIDDLEMAN_DOMAIN: 'payment-broker.magento.com'

guides/v2.1/cloud/live/sens-data-over.md

@@ -153,11 +153,11 @@ Push `config.local.php` to Git. To push this file to the `master` Git branch, yo
 
 1. Transfer `config.local.php` to your local system using `rsync` or `scp`. You can only add this file to the Git branch through your local.
 
-    rsync <SSH URL>:app/etc/config.local.php ./app/etc/config.local.php
+    `rsync <SSH URL>:app/etc/config.local.php ./app/etc/config.local.php`
 
 2. Add and push `config.local.php` to the Git master branch.
 
-    git add app/etc/config.local.php && git commit -m "Add system-specific configuration" && git push origin master
+    `git add app/etc/config.local.php && git commit -m "Add system-specific configuration" && git push origin master`
 
 ### Step 3 & 4: Push Git branch to Staging and Production
 Log into the Magento Admin in those environments to verify the settings. If you used `scd-dump`, only configured settings display. You can continue configuring the environment if needed.

guides/v2.2/cloud/live/paypal-onboarding.md

@@ -0,0 +1,80 @@
+---
+layout: default
+group: cloud
+subgroup: 090_configure
+title: Set up PayPal payment methods
+menu_title: Set up PayPal
+menu_order: 10
+menu_node:
+version: 2.2
+github_link: cloud/live/paypal-onboarding.md
+---
+
+Magento Commerce (Cloud) provides an on-boarding tool to configure PayPal Express Checkout accounts directly through the Magento Admin panel. This tool is available for ECE 2.1.8 and later. To better support going live and testing PayPal payment methods, you can enable and configure your PayPal Express Checkout account for sandbox or production accounts.
+
+You can configure either the sandbox or production account in every environment:
+
+* For Integration and Staging environments, we recommend setting Sandbox credentials.
+* For your Production environment, you can set Sandbox credentials for initial testing, then replace with live production credentials for a launched store.
+
+## PayPal account {#accounts}
+
+While we recommend having a PayPal merchant account prepared and configured, you can create a new account or upgrade a personal account through the Admin panel.
+
+PayPal on-boarding supports connecting with the following accounts:
+
+* PayPal Business account
+* PayPal personal account, converting to a Business account. If you have an existing personal PayPal account, you can login with those credentials and upgrade this account to a business account as you complete the sync.
+
+If you do not have an existing PayPal account, you have an option to create a new one. Enter an e-mail address for a new account. If a matching PayPal account is not found, you will be prompted to create a new PayPal Business account. Or you can create an account directly through [PayPal](https://www.paypal.com/us/webapps/mpp/account-selection){:target="_blank"}.
+
+Please note the [PayPal account limitations](#limitations) for further information.
+
+![Log in to PayPal]({{ site.baseurl }}common/images/cloud_paypal-access.png){:width="336px"}
+
+### PayPal limitations {#limitations}
+
+PayPal supports connecting PayPal Express Checkout for countries across the globe except for the following limitations:
+
+* India, and Japan (future PayPal updates may support these accounts)
+* Israel
+
+For Brazil, you must have an existing PayPal business account to connect. You cannot convert an existing personal PayPal account for Brazil during this process. If you need an account, please create a new business PayPal account through [their website](https://www.paypal.com/us/webapps/mpp/account-selection){:target="_blank"}.
+
+## Configure PayPal Express Checkout
+
+To configure PayPal Express Checkout:
+
+1. Access the Admin console for the environment you need to configure.
+2. In the left-side navigation, select __Stores__ > __Configuration__, then select __Sales__ > __Payment Methods__.
+3. For PayPal, select __Configure__. Configuration fields display in expandable sections for Express Checkout, Adveritise PayPal Credit, and Basic and Advanced settings.
+4. Connect your PayPal account. Until the account is connected, the options to enable are disabled. For details on available and supported accounts to connect and limitations, see [PayPal account](#accounts).
+
+    * To connect your PayPal live account, click Connect with PayPal and follow the prompts. Any customer purchases using a live PayPal complete and actively charge customers in a live store.
+    * To connect your sandbox account for testing, click Sandbox Credentials and follow the prompts. Any customer purchases using a Sandbox PayPal complete without actively charging customers.
+
+5. Configure the Express Checkout settings to authenticate and use the PayPal API:
+
+    * __Email Associated with PayPal Merchant Account__ (Optional) enter the email address associated with your PayPal merchant account. This email is case-sensitive.
+    * __API Authentication Methods__ as API Signature or API Certificate.
+    * API Username, Password, and Signature captured from your PayPal account.
+    * __Sandbox Mode__ select Yes or No to indicate if the credentials you entered are for sandbox. If you entered production credentials, select No.
+    * __API Uses Proxy__ select Yes or No to set if the system uses a proxy server to establish a connection between Magento and the PayPal payment system. If Yes, enter the proxy host and port.
+6. For detailed information and steps for configuring your account, see [PayPal Express Checkout](http://docs.magento.com/m2/ce/user_guide/payment/paypal-express-checkout.html){:target="_blank"} starting with Step 2 Complete the Required Settings.
+
+
+With the account configured and authenticated, you can enable and disable PayPal payment options under Required PayPal Settings:
+
+* __Enable this Solution__ displays the PayPal payment method to customers through the website.
+* __Enable In-Context Checkout Experience__
+* __Enable PayPal Credit__ allows customers to PayPal credit financing without additional costs. PayPal pays the order up-front, handling all repayments for the credit directly with the customer.
+
+## PayPal variables {#deploy}
+When using the PayPal on-boarding tool with {{site.data.var.ece}} 2.2, you need to add the following variable to `magento.app.yaml` in the environment variables section.
+
+    # Environment variables
+    variables:
+      env:
+        CONFIG__DEFAULT__PAYPAL_ONBOARDING__MIDDLEMAN_DOMAIN: 'payment-broker.magento.com'
+
+If you are upgrading to 2.2 from 2.1.8 or later, you still need to add this variable.

guides/v2.2/cloud/live/paypal-onboarding.md

@@ -26,6 +26,10 @@ It provides the following benefits:
 These new methods are optional but strongly recommended. The process ensures faster deployments and consistent configurations across your environments.
 </div>
 
+<div class="bs-callout bs-callout-info" markdown="1">
+If you used configuration management in 2.1, this process is similar in 2.2. The name of the file has changed to `config.php` and updating the file changed. You can [migrate](#migrate) your `config.local.php` settings to a new `config.php`.
+</div>
+
 ## Feature availability {#release}
 Configuration management was released in `magento-cloud-configuration` 101.4.1 on {{site.data.var.ece}} 2.1.4 and later. The options and functions differ in {{site.data.var.ece}} 2.2. We provide recommendations for {{site.data.var.ece}} deployments in this section.
 
@@ -157,11 +161,11 @@ Push `config.php` to Git. To push this file to the `master` Git branch, you need
 
 1. Transfer `config.php` to your local system using `rsync` or `scp`. You can only add this file to the Git branch through your local.
 
-    rsync <SSH URL>:app/etc/config.php ./app/etc/config.php
+    `rsync <SSH URL>:app/etc/config.php ./app/etc/config.php`
 
 2. Add and push `config.php` to the Git master branch.
 
-    git add app/etc/config.php && git commit -m "Add system-specific configuration" && git push origin master
+    `git add app/etc/config.php && git commit -m "Add system-specific configuration" && git push origin master`
 
 ### Step 3 & 4: Push Git branch to Staging and Production
 Log into the Magento Admin in those environments to verify the settings. If you used `scd-dump`, only configured settings display. You can continue configuring the environment if needed.
@@ -187,5 +191,18 @@ To complete extensive changes:
 While you can manually edit `config.php` in Staging and Production, we don't recommend it. The file helps keep all of your configurations consistent across all of your environments.
 </div>
 
+## Migrate config.local.php to config.php {#migrate}
+If you upgrade to {{site.data.var.ece}} 2.2 or later, you may want to migrate settings from `config.local.php` to your new `config.php` file. If the configuration settings in your Magento Admin match the contents of the file, you can follow the instructions to generate and add `config.php`.
+
+If they differ, you can append content from `config.local.php` to your new `config.php` file:
+
+1. Follow instructions to generate the `config.php` file using the [recommended method](#cloud-config-specific-recomm).
+2. Open `config.php`and delete the last line.
+3. Open `config.local.php`and copy the contents.
+4. Paste the contents into `config.php`, save, and complete adding it to Git.
+5. Deploy across your environments.
+
+You only need to complete this migration once. When you need to update the file, you will always update the new `config.php`.
+
 #### Next step
 [Example of managing system-specific settings]({{ page.baseurl }}cloud/live/sens-data-initial.html)