Skip to content

Fix conflicts README #10

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
n0ts wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fix conflicts README #10

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 1 addition & 18 deletions running-nodecellar-on-manager/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,31 +8,19 @@ The blueprint we are going to work with, will install a sample application calle
currently going through the full training schedule, this is the same application introduced in a previous lab:
"Running NodeCellar Locally". The only difference is that we are going to use a different blueprint for
installing this application).

## Step 1: Download the NodeCellar blueprint

Obtain the NodeCellar application from GitHub (this lab assumes that `~/work` is the working directory used to bootstrap the manager from):

```bash
cd ~/work
<<<<<<< HEAD
wget -O nodecellar.zip https://github.com/GigaSpaces-ProfessionalServices/cloudify-nodecellar-example/archive/3.3.1-maint.zip
unzip nodecellar.zip
mv cloudify-nodecellar-example-3.3.1-maint cloudify-nodecellar-example-3.3.1
```

(**NOTE**: The URL above points to a fork of the official NodeCellar repository, as certain additions have been made since
the official 3.3.1 release. The original URL was: https://github.com/cloudify-cosmo/cloudify-nodecellar-example/archive/3.3.1.zip)

That will download the latest NodeCellar application and its blueprints, and extract them into `./cloudify-nodecellar-example-3.3.1`.
=======
wget -O nodecellar.zip https://github.com/cloudify-cosmo/cloudify-nodecellar-example/archive/3.4m5.zip
unzip nodecellar.zip
mv cloudify-nodecellar-example-3.4m5/ cloudify-nodecellar-example
```

That will download the latest NodeCellar application and its blueprints, and extract them into `./cloudify-nodecellar-example`.
>>>>>>> josh/master

## Step 2: Copy private key to the Manager's VM

Expand All @@ -51,13 +39,8 @@ ssh -i cfy-training.pem centos@<manager-ip> 'sudo mv cfy-training.pem /root'
The NodeCellar archive contains a template for a blueprints inputs file. This template should be edited to reflect your environment.

```bash
<<<<<<< HEAD
cp cloudify-nodecellar-example-3.3.1/inputs/simple.yaml.template ./nc-simple.yaml
vi nc-simple.yaml
=======
cp cloudify-nodecellar-example/inputs/singlehost.yaml.template ./nc-singlehost.yaml
vi nc-singlehost.yaml
>>>>>>> josh/master
```

Fill in the manager host's private IP, agent user (`centos`), as well as the path of the private key file on the manager as written below:
Expand Down
17 changes: 0 additions & 17 deletions simple-bootstrap/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,6 @@ the following from the instructor:
to the private key used to access the CLI VM. *This is not a Cloudify requirement*, but instead a design
of the training labs, in favour of simplicity.

<<<<<<< HEAD
=======
### Creating your own Cloudify Manager VM

If you don't have a Manager VM provided to you, or you would like to use your own image:
Expand All @@ -31,7 +29,6 @@ with the following exceptions:
* Make sure that `iptables` is disabled. Similarly to the CLI VM's case, this is not a Cloudify requirement but a training
material requirement.

>>>>>>> josh/master
## Process

*Note*: These steps should be executed on your CLI VM, *not* on the intended Manager VM.
Expand All @@ -56,23 +53,12 @@ For documentation purposes, it is assumed that the key file is available at `~/w
Execute the following command:

```bash
<<<<<<< HEAD
wget -O blueprints.zip https://github.com/GigaSpaces-ProfessionalServices/cloudify-manager-blueprints/archive/3.3.1-maint.zip
unzip blueprints.zip
mv cloudify-manager-blueprints-3.3.1-maint cloudify-manager-blueprints-3.3.1
```

(**NOTE**: The GitHub URL above refers to a post-3.3.1 release of Cloudify. The original URL: https://github.com/cloudify-cosmo/cloudify-manager-blueprints/archive/3.3.1.zip)

That will download the latest manager blueprints and extract them into `./cloudify-manager-blueprints-3.3.1`.
=======
wget -O blueprints.zip https://github.com/cloudify-cosmo/cloudify-manager-blueprints/archive/3.4m5.zip
unzip blueprints.zip
mv cloudify-manager-blueprints-3.4m5/ cloudify-manager-blueprints
```

That will download the latest manager blueprints and extract them into `./cloudify-manager-blueprints`.
>>>>>>> josh/master

### Step 4: Configure the inputs file

Expand All @@ -92,10 +78,7 @@ public_ip: MANAGER_INSTANCE_IP
private_ip: MANAGER_INSTANCE_IP
ssh_user: centos
ssh_key_filename: ~/work/cfy-training.pem
<<<<<<< HEAD
=======
agents_user: centos
>>>>>>> josh/master
```

If deploying on a system with 4GB or less of memory, it may be necessary to limit the amount of memory
Expand Down