x
/
microstack
Code Issues Proposed changes

Formatting improvements; add Juju discourse link (#69) 

This commit makes a few stylistic changes which aid readability.
This commit is contained in:
Tim McNamara 2019-05-18 09:40:56 +12:00 committed by Pete Vander Giessen
parent e5127e0012
commit 575a7ee54c
1 changed files with 17 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
DEMO.md
View File

@ -78,12 +78,15 @@ you're in a network restricted environment, or simply want to use a different DN
sudo vim /var/snap/microstack/common/etc/neutron/dhcp_agent.ini sudo vim /var/snap/microstack/common/etc/neutron/dhcp_agent.ini
``` ```
Add the following text: Add the following text to `dhcp_agent.ini`:
```
[DEFAULT] [DEFAULT]
interface_driver = openvswitch interface_driver = openvswitch
dhcp_driver = neutron.agent.linux.dhcp.Dnsmasq dhcp_driver = neutron.agent.linux.dhcp.Dnsmasq
enable_isolated_metadata = True enable_isolated_metadata = True
dnsmasq_dns_servers = <your dns> dnsmasq_dns_servers = <your dns>
```
You'll need to restart the microstack services if you've made this change: You'll need to restart the microstack services if you've made this change:
@ -138,13 +141,14 @@ Run `juju add-cloud microstack`
Answer the questions as follows: Answer the questions as follows:
cloud type: `openstack`<br> <table>
endpoint: `http://10.20.20.1:5000/v3`<br> <tr><td>cloud type:</td> <td><code>openstack</code></td></tr>
cert path: `none`<br> <tr><td>endpoint:</td> <td><code>http://10.20.20.1:5000/v3</code></td></tr>
auth type: `userpass`<br> <tr><td>cert path:</td> <td><code>none</code></td></tr>
region: `microstack`<br> <tr><td>region:</td> <td><code>userpass</code></td></tr>
region endpoint: `http://10.20.20.1:5000/v3`<br> <tr><td>region endpoint:</td> <td><code>http://10.20.20.1:5000/v3</code></td></tr>
add another region?: `N` <tr><td>add another region?:</td> <td><code>N</code></td></tr>
</table>
You'll need to load microstack credentials. You can temporarily drop You'll need to load microstack credentials. You can temporarily drop
into the microstack snap's shell environment to make this easy. into the microstack snap's shell environment to make this easy.
@ -165,7 +169,7 @@ mkdir simplestreams
juju metadata generate-image -d ~/simplestreams -i $IMAGE -s bionic -r microstack -u http://10.20.20.1:5000/v3 juju metadata generate-image -d ~/simplestreams -i $IMAGE -s bionic -r microstack -u http://10.20.20.1:5000/v3
``` ```
(If you don't still have an IMAGE variable in your env, you can find (If you don't still have an `IMAGE` variable in your env, you can find
your image id by running `microstack.openstack image list`) your image id by running `microstack.openstack image list`)
@ -196,9 +200,9 @@ juju ssh 0 -- tar xvzf simplestreams.tar.gz
### Make a juju model ### Make a juju model
Drop the following text into a file called model-config.yaml: Drop the following text into a file called `model-config.yaml`:
``` ```yaml
use-floating-ip: true use-floating-ip: true
image-metadata-url: /home/ubuntu/simplestreams/images image-metadata-url: /home/ubuntu/simplestreams/images
network: test network: test
@ -217,7 +221,7 @@ juju add-model k8s --config model-config.yaml
Drop the following text into a file called bundle.yaml: Drop the following text into a file called bundle.yaml:
``` ```yaml
description: A minimal two-machine Kubernetes cluster, appropriate for development. description: A minimal two-machine Kubernetes cluster, appropriate for development.
series: bionic series: bionic
@ -360,4 +364,4 @@ To clean up, run:
juju run-action kubernetes-worker/0 microbot delete=true juju run-action kubernetes-worker/0 microbot delete=true
``` ```
For more information, visit https://jujucharms.com/canonical-kubernetes/ For more information, visit https://jujucharms.com/canonical-kubernetes/ or ask at https://discourse.jujucharms.com/.