summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2017-02-27 19:43:47 +0000
committerGerrit Code Review <review@openstack.org>2017-02-27 19:43:47 +0000
commitb2d43a32fa5bf50d8d83ec1f5124ba3bd8044c86 (patch)
tree4bec556d41006215addded6598d2bb4fb14230a2
parent1e07c37d1fbd89488ed89e52155dd95698a65f1e (diff)
parent1ff12b0397a0289c449ff60a9e6a3813aec95809 (diff)
Merge "Pin images for ocata" into stable/ocata
-rwxr-xr-xdevstack/plugin.sh2
-rw-r--r--doc/source/dev/quickstart.rst8
-rw-r--r--doc/source/magnum-proxy.rst4
-rw-r--r--doc/source/userguide.rst12
-rw-r--r--install-guide/source/launch-instance.rst14
-rwxr-xr-xmagnum/tests/contrib/gate_hook.sh12
6 files changed, 26 insertions, 26 deletions
diff --git a/devstack/plugin.sh b/devstack/plugin.sh
index e5c2956..da94de2 100755
--- a/devstack/plugin.sh
+++ b/devstack/plugin.sh
@@ -13,7 +13,7 @@ if is_service_enabled magnum-api magnum-cond; then
13 echo_summary "Installing magnum" 13 echo_summary "Installing magnum"
14 install_magnum 14 install_magnum
15 15
16 MAGNUM_GUEST_IMAGE_URL=${MAGNUM_GUEST_IMAGE_URL:-"https://fedorapeople.org/groups/magnum/fedora-atomic-latest.qcow2"} 16 MAGNUM_GUEST_IMAGE_URL=${MAGNUM_GUEST_IMAGE_URL:-"https://fedorapeople.org/groups/magnum/fedora-atomic-ocata.qcow2"}
17 IMAGE_URLS+=",${MAGNUM_GUEST_IMAGE_URL}" 17 IMAGE_URLS+=",${MAGNUM_GUEST_IMAGE_URL}"
18 18
19 LIBS_FROM_GIT="${LIBS_FROM_GIT},python-magnumclient" 19 LIBS_FROM_GIT="${LIBS_FROM_GIT},python-magnumclient"
diff --git a/doc/source/dev/quickstart.rst b/doc/source/dev/quickstart.rst
index 5bef05e..d5fc4cf 100644
--- a/doc/source/dev/quickstart.rst
+++ b/doc/source/dev/quickstart.rst
@@ -211,7 +211,7 @@ when installing devstack use::
211 | 090de3a2-2c0c-42d5-b5a3-cfcddd6d011b | cirros-0.3.4-x86_64-uec | ami | ami | 25165824 | active | f98b9727094d40c78b1ed40e3bc91e80 | 211 | 090de3a2-2c0c-42d5-b5a3-cfcddd6d011b | cirros-0.3.4-x86_64-uec | ami | ami | 25165824 | active | f98b9727094d40c78b1ed40e3bc91e80 |
212 | 9501d296-f0aa-4c0e-bc24-2a680f8741f0 | cirros-0.3.4-x86_64-uec-kernel | aki | aki | 4979632 | active | f98b9727094d40c78b1ed40e3bc91e80 | 212 | 9501d296-f0aa-4c0e-bc24-2a680f8741f0 | cirros-0.3.4-x86_64-uec-kernel | aki | aki | 4979632 | active | f98b9727094d40c78b1ed40e3bc91e80 |
213 | 01478d1a-59e0-4f36-b69e-0eaf5821ee46 | cirros-0.3.4-x86_64-uec-ramdisk | ari | ari | 3740163 | active | f98b9727094d40c78b1ed40e3bc91e80 | 213 | 01478d1a-59e0-4f36-b69e-0eaf5821ee46 | cirros-0.3.4-x86_64-uec-ramdisk | ari | ari | 3740163 | active | f98b9727094d40c78b1ed40e3bc91e80 |
214 | f14d6ee3-9e53-4f22-ba42-44e95810c294 | fedora-atomic-latest | qcow2 | bare | 507928064 | active | f98b9727094d40c78b1ed40e3bc91e80 | 214 | f14d6ee3-9e53-4f22-ba42-44e95810c294 | fedora-atomic-ocata | qcow2 | bare | 507928064 | active | f98b9727094d40c78b1ed40e3bc91e80 |
215 +--------------------------------------+---------------------------------+-------------+------------------+-----------+--------+----------------------------------+ 215 +--------------------------------------+---------------------------------+-------------+------------------+-----------+--------+----------------------------------+
216 216
217To list the available commands and resources for magnum, use:: 217To list the available commands and resources for magnum, use::
@@ -255,7 +255,7 @@ Fedora Atomic. The COE (Container Orchestration Engine) and keypair need to
255be specified as well:: 255be specified as well::
256 256
257 magnum cluster-template-create --name k8s-cluster-template \ 257 magnum cluster-template-create --name k8s-cluster-template \
258 --image fedora-atomic-latest \ 258 --image fedora-atomic-ocata \
259 --keypair testkey \ 259 --keypair testkey \
260 --external-network public \ 260 --external-network public \
261 --dns-nameserver 8.8.8.8 \ 261 --dns-nameserver 8.8.8.8 \
@@ -335,7 +335,7 @@ Building a Kubernetes Cluster - Based on CoreOS
335You can create a Kubernetes cluster based on CoreOS as an alternative to 335You can create a Kubernetes cluster based on CoreOS as an alternative to
336Atomic. First, download the official CoreOS image:: 336Atomic. First, download the official CoreOS image::
337 337
338 wget http://beta.release.core-os.net/amd64-usr/current/coreos_production_openstack_image.img.bz2 338 wget http://beta.release.core-os.net/amd64-usr/1298.4.0/coreos_production_openstack_image.img.bz2
339 bunzip2 coreos_production_openstack_image.img.bz2 339 bunzip2 coreos_production_openstack_image.img.bz2
340 340
341Upload the image to glance:: 341Upload the image to glance::
@@ -525,7 +525,7 @@ except for the absence of some Kubernetes-specific arguments and the use of
525'swarm' as the COE:: 525'swarm' as the COE::
526 526
527 magnum cluster-template-create --name swarm-cluster-template \ 527 magnum cluster-template-create --name swarm-cluster-template \
528 --image fedora-atomic-latest \ 528 --image fedora-atomic-ocata \
529 --keypair testkey \ 529 --keypair testkey \
530 --external-network public \ 530 --external-network public \
531 --dns-nameserver 8.8.8.8 \ 531 --dns-nameserver 8.8.8.8 \
diff --git a/doc/source/magnum-proxy.rst b/doc/source/magnum-proxy.rst
index 538ffee..eb978d2 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 ClusterTemplate of
41any coe type. All of proxy parameters are optional. 41any coe type. All of proxy parameters are optional.
42 42
43 magnum cluster-template-create --name k8s-cluster-template \ 43 magnum cluster-template-create --name k8s-cluster-template \
44 --image fedora-atomic-latest \ 44 --image fedora-atomic-ocata \
45 --keypair testkey \ 45 --keypair testkey \
46 --external-network public \ 46 --external-network public \
47 --dns-nameserver 8.8.8.8 \ 47 --dns-nameserver 8.8.8.8 \
@@ -51,7 +51,7 @@ any coe type. All of proxy parameters are optional.
51 --https-proxy <https://abc-proxy.com:8080> \ 51 --https-proxy <https://abc-proxy.com:8080> \
52 --no-proxy <172.24.4.4,172.24.4.9,172.24.4.8> 52 --no-proxy <172.24.4.4,172.24.4.9,172.24.4.8>
53 magnum cluster-template-create --name swarm-cluster-template \ 53 magnum cluster-template-create --name swarm-cluster-template \
54 --image fedora-atomic-latest \ 54 --image fedora-atomic-ocata \
55 --keypair testkey \ 55 --keypair testkey \
56 --external-network public \ 56 --external-network public \
57 --dns-nameserver 8.8.8.8 \ 57 --dns-nameserver 8.8.8.8 \
diff --git a/doc/source/userguide.rst b/doc/source/userguide.rst
index 773a373..f640d85 100644
--- a/doc/source/userguide.rst
+++ b/doc/source/userguide.rst
@@ -935,7 +935,7 @@ When Magnum deploys a Kubernetes cluster, it uses parameters defined in the
935ClusterTemplate and specified on the cluster-create command, for example:: 935ClusterTemplate and specified on the cluster-create command, for example::
936 936
937 magnum cluster-template-create --name k8s-cluster-template \ 937 magnum cluster-template-create --name k8s-cluster-template \
938 --image fedora-atomic-latest \ 938 --image fedora-atomic-ocata \
939 --keypair testkey \ 939 --keypair testkey \
940 --external-network public \ 940 --external-network public \
941 --dns-nameserver 8.8.8.8 \ 941 --dns-nameserver 8.8.8.8 \
@@ -993,7 +993,7 @@ Image (image)
993 Current supported images are Fedora Atomic (download from `Fedora 993 Current supported images are Fedora Atomic (download from `Fedora
994 <https://alt.fedoraproject.org/pub/alt/atomic/stable/Cloud-Images/x86_64/Images>`_ ) 994 <https://alt.fedoraproject.org/pub/alt/atomic/stable/Cloud-Images/x86_64/Images>`_ )
995 and CoreOS (download from `CoreOS 995 and CoreOS (download from `CoreOS
996 <http://beta.release.core-os.net/amd64-usr/current/coreos_production_openstack_image.img.bz2>`_ ) 996 <http://beta.release.core-os.net/amd64-usr/1298.4.0/coreos_production_openstack_image.img.bz2>`_ )
997 997
998TLS (tls-disabled) 998TLS (tls-disabled)
999 Transport Layer Security is enabled by default, so you need a key and 999 Transport Layer Security is enabled by default, so you need a key and
@@ -1066,7 +1066,7 @@ the ClusterTemplate and specified on the 'cluster-create' command, for
1066example:: 1066example::
1067 1067
1068 magnum cluster-template-create --name swarm-cluster-template \ 1068 magnum cluster-template-create --name swarm-cluster-template \
1069 --image fedora-atomic-latest \ 1069 --image fedora-atomic-ocata \
1070 --keypair testkey \ 1070 --keypair testkey \
1071 --external-network public \ 1071 --external-network public \
1072 --dns-nameserver 8.8.8.8 \ 1072 --dns-nameserver 8.8.8.8 \
@@ -1500,7 +1500,7 @@ Magnum, therefore it does not need to be specified via a parameter::
1500 magnum cluster-template-create --name secure-kubernetes \ 1500 magnum cluster-template-create --name secure-kubernetes \
1501 --keypair default \ 1501 --keypair default \
1502 --external-network public \ 1502 --external-network public \
1503 --image fedora-atomic-latest \ 1503 --image fedora-atomic-ocata \
1504 --dns-nameserver 8.8.8.8 \ 1504 --dns-nameserver 8.8.8.8 \
1505 --flavor m1.small \ 1505 --flavor m1.small \
1506 --docker-volume-size 3 \ 1506 --docker-volume-size 3 \
@@ -1525,7 +1525,7 @@ Magnum, therefore it does not need to be specified via a parameter::
1525 | server_type | vm | 1525 | server_type | vm |
1526 | external_network_id | public | 1526 | external_network_id | public |
1527 | cluster_distro | fedora-atomic | 1527 | cluster_distro | fedora-atomic |
1528 | image_id | fedora-atomic-latest | 1528 | image_id | fedora-atomic-ocata |
1529 | volume_driver | None | 1529 | volume_driver | None |
1530 | registry_enabled | False | 1530 | registry_enabled | False |
1531 | docker_storage_driver | devicemapper | 1531 | docker_storage_driver | devicemapper |
@@ -2497,7 +2497,7 @@ Kubernetes on CoreOS
2497-------------------- 2497--------------------
2498 2498
2499CoreOS publishes a `stock image 2499CoreOS publishes a `stock image
2500<http://beta.release.core-os.net/amd64-usr/current/coreos_production_openstack_image.img.bz2>`_ 2500<http://beta.release.core-os.net/amd64-usr/1298.4.0/coreos_production_openstack_image.img.bz2>`_
2501that is being used to deploy Kubernetes. 2501that is being used to deploy Kubernetes.
2502This image has the following OS/software: 2502This image has the following OS/software:
2503 2503
diff --git a/install-guide/source/launch-instance.rst b/install-guide/source/launch-instance.rst
index ca20ef0..f1c86f3 100644
--- a/install-guide/source/launch-instance.rst
+++ b/install-guide/source/launch-instance.rst
@@ -18,12 +18,12 @@ developer/magnum/userguide.html#cluster>`__ is constructed. Following this
18example, you will provision a Docker Swarm cluster with one master 18example, you will provision a Docker Swarm cluster with one master
19and one node. Then, using docker's native API you will create a container. 19and one node. Then, using docker's native API you will create a container.
20 20
21#. Download the latest Fedora Atomic image built by magnum team, which is 21#. Download the ocata Fedora Atomic image built by magnum team, which is
22 required to provision the cluster: 22 required to provision the cluster:
23 23
24 .. code-block:: console 24 .. code-block:: console
25 25
26 $ wget https://fedorapeople.org/groups/magnum/fedora-atomic-latest.qcow2 26 $ wget https://fedorapeople.org/groups/magnum/fedora-atomic-ocata.qcow2
27 27
28#. Source the ``demo`` credentials to perform 28#. Source the ``demo`` credentials to perform
29 the following steps as a non-administrative project: 29 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.
40 $ openstack image create \ 40 $ openstack image create \
41 --disk-format=qcow2 \ 41 --disk-format=qcow2 \
42 --container-format=bare \ 42 --container-format=bare \
43 --file=fedora-atomic-latest.qcow2 \ 43 --file=fedora-atomic-ocata.qcow2 \
44 --property os_distro='fedora-atomic' \ 44 --property os_distro='fedora-atomic' \
45 fedora-atomic-latest 45 fedora-atomic-ocata
46 +------------------+------------------------------------------------------+ 46 +------------------+------------------------------------------------------+
47 | Field | Value | 47 | Field | Value |
48 +------------------+------------------------------------------------------+ 48 +------------------+------------------------------------------------------+
@@ -54,7 +54,7 @@ and one node. Then, using docker's native API you will create a container.
54 | id | 81b25935-3400-441a-9f2e-f984a46c89dd | 54 | id | 81b25935-3400-441a-9f2e-f984a46c89dd |
55 | min_disk | 0 | 55 | min_disk | 0 |
56 | min_ram | 0 | 56 | min_ram | 0 |
57 | name | fedora-atomic-latest | 57 | name | fedora-atomic-ocata |
58 | owner | c4b42942156741dfbc4775dbcb032841 | 58 | owner | c4b42942156741dfbc4775dbcb032841 |
59 | properties | os_distro='fedora-atomic' | 59 | properties | os_distro='fedora-atomic' |
60 | protected | False | 60 | protected | False |
@@ -88,7 +88,7 @@ and one node. Then, using docker's native API you will create a container.
88 .. code-block:: console 88 .. code-block:: console
89 89
90 $ magnum cluster-template-create --name swarm-cluster-template \ 90 $ magnum cluster-template-create --name swarm-cluster-template \
91 --image fedora-atomic-latest \ 91 --image fedora-atomic-ocata \
92 --keypair mykey \ 92 --keypair mykey \
93 --external-network public \ 93 --external-network public \
94 --dns-nameserver 8.8.8.8 \ 94 --dns-nameserver 8.8.8.8 \
@@ -115,7 +115,7 @@ and one node. Then, using docker's native API you will create a container.
115 | server_type | vm | 115 | server_type | vm |
116 | external_network_id | public | 116 | external_network_id | public |
117 | cluster_distro | fedora-atomic | 117 | cluster_distro | fedora-atomic |
118 | image_id | fedora-atomic-latest | 118 | image_id | fedora-atomic-ocata |
119 | volume_driver | - | 119 | volume_driver | - |
120 | registry_enabled | False | 120 | registry_enabled | False |
121 | docker_storage_driver | devicemapper | 121 | docker_storage_driver | devicemapper |
diff --git a/magnum/tests/contrib/gate_hook.sh b/magnum/tests/contrib/gate_hook.sh
index 8ac2d5c..63c4e70 100755
--- a/magnum/tests/contrib/gate_hook.sh
+++ b/magnum/tests/contrib/gate_hook.sh
@@ -34,12 +34,12 @@ export DEVSTACK_LOCAL_CONFIG+=$'\n'"disable_service ceilometer-api"
34export DEVSTACK_LOCAL_CONFIG+=$'\n'"disable_service ceilometer-collector" 34export DEVSTACK_LOCAL_CONFIG+=$'\n'"disable_service ceilometer-collector"
35 35
36if [ "$coe" = "mesos" ]; then 36if [ "$coe" = "mesos" ]; then
37 export DEVSTACK_LOCAL_CONFIG+=$'\n'"MAGNUM_GUEST_IMAGE_URL=https://tarballs.openstack.org/magnum/images/ubuntu-mesos.qcow2" 37 export DEVSTACK_LOCAL_CONFIG+=$'\n'"MAGNUM_GUEST_IMAGE_URL=https://fedorapeople.org/groups/magnum/ubuntu-mesos-ocata.qcow2"
38elif [ "$coe" = "k8s-coreos" ]; then 38elif [ "$coe" = "k8s-coreos" ]; then
39 export DEVSTACK_LOCAL_CONFIG+=$'\n'"MAGNUM_GUEST_IMAGE_URL=http://beta.release.core-os.net/amd64-usr/current/coreos_production_openstack_image.img.bz2" 39 export DEVSTACK_LOCAL_CONFIG+=$'\n'"MAGNUM_GUEST_IMAGE_URL=http://beta.release.core-os.net/amd64-usr/1298.4.0/coreos_production_openstack_image.img.bz2"
40elif [ "${coe}${special}" = "k8s-ironic" ]; then 40elif [ "${coe}${special}" = "k8s-ironic" ]; then
41 export DEVSTACK_LOCAL_CONFIG+=$'\n'"MAGNUM_GUEST_IMAGE_URL='https://fedorapeople.org/groups/magnum/fedora-25-kubernetes-ironic.tar.gz'" 41 export DEVSTACK_LOCAL_CONFIG+=$'\n'"MAGNUM_GUEST_IMAGE_URL='https://fedorapeople.org/groups/magnum/fedora-25-kubernetes-ironic-ocata.tar.gz'"
42 export DEVSTACK_LOCAL_CONFIG+=$'\n'"MAGNUM_IMAGE_NAME='fedora-25-kubernetes-ironic'" 42 export DEVSTACK_LOCAL_CONFIG+=$'\n'"MAGNUM_IMAGE_NAME='fedora-25-kubernetes-ironic-ocata'"
43 43
44 export DEVSTACK_GATE_VIRT_DRIVER="ironic" 44 export DEVSTACK_GATE_VIRT_DRIVER="ironic"
45 # NOTE(yuanying): Current implementation requires only 1 subnet under network 45 # NOTE(yuanying): Current implementation requires only 1 subnet under network
@@ -75,8 +75,8 @@ elif [ "${coe}${special}" = "k8s-ironic" ]; then
75 export DEVSTACK_LOCAL_CONFIG+=$'\n'"IRONIC_VM_SPECS_DISK=10" 75 export DEVSTACK_LOCAL_CONFIG+=$'\n'"IRONIC_VM_SPECS_DISK=10"
76 export DEVSTACK_LOCAL_CONFIG+=$'\n'"IRONIC_VM_EPHEMERAL_DISK=5" 76 export DEVSTACK_LOCAL_CONFIG+=$'\n'"IRONIC_VM_EPHEMERAL_DISK=5"
77else 77else
78 export DEVSTACK_LOCAL_CONFIG+=$'\n'"MAGNUM_GUEST_IMAGE_URL='https://fedorapeople.org/groups/magnum/fedora-atomic-25-latest.qcow2'" 78 export DEVSTACK_LOCAL_CONFIG+=$'\n'"MAGNUM_GUEST_IMAGE_URL='https://fedorapeople.org/groups/magnum/fedora-atomic-ocata.qcow2'"
79 export DEVSTACK_LOCAL_CONFIG+=$'\n'"MAGNUM_IMAGE_NAME='fedora-atomic-25-latest'" 79 export DEVSTACK_LOCAL_CONFIG+=$'\n'"MAGNUM_IMAGE_NAME='fedora-atomic-ocata'"
80fi 80fi
81 81
82# Enable magnum plugin in the last step 82# Enable magnum plugin in the last step