Skip to content
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.

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

Update for V6 #161

Merged
merged 2 commits into from
Jan 6, 2016
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -196,8 +196,6 @@ Secure copy the cflinuxfs2 container to the CF VM.

Connect using the Cloud Foundry CLI.

# Run this from inside your Vagrant Bosh Lite instance
vagrant ssh
cf api --skip-ssl-validation https://api.bosh-lite.com
cf auth admin admin
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Was this just a mistake before? Or do you no longer run the commands from within the Vagrant instance?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It was a mistake before - there was something which caused my DNS not to resolve bosh-lite.com, causing the Vagrant host not to work. After a full repeat of the initial instructions, I found it was no longer needed. May have to do with VPN but I haven't reproduced it.


Expand Down
30 changes: 7 additions & 23 deletions content/ops/deploying-the-admin-ui.md
Original file line number Diff line number Diff line change
Expand Up @@ -27,37 +27,21 @@ The Cloud Foundry Admin UI provides a high level overview of metrics pulled from

#### Deployment

As of this writing, instructions for deploying the Admin UI bosh release default to the v3 release. We have deployed the v4 release as the included deployment template covers required properties and job definitions not present in v3.
As of this writing, instructions for deploying the Admin UI bosh release default to the v6 release. We have deployed the v6 release as the included deployment template covers required properties and job definitions not present in v3.

1. Obtain the current release source.

git clone git@github.com:cloudfoundry-community/admin-ui-boshrelease.git
cd admin-ui-boshrelease
git checkout tags/v4
git checkout tags/v6

1. Upload the v4 release to do be used during deployment.
1. Upload the v6 release to do be used during deployment.

bosh upload release releases/admin-ui-4.yml
bosh upload release releases/admin-ui-6.yml

1. Source the required properties outlined in `templates/admin-ui-deployment.yml` from the inintial Cloud Foundry deployment manifests and stubs. Elements to source for the resulting `admin-ui-properties.yml` include:
1. Create the deployment manifest

compilation:
meta:
networks:
properties:
resource_pools:
update:

1. Create a deployment manifest with spiff after sourcing the required properties into `admin-ui-properties.yml`. Source the required secrets from the `cf-secrets.yml` used during the initial deployment.

spiff merge \
templates/admin-ui-deployment.yml \
admin-ui-properties.yml \
/path/to/cf-secrets.yml > manifest.yml

1. Generate a deployment from the manifest.

bosh deployment manifest.yml
./make_manifest warden

1. Initiate the deployment.

Expand All @@ -80,4 +64,4 @@ Or...

#### Operation

Access the Admin UI at the uri specified in the deployment manifest. By default this is `https://admin.YOUR-SYSTEM-DOMAIN` as generated by `meta.subdomain "." properties.system_domain` in the `templates/admin-ui-deployment.yml`.
Access the Admin UI at the uri specified in the deployment manifest. By default this is `https://admin.YOUR-SYSTEM-DOMAIN` as generated by `meta.subdomain "." properties.system_domain` in the `templates/admin-ui-deployment.yml`. If you did not change this setting, try `https://admin.bosh-lite.com`.
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Not a blocker for this PR, but how much of this file could/should be moved to https://github.com/cloudfoundry-community/admin-ui-boshrelease/blob/master/README.md?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This could be merged or just depreciated in favor of https://github.com/cloudfoundry-community/admin-ui-boshrelease/blob/master/README.md. My impression is that occasionally we either need an upstream release prior to its official release, or may lag a release if it is newer and untested, which was the rationale for this MD.

We could merge this PR and then raise an issue to review if it is still value add?

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.