openstack/magnum
Code Issues Proposed changes

Merge "Fix typos in Magnum files"

Browse Source
This commit is contained in:
Jenkins
2016-03-28 21:04:10 +00:00
committed by Gerrit Code Review
parent ea7660ba9f eada9666d5
commit f6650b9c6a
4 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
devstack/lib/magnum
View File

@@ -226,7 +226,7 @@ function create_api_paste_conf {
} }
function update_heat_policy { function update_heat_policy {
# enable stacks globel_index search so that magnum can use # enable stacks global_index search so that magnum can use
# list(global_tenant=True) # list(global_tenant=True)
sed -i 's/\("stacks:global_index":\).*$/\1 "role:admin",/' $HEAT_CONF_DIR/policy.json sed -i 's/\("stacks:global_index":\).*$/\1 "role:admin",/' $HEAT_CONF_DIR/policy.json
} }

2
doc/source/dev/functional-test.rst
View File

@@ -113,7 +113,7 @@ All the environments are detailed in Magnum's tox.ini::
cat tox.ini | grep functional- | awk -F: '{print $2}' | sed s/]// cat tox.ini | grep functional- | awk -F: '{print $2}' | sed s/]//
To run a particular subset of tests, specify that group as a tox environment. To run a particular subset of tests, specify that group as a tox environment.
For example, here is how you would run all of the kubernates tests:: For example, here is how you would run all of the kubernetes tests::
tox -e functional-k8s tox -e functional-k8s

4
doc/source/magnum-proxy.rst
View File

@@ -29,7 +29,7 @@ https://10.11.12.13:8000 or https://abcproxy.com:8000
3. no-proxy 3. no-proxy
A comma separated list of IP addresses or hostnames that should bypass A comma separated list of IP addresses or hostnames that should bypass
your proxy, and make conenctions directly. your proxy, and make connections directly.
**NOTE:** You may not express networks/subnets. It only accepts names **NOTE:** You may not express networks/subnets. It only accepts names
and ip addresses. Bad example: 192.168.0.0/28. and ip addresses. Bad example: 192.168.0.0/28.
@@ -37,7 +37,7 @@ and ip addresses. Bad example: 192.168.0.0/28.
Steps to configure proxies. Steps to configure proxies.
============================== ==============================
You can specify all three proxy parameteres while creating baymodel of any You can specify all three proxy parameters while creating baymodel of any
coe type. All of proxy parameters are optional. coe type. All of proxy parameters are optional.
magnum baymodel-create --name k8sbaymodel \ magnum baymodel-create --name k8sbaymodel \

2
magnum/templates/kubernetes/kubeminion.yaml
View File

@@ -171,7 +171,7 @@ parameters:
kube_version: kube_version:
type: string type: string
description: version of kubenetes used for kubernetes cluster description: version of kubernetes used for kubernetes cluster
trustee_user_id: trustee_user_id:
type: string type: string