openstack/magnum
Code Issues Proposed changes

Update name of fedora-atomic image

Browse Source 
Based on past experience, some failures are caused by using the
stable branch with latest image. That is because the latest image
are supposed to use with master branch.

Let's make this clear by renaming the image from
"fedora-atomic-latest" to "fedora-atomic-newton" in this branch.
In fedorapeople, a soft link was created from
"fedora-atomic-newton.qcow2" to "fedora-23-atomic-20160405.qcow2"

Change-Id: I10e5594b5c5a3ffb9483e7b49bf4325a3c066b1c
This commit is contained in:
Hongbin Lu
2016-09-20 09:23:34 -05:00
parent ea53cc46cd
commit 8d53c77c94
15 changed files with 35 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files
api-ref/source/samples/baymodel-create-req.json
+2 -2
View File
@@ -13,7 +13,7 @@
"docker_volume_size":3,
"server_type":"vm",
"external_network_id":"public",
"image_id":"fedora-atomic-latest",
"image_id":"fedora-atomic-newton",
"volume_driver":"cinder",
"registry_enabled":false,
"docker_storage_driver":"devicemapper",
@@ -24,4 +24,4 @@
"flavor_id":"m1.small",
"master_lb_enabled":true,
"dns_nameserver":"8.8.8.8"
}
}
api-ref/source/samples/baymodel-create-resp.json
+2 -2
View File
@@ -28,7 +28,7 @@
"server_type":"vm",
"external_network_id":"public",
"cluster_distro":"fedora-atomic",
"image_id":"fedora-atomic-latest",
"image_id":"fedora-atomic-newton",
"volume_driver":"cinder",
"registry_enabled":false,
"docker_storage_driver":"devicemapper",
@@ -41,4 +41,4 @@
"flavor_id":"m1.small",
"master_lb_enabled":true,
"dns_nameserver":"8.8.8.8"
}
}
api-ref/source/samples/baymodel-get-all-resp.json
+2 -2
View File
@@ -30,7 +30,7 @@
"server_type":"vm",
"external_network_id":"public",
"cluster_distro":"fedora-atomic",
"image_id":"fedora-atomic-latest",
"image_id":"fedora-atomic-newton",
"volume_driver":"cinder",
"registry_enabled":false,
"docker_storage_driver":"devicemapper",
@@ -45,4 +45,4 @@
"dns_nameserver":"8.8.8.8"
}
]
}
}
api-ref/source/samples/clustertemplate-create-req.json
+2 -2
View File
@@ -13,7 +13,7 @@
"docker_volume_size":3,
"server_type":"vm",
"external_network_id":"public",
"image_id":"fedora-atomic-latest",
"image_id":"fedora-atomic-newton",
"volume_driver":"cinder",
"registry_enabled":false,
"docker_storage_driver":"devicemapper",
@@ -24,4 +24,4 @@
"flavor_id":"m1.small",
"master_lb_enabled":true,
"dns_nameserver":"8.8.8.8"
}
}
api-ref/source/samples/clustertemplate-create-resp.json
+2 -2
View File
@@ -28,7 +28,7 @@
"server_type":"vm",
"external_network_id":"public",
"cluster_distro":"fedora-atomic",
"image_id":"fedora-atomic-latest",
"image_id":"fedora-atomic-newton",
"volume_driver":"cinder",
"registry_enabled":false,
"docker_storage_driver":"devicemapper",
@@ -41,4 +41,4 @@
"flavor_id":"m1.small",
"master_lb_enabled":true,
"dns_nameserver":"8.8.8.8"
}
}
api-ref/source/samples/clustertemplate-get-all-resp.json
+2 -2
View File
@@ -30,7 +30,7 @@
"server_type":"vm",
"external_network_id":"public",
"cluster_distro":"fedora-atomic",
"image_id":"fedora-atomic-latest",
"image_id":"fedora-atomic-newton",
"volume_driver":"cinder",
"registry_enabled":false,
"docker_storage_driver":"devicemapper",
@@ -45,4 +45,4 @@
"dns_nameserver":"8.8.8.8"
}
]
}
}
devstack/plugin.sh
+1 -1
View File
@@ -13,7 +13,7 @@ if is_service_enabled magnum-api magnum-cond; then
echo_summary "Installing magnum"
install_magnum
MAGNUM_GUEST_IMAGE_URL=${MAGNUM_GUEST_IMAGE_URL:-"https://fedorapeople.org/groups/magnum/fedora-atomic-latest.qcow2"}
MAGNUM_GUEST_IMAGE_URL=${MAGNUM_GUEST_IMAGE_URL:-"https://fedorapeople.org/groups/magnum/fedora-atomic-newton.qcow2"}
IMAGE_URLS+=",${MAGNUM_GUEST_IMAGE_URL}"
LIBS_FROM_GIT="${LIBS_FROM_GIT},python-magnumclient"
doc/source/dev/manual-devstack.rst
+3 -3
View File
@@ -122,14 +122,14 @@ likely work with other micro-OS platforms, but each requires individual
support in the heat template.
Store the Fedora Atomic micro-OS in glance. Download the qcow2 Atomic image
from https://fedorapeople.org/groups/magnum/fedora-atomic-latest.qcow2 and
from https://fedorapeople.org/groups/magnum/fedora-atomic-newton.qcow2 and
then upload it to glance::
glance image-create --name fedora-atomic-latest \
glance image-create --name fedora-atomic-newton \
--visibility public \
--disk-format qcow2 \
--os-distro fedora-atomic \
--container-format bare < fedora-atomic-latest.qcow2
--container-format bare < fedora-atomic-newton.qcow2
Create a domain and domain admin for trust::
doc/source/dev/quickstart.rst
+3 -3
View File
@@ -205,7 +205,7 @@ when installing devstack use::
| 090de3a2-2c0c-42d5-b5a3-cfcddd6d011b | cirros-0.3.4-x86_64-uec | ami | ami | 25165824 | active | f98b9727094d40c78b1ed40e3bc91e80 |
| 9501d296-f0aa-4c0e-bc24-2a680f8741f0 | cirros-0.3.4-x86_64-uec-kernel | aki | aki | 4979632 | active | f98b9727094d40c78b1ed40e3bc91e80 |
| 01478d1a-59e0-4f36-b69e-0eaf5821ee46 | cirros-0.3.4-x86_64-uec-ramdisk | ari | ari | 3740163 | active | f98b9727094d40c78b1ed40e3bc91e80 |
| f14d6ee3-9e53-4f22-ba42-44e95810c294 | fedora-atomic-latest | qcow2 | bare | 507928064 | active | f98b9727094d40c78b1ed40e3bc91e80 |
| f14d6ee3-9e53-4f22-ba42-44e95810c294 | fedora-atomic-newton | qcow2 | bare | 507928064 | active | f98b9727094d40c78b1ed40e3bc91e80 |
+--------------------------------------+---------------------------------+-------------+------------------+-----------+--------+----------------------------------+
To list the available commands and resources for magnum, use::
@@ -238,7 +238,7 @@ Fedora Atomic. The COE (Container Orchestration Engine) and keypair need to
be specified as well::
magnum cluster-template-create --name k8s-cluster-template \
--image-id fedora-atomic-latest \
--image-id fedora-atomic-newton \
--keypair-id testkey \
--external-network-id public \
--dns-nameserver 8.8.8.8 \
@@ -515,7 +515,7 @@ except for the absence of some Kubernetes-specific arguments and the use of
'swarm' as the COE::
magnum cluster-template-create --name swarm-cluster-template \
--image-id fedora-atomic-latest \
--image-id fedora-atomic-newton \
--keypair-id testkey \
--external-network-id public \
--dns-nameserver 8.8.8.8 \
doc/source/magnum-proxy.rst
+2 -2
View File
@@ -41,7 +41,7 @@ You can specify all three proxy parameters while creating ClusterTemplate of
any coe type. All of proxy parameters are optional.
magnum cluster-template-create --name k8s-cluster-template \
--image-id fedora-atomic-latest \
--image-id fedora-atomic-newton \
--keypair-id testkey \
--external-network-id public \
--dns-nameserver 8.8.8.8 \
@@ -51,7 +51,7 @@ any 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 cluster-template-create --name swarm-cluster-template \
--image-id fedora-atomic-latest \
--image-id fedora-atomic-newton \
--keypair-id testkey \
--external-network-id public \
--dns-nameserver 8.8.8.8 \
doc/source/userguide.rst
+4 -4
View File
@@ -809,7 +809,7 @@ When Magnum deploys a Kubernetes cluster, it uses parameters defined in the
ClusterTemplate and specified on the cluster-create command, for example::
magnum cluster-template-create --name k8s-cluster-template \
--image-id fedora-atomic-latest \
--image-id fedora-atomic-newton \
--keypair-id testkey \
--external-network-id public \
--dns-nameserver 8.8.8.8 \
@@ -935,7 +935,7 @@ the ClusterTemplate and specified on the 'cluster-create' command, for
example::
magnum cluster-template-create --name swarm-cluster-template \
--image-id fedora-atomic-latest \
--image-id fedora-atomic-newton \
--keypair-id testkey \
--external-network-id public \
--dns-nameserver 8.8.8.8 \
@@ -1363,7 +1363,7 @@ Magnum, therefore it does not need to be specified via a parameter::
magnum cluster-template-create --name secure-kubernetes \
--keypair-id default \
--external-network-id public \
--image-id fedora-atomic-latest \
--image-id fedora-atomic-newton \
--dns-nameserver 8.8.8.8 \
--flavor-id m1.small \
--docker-volume-size 3 \
@@ -1388,7 +1388,7 @@ Magnum, therefore it does not need to be specified via a parameter::
| server_type | vm |
| external_network_id | public |
| cluster_distro | fedora-atomic |
| image_id | fedora-atomic-latest |
| image_id | fedora-atomic-newton |
| volume_driver | None |
| registry_enabled | False |
| docker_storage_driver | devicemapper |
functional_creds.conf.sample
+1 -1
View File
@@ -11,7 +11,7 @@ user = admin
tenant = admin
pass = password
[magnum]
image_id = fedora-atomic-latest
image_id = fedora-atomic-newton
nic_id = public
keypair_id = default
flavor_id = s1.magnum
install-guide/source/launch-instance.rst
+7 -7
View File
@@ -18,12 +18,12 @@ developer/magnum/userguide.html#cluster>`__ is constructed. Following this
example, you will provision a Docker Swarm cluster with one master
and one node. Then, using docker's native API you will create a container.
#. Download the latest Fedora Atomic image built by magnum team, which is
#. Download the Fedora Atomic image built by magnum team, which is
required to provision the cluster:
.. code-block:: console
$ wget https://fedorapeople.org/groups/magnum/fedora-atomic-latest.qcow2
$ wget https://fedorapeople.org/groups/magnum/fedora-atomic-newton.qcow2
#. Source the ``demo`` credentials to perform
the following steps as a non-administrative project:
@@ -40,9 +40,9 @@ and one node. Then, using docker's native API you will create a container.
$ openstack image create \
--disk-format=qcow2 \
--container-format=bare \
--file=fedora-atomic-latest.qcow2 \
--file=fedora-atomic-newton.qcow2 \
--property os_distro='fedora-atomic' \
fedora-atomic-latest
fedora-atomic-newton
+------------------+------------------------------------------------------+
| Field | Value |
+------------------+------------------------------------------------------+
@@ -54,7 +54,7 @@ and one node. Then, using docker's native API you will create a container.
| id | 81b25935-3400-441a-9f2e-f984a46c89dd |
| min_disk | 0 |
| min_ram | 0 |
| name | fedora-atomic-latest |
| name | fedora-atomic-newton |
| owner | c4b42942156741dfbc4775dbcb032841 |
| properties | os_distro='fedora-atomic' |
| protected | False |
@@ -88,7 +88,7 @@ and one node. Then, using docker's native API you will create a container.
.. code-block:: console
$ magnum cluster-template-create --name swarm-cluster-template \
--image-id fedora-atomic-latest \
--image-id fedora-atomic-newton \
--keypair-id mykey \
--external-network-id public \
--dns-nameserver 8.8.8.8 \
@@ -115,7 +115,7 @@ and one node. Then, using docker's native API you will create a container.
| server_type | vm |
| external_network_id | public |
| cluster_distro | fedora-atomic |
| image_id | fedora-atomic-latest |
| image_id | fedora-atomic-newton |
| volume_driver | - |
| registry_enabled | False |
| docker_storage_driver | devicemapper |
magnum/drivers/swarm_fedora_atomic_v1/templates/README.md
+1 -1
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-latest
server_image: fedora-atomic-newton
discovery_url: token://d8cdfe5128af6e1075b34aa06ff1cc2c
And then create the stack, referencing that environment file:
magnum/tests/functional/tempest_tests/config.py
+1 -1
View File
@@ -29,7 +29,7 @@ magnum_group = cfg.OptGroup(name="magnum", title="Magnum Options")
MagnumGroup = [
cfg.StrOpt("image_id",
default="fedora-atomic-latest",
default="fedora-atomic-newton",
help="Image id to be used for ClusterTemplate."),
cfg.StrOpt("nic_id",