summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThomas Wiest <twiest@users.noreply.github.com>2015-08-12 07:50:26 -0400
committerThomas Wiest <twiest@users.noreply.github.com>2015-08-12 07:50:26 -0400
commit4f44a1e0cca2ca70009fbd059b99ac1b99f26f21 (patch)
tree9af18d239094c21ab69dd43fe3e03c8bd1cb613c
parent11dd1e5556e52313f8e884b1fe0f9008acf81e71 (diff)
parentbce46b21707c399c05893aecc89316c70c97fada (diff)
downloadopenshift-4f44a1e0cca2ca70009fbd059b99ac1b99f26f21.tar.gz
openshift-4f44a1e0cca2ca70009fbd059b99ac1b99f26f21.tar.bz2
openshift-4f44a1e0cca2ca70009fbd059b99ac1b99f26f21.tar.xz
openshift-4f44a1e0cca2ca70009fbd059b99ac1b99f26f21.zip
Merge pull request #381 from pat2man/aws-fixes
Switch to Centos and enable SDN on origin.
-rw-r--r--README_AWS.md39
-rw-r--r--playbooks/aws/openshift-cluster/vars.yml6
2 files changed, 42 insertions, 3 deletions
diff --git a/README_AWS.md b/README_AWS.md
index 1c76916cb..c511741b9 100644
--- a/README_AWS.md
+++ b/README_AWS.md
@@ -22,6 +22,27 @@ Note: You must source this file before running any Ansible commands.
Alternatively, you could configure credentials in either ~/.boto or ~/.aws/credentials, see the [boto docs](http://docs.pythonboto.org/en/latest/boto_config_tut.html) for the format.
+Subscribe to CentOS
+-------------------
+
+1. [CentOS on AWS](https://aws.amazon.com/marketplace/pp/B00O7WM7QW)
+
+
+Set up Security Group
+---------------------
+By default, a cluster is launched into the `public` security group. Make sure you allow hosts to talk to each other on port `4789` for SDN.
+You may also want to allow access from the outside world on the following ports:
+
+```
+• 22 - ssh
+• 80 - Web Apps
+• 443 - Web Apps (https)
+• 4789 - SDN / VXLAN
+• 8443 - Openshift Console
+• 10250 - kubelet
+```
+
+
(Optional) Setup your $HOME/.ssh/config file
-------------------------------------------
In case of a cluster creation, or any other case where you don't know the machine hostname in advance, you can use `.ssh/config`
@@ -130,3 +151,21 @@ The --deployment-type flag can be passed to bin/cluster to specify the deploymen
bin/cluster create aws --deployment-type=online <cluster-id>
```
Note: If no deployment type is specified, then the default is origin.
+
+
+## Post-ansible steps
+Create the default router
+-------------------------
+On the master host:
+```sh
+oadm router --create=true \
+ --credentials=/etc/openshift/master/openshift-router.kubeconfig
+```
+
+Create the default docker-registry
+----------------------------------
+On the master host:
+```sh
+oadm registry --create=true \
+ --credentials=/etc/openshift/master/openshift-registry.kubeconfig
+``` \ No newline at end of file
diff --git a/playbooks/aws/openshift-cluster/vars.yml b/playbooks/aws/openshift-cluster/vars.yml
index fb1793a51..95bc4b3e2 100644
--- a/playbooks/aws/openshift-cluster/vars.yml
+++ b/playbooks/aws/openshift-cluster/vars.yml
@@ -1,11 +1,11 @@
---
deployment_vars:
origin:
- # fedora, since centos requires marketplace
- image: ami-acd999c4
+ # centos-7, requires marketplace
+ image: ami-96a818fe
image_name:
region: us-east-1
- ssh_user: fedora
+ ssh_user: centos
sudo: yes
keypair: libra
type: m4.large