openstack
/
magnum
Code Issues Proposed changes

Use the latest atomic image name 

Closes-Bug: #1579571
Change-Id: Iecba9343cc57be3693f6c488649b00dc5897a009
This commit is contained in:
Hongbin Lu 2016-05-05 18:14:14 -04:00
parent 391614e7bf
commit 89db1b6495
6 changed files with 11 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
doc/source/dev/tls.rst
View File

@ -45,7 +45,7 @@ Create a baymodel, by default TLS is enabled in Magnum::
magnum baymodel-create --name secure-kubernetes \
--keypair-id default \
--external-network-id public \
--image-id fedora-atomic \
--image-id fedora-atomic-latest \
--flavor-id m1.small \
--docker-volume-size 1 \
--coe kubernetes \
@ -68,7 +68,7 @@ Create a baymodel, by default TLS is enabled in Magnum::
| docker_volume_size | 1 |
| external_network_id | public |
| cluster_distro | fedora-atomic |
| image_id | fedora-atomic |
| image_id | fedora-atomic-latest |
| registry_enabled | False |
| apiserver_port | None |
| name | secure-kubernetes |

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

@ -41,7 +41,7 @@ You can specify all three proxy parameters while creating baymodel of any
coe type. All of proxy parameters are optional.
magnum baymodel-create --name k8sbaymodel \
--image-id fedora-atomic \
--image-id fedora-atomic-latest \
--keypair-id testkey \
--external-network-id public \
--dns-nameserver 8.8.8.8 \
@ -51,7 +51,7 @@ coe type. All of proxy parameters are optional.
--https-proxy <https://abc-proxy.com:8080> \
--no-proxy <172.24.4.4,172.24.4.9,172.24.4.8>
magnum baymodel-create --name swarmbaymodel \
--image-id fedora-atomic \
--image-id fedora-atomic-latest \
--keypair-id testkey \
--external-network-id public \
--dns-nameserver 8.8.8.8 \

2
functional_creds.conf.sample
View File

@ -11,7 +11,7 @@ user = admin
tenant = admin
pass = password
[magnum]
image_id = fedora-atomic
image_id = fedora-atomic-latest
nic_id = public
keypair_id = default
flavor_id = s1.magnum

2
magnum/templates/swarm/README.md
View File

@ -39,7 +39,7 @@ your environment:
ssh_key_name: testkey
external_network: 028d70dd-67b8-4901-8bdd-0c62b06cce2d
dns_nameserver: 192.168.200.1
server_image: fedora-atomic
server_image: fedora-atomic-latest
discovery_url: token://d8cdfe5128af6e1075b34aa06ff1cc2c
And then create the stack, referencing that environment file:

9
magnum/templates/swarm/swarmcluster.yaml
View File

@ -33,14 +33,13 @@ parameters:
type: string
description: endpoint to retrieve TLS certs from
server_image:
type: string
description: glance image used to boot the server
#
# OPTIONAL PARAMETERS
#
server_image:
type: string
default: fedora-atomic
description: glance image used to boot the server
master_flavor:
type: string
default: m1.small

2
magnum/tests/functional/tempest_tests/config.py
View File

@ -29,7 +29,7 @@ magnum_group = cfg.OptGroup(name="magnum", title="Magnum Options")
MagnumGroup = [
cfg.StrOpt("image_id",
default="fedora-atomic",
default="fedora-atomic-latest",
help="Image id to be used for baymodel."),
cfg.StrOpt("nic_id",