From 89db1b649552ee5658958797560eba0f84d10f8f Mon Sep 17 00:00:00 2001 From: Hongbin Lu Date: Thu, 5 May 2016 18:14:14 -0400 Subject: [PATCH] Use the latest atomic image name Closes-Bug: #1579571 Change-Id: Iecba9343cc57be3693f6c488649b00dc5897a009 --- doc/source/dev/tls.rst | 4 ++-- doc/source/magnum-proxy.rst | 4 ++-- functional_creds.conf.sample | 2 +- magnum/templates/swarm/README.md | 2 +- magnum/templates/swarm/swarmcluster.yaml | 9 ++++----- magnum/tests/functional/tempest_tests/config.py | 2 +- 6 files changed, 11 insertions(+), 12 deletions(-) diff --git a/doc/source/dev/tls.rst b/doc/source/dev/tls.rst index 4771836f10..4e2b2cff5f 100644 --- a/doc/source/dev/tls.rst +++ b/doc/source/dev/tls.rst @@ -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 | diff --git a/doc/source/magnum-proxy.rst b/doc/source/magnum-proxy.rst index 77120a45e3..d2d046ec35 100644 --- a/doc/source/magnum-proxy.rst +++ b/doc/source/magnum-proxy.rst @@ -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 \ --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 \ diff --git a/functional_creds.conf.sample b/functional_creds.conf.sample index 2c703acc7c..77398b9e65 100644 --- a/functional_creds.conf.sample +++ b/functional_creds.conf.sample @@ -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 diff --git a/magnum/templates/swarm/README.md b/magnum/templates/swarm/README.md index 627f5363ca..5e45fdc803 100644 --- a/magnum/templates/swarm/README.md +++ b/magnum/templates/swarm/README.md @@ -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: diff --git a/magnum/templates/swarm/swarmcluster.yaml b/magnum/templates/swarm/swarmcluster.yaml index 819819a307..cfc3bc8320 100644 --- a/magnum/templates/swarm/swarmcluster.yaml +++ b/magnum/templates/swarm/swarmcluster.yaml @@ -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 diff --git a/magnum/tests/functional/tempest_tests/config.py b/magnum/tests/functional/tempest_tests/config.py index bb29a4be25..61f89c1ca6 100644 --- a/magnum/tests/functional/tempest_tests/config.py +++ b/magnum/tests/functional/tempest_tests/config.py @@ -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",