summaryrefslogtreecommitdiff
path: root/README.md
diff options
context:
space:
mode:
Diffstat (limited to 'README.md')
-rw-r--r--README.md16
1 files changed, 10 insertions, 6 deletions
diff --git a/README.md b/README.md
index 71ff071c..8a57a8c0 100644
--- a/README.md
+++ b/README.md
@@ -251,7 +251,7 @@ Deployment to OpenStack
The intention is that all of the systems defined here are deployed to an
OpenStack cloud. The instructions here harcode some details about the specific
-tenancy at [DataCentred](http://www.datacentred.io) that the Baserock project
+tenancy at [CityCloud](https://citycontrolpanel.com/) that the Baserock project
uses. It should be easy to adapt them for other OpenStack hosts, though.
### Credentials
@@ -264,6 +264,9 @@ according to the OpenStack host you are deploying to:
- `OS_USERNAME`
- `OS_PASSWORD`
+For CityCloud you also need to ensure that `OS_REGION_NAME` is set to `Lon1`
+(for the London datacentre).
+
When using `morph deploy` to deploy to OpenStack, you will need to set these
variables, because currently Morph does not honour the standard ones. See:
<https://storyboard.baserock.org/#!/story/35>.
@@ -294,7 +297,7 @@ as-is.
The `$fedora_image_id` should reference a Fedora Cloud image. You can import
these from <http://www.fedoraproject.org/>. At time of writing, these
-instructions were tested with Fedora Cloud 23 for x86_64.
+instructions were tested with Fedora Cloud 26 for x86_64.
Backups
-------
@@ -338,13 +341,14 @@ To deploy this system:
nova boot frontend-haproxy \
--key-name=$keyname \
- --flavor=dc1.1x0 \
+ --flavor=1C-1GB \
--image=$fedora_image_id \
--nic="net-id=$network_id" \
- --security-groups default,gerrit,shared-artifact-cache,web-server \
+ --security-groups default,shared-artifact-cache,web-server \
--user-data ./baserock-ops-team.cloud-config
ansible-playbook -i hosts baserock_frontend/image-config.yml
- ansible-playbook -i hosts baserock_frontend/instance-config.yml
+ ansible-playbook -i hosts baserock_frontend/instance-config.yml \
+ --vault-password-file=...
ansible-playbook -i hosts baserock_frontend/instance-backup-config.yml
ansible -i hosts -m service -a 'name=haproxy enabled=true state=started' \
@@ -357,7 +361,7 @@ Full HAProxy 1.5 documentation: <https://cbonte.github.io/haproxy-dconv/configur
If you want to add a new service to the Baserock Project infrastructure via
the frontend, do the following:
-- request a subdomain that points at 185.43.218.170 (frontend)
+- request a subdomain that points at 37.153.173.19 (frontend)
- alter the haproxy.cfg file in the baserock_frontend/ directory in this repo
as necessary to proxy requests to the real instance
- run the baserock_frontend/instance-config.yml playbook