Merge branch 'CY-853-update-existing-vpc-with-vpn-connection'

Author: Mohammed AbuAisha

.gitignore

@@ -0,0 +1,101 @@
+# Byte-compiled / optimized / DLL files
+__pycache__/
+*.py[cod]
+*$py.class
+
+# C extensions
+*.so
+
+# Distribution / packaging
+.Python
+env/
+build/
+develop-eggs/
+dist/
+downloads/
+eggs/
+.eggs/
+lib/
+lib64/
+parts/
+sdist/
+var/
+*.egg-info/
+.installed.cfg
+*.egg
+
+# PyInstaller
+#  Usually these files are written by a python script from a template
+#  before PyInstaller builds the exe, so as to inject date/other infos into it.
+*.manifest
+*.spec
+
+# Installer logs
+pip-log.txt
+pip-delete-this-directory.txt
+
+# Unit test / coverage reports
+htmlcov/
+.tox/
+.coverage
+.coverage.*
+.cache
+nosetests.xml
+coverage.xml
+cover
+.hypothesis/
+
+# Translations
+*.mo
+*.pot
+
+# Django stuff:
+*.log
+local_settings.py
+
+# Flask stuff:
+instance/
+.webassets-cache
+
+# Scrapy stuff:
+.scrapy
+
+# Sphinx documentation
+docs/_build/
+
+# PyBuilder
+target/
+
+# IPython Notebook
+.ipynb_checkpoints
+
+# pyenv
+.python-version
+
+# celery beat schedule file
+celerybeat-schedule
+
+# dotenv
+.env
+
+# virtualenv
+venv/
+ENV/
+
+# Spyder project settings
+.spyderproject
+
+# Rope project settings
+.ropeproject
+
+# Cloudify
+inputs.yaml
+local-storage/
+.cloudify/
+
+# IDE settings
+.idea
+.DS_Store
+
+plugin_docs
+workspace

README.md

@@ -20,7 +20,7 @@ Amazon's [VPC Scenario 2](https://docs.aws.amazon.com/AmazonVPC/latest/UserGuide
 ## Compatibility
 
 Tested with:
-  * Cloudify 4.2
+  * Cloudify 4.5
 
 
 ## Pre-installation steps
@@ -45,7 +45,7 @@ If you do not provide your own `deployment inputs` below, you must add these sec
 
 On your Cloudify Manager, navigate to `Local Blueprints` select `Upload`.
 
-[Right-click and copy URL](https://github.com/cloudify-examples/vpc-scenario2-blueprint/archive/master.zip). Paste where it says `Enter blueprint url`. Provide a blueprint name, such as `examples-network` in the field labeled `blueprint name`. Select `simple-blueprint.yaml` from `Blueprint filename` menu.
+[Right-click and copy URL](https://github.com/cloudify-examples/aws-example-network/archive/master.zip). Paste where it says `Enter blueprint url`. Provide a blueprint name, such as `examples-network` in the field labeled `blueprint name`. Select `simple-blueprint.yaml` from `Blueprint filename` menu.
 
 After the new blueprint has been created, click the `Deploy` button.
 
@@ -54,10 +54,18 @@ Navigate to `Deployments`, find your new deployment, select `Install` from the `
 
 ## Update Deployment
 
+### Stage 1
 In order to provide outbound internet access to the private subnet, you can update the deployment.
 
-Navigate to `Deployments`, find your deployment, click on it. Once the deployment's page has loaded, click the `Update Deployment` button. [Right-click and copy URL](https://github.com/cloudify-examples/vpc-scenario2-blueprint/archive/master.zip). Paste where it says `Enter new blueprint url`. This time, select `update-blueprint.yaml` from `Blueprint filename` menu.
+Navigate to `Deployments`, find your deployment, click on it. Once the deployment's page has loaded, click the `Update Deployment` button. [Right-click and copy URL](https://github.com/cloudify-examples/aws-example-network/archive/master.zip). Paste where it says `Enter new blueprint url`. This time, select `update-blueprint.yaml` from `Blueprint filename` menu.
 
+### Stage 2
+
+This update deployment stage will add support to the following:
+ - VPN Connection to old vpc `vpc_1` node
+ - VPC Peering between two vpc `vpc_1` & `vpc_2`
+
+Navigate to `Deployments`, find your deployment, click on it. Once the deployment's page has loaded, click the `Update Deployment` button. [Right-click and copy URL](https://github.com/cloudify-examples/aws-example-network/archive/master.zip). Paste where it says `Enter new blueprint url`. This time, select `vpc-peering-blueprint.yaml` from `Blueprint filename` menu.
 
 ## Uninstallation
 

simple-blueprint.yaml

@@ -4,7 +4,7 @@ description: >
   Create an AWS VPC based on the Scenario 2 design.
 
 imports:
-  - http://www.getcloudify.org/spec/cloudify/4.3.2/types.yaml
+  - http://www.getcloudify.org/spec/cloudify/4.5/types.yaml
   - plugin:cloudify-awssdk-plugin
 
 inputs:

update-blueprint.yaml

@@ -4,7 +4,7 @@ description: >
   Create an AWS VPC based on the Scenario 2 design.
 
 imports:
-  - http://www.getcloudify.org/spec/cloudify/4.3.2/types.yaml
+  - http://www.getcloudify.org/spec/cloudify/4.5/types.yaml
   - plugin:cloudify-awssdk-plugin
 
 inputs: