Browse Source

Merge "Pin images for ocata" into stable/ocata

tags/4.1.1
Jenkins 2 years ago
parent
commit
b2d43a32fa

+ 1
- 1
devstack/plugin.sh View File

@@ -13,7 +13,7 @@ if is_service_enabled magnum-api magnum-cond; then
13 13
         echo_summary "Installing magnum"
14 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 17
         IMAGE_URLS+=",${MAGNUM_GUEST_IMAGE_URL}"
18 18
 
19 19
         LIBS_FROM_GIT="${LIBS_FROM_GIT},python-magnumclient"

+ 4
- 4
doc/source/dev/quickstart.rst View File

@@ -211,7 +211,7 @@ when installing devstack use::
211 211
     | 090de3a2-2c0c-42d5-b5a3-cfcddd6d011b | cirros-0.3.4-x86_64-uec         | ami         | ami              | 25165824  | active | f98b9727094d40c78b1ed40e3bc91e80 |
212 212
     | 9501d296-f0aa-4c0e-bc24-2a680f8741f0 | cirros-0.3.4-x86_64-uec-kernel  | aki         | aki              | 4979632   | active | f98b9727094d40c78b1ed40e3bc91e80 |
213 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
 
217 217
 To list the available commands and resources for magnum, use::
@@ -255,7 +255,7 @@ Fedora Atomic. The COE (Container Orchestration Engine) and keypair need to
255 255
 be specified as well::
256 256
 
257 257
     magnum cluster-template-create --name k8s-cluster-template \
258
-                           --image fedora-atomic-latest \
258
+                           --image fedora-atomic-ocata  \
259 259
                            --keypair testkey \
260 260
                            --external-network public \
261 261
                            --dns-nameserver 8.8.8.8 \
@@ -335,7 +335,7 @@ Building a Kubernetes Cluster - Based on CoreOS
335 335
 You can create a Kubernetes cluster based on CoreOS as an alternative to
336 336
 Atomic. 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 339
     bunzip2 coreos_production_openstack_image.img.bz2
340 340
 
341 341
 Upload the image to glance::
@@ -525,7 +525,7 @@ except for the absence of some Kubernetes-specific arguments and the use of
525 525
 'swarm' as the COE::
526 526
 
527 527
     magnum cluster-template-create --name swarm-cluster-template \
528
-                           --image fedora-atomic-latest \
528
+                           --image fedora-atomic-ocata  \
529 529
                            --keypair testkey \
530 530
                            --external-network public \
531 531
                            --dns-nameserver 8.8.8.8 \

+ 2
- 2
doc/source/magnum-proxy.rst View File

@@ -41,7 +41,7 @@ You can specify all three proxy parameters while creating ClusterTemplate of
41 41
 any coe type. All of proxy parameters are optional.
42 42
 
43 43
     magnum cluster-template-create --name k8s-cluster-template \
44
-                       --image fedora-atomic-latest \
44
+                       --image fedora-atomic-ocata \
45 45
                        --keypair testkey \
46 46
                        --external-network public \
47 47
                        --dns-nameserver 8.8.8.8 \
@@ -51,7 +51,7 @@ any coe type. All of proxy parameters are optional.
51 51
                        --https-proxy <https://abc-proxy.com:8080> \
52 52
                        --no-proxy <172.24.4.4,172.24.4.9,172.24.4.8>
53 53
     magnum cluster-template-create --name swarm-cluster-template \
54
-                       --image fedora-atomic-latest \
54
+                       --image fedora-atomic-ocata \
55 55
                        --keypair testkey \
56 56
                        --external-network public \
57 57
                        --dns-nameserver 8.8.8.8 \

+ 6
- 6
doc/source/userguide.rst View File

@@ -935,7 +935,7 @@ When Magnum deploys a Kubernetes cluster, it uses parameters defined in the
935 935
 ClusterTemplate and specified on the cluster-create command, for example::
936 936
 
937 937
     magnum cluster-template-create --name k8s-cluster-template \
938
-                               --image fedora-atomic-latest \
938
+                               --image fedora-atomic-ocata \
939 939
                                --keypair testkey \
940 940
                                --external-network public \
941 941
                                --dns-nameserver 8.8.8.8 \
@@ -993,7 +993,7 @@ Image (image)
993 993
   Current supported images are Fedora Atomic (download from `Fedora
994 994
   <https://alt.fedoraproject.org/pub/alt/atomic/stable/Cloud-Images/x86_64/Images>`_ )
995 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
 
998 998
 TLS (tls-disabled)
999 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
1066 1066
 example::
1067 1067
 
1068 1068
     magnum cluster-template-create --name swarm-cluster-template \
1069
-                               --image fedora-atomic-latest \
1069
+                               --image fedora-atomic-ocata \
1070 1070
                                --keypair testkey \
1071 1071
                                --external-network public \
1072 1072
                                --dns-nameserver 8.8.8.8 \
@@ -1500,7 +1500,7 @@ Magnum, therefore it does not need to be specified via a parameter::
1500 1500
     magnum cluster-template-create --name secure-kubernetes \
1501 1501
                                --keypair default \
1502 1502
                                --external-network public \
1503
-                               --image fedora-atomic-latest \
1503
+                               --image fedora-atomic-ocata \
1504 1504
                                --dns-nameserver 8.8.8.8 \
1505 1505
                                --flavor m1.small \
1506 1506
                                --docker-volume-size 3 \
@@ -1525,7 +1525,7 @@ Magnum, therefore it does not need to be specified via a parameter::
1525 1525
     | server_type           | vm                                   |
1526 1526
     | external_network_id   | public                               |
1527 1527
     | cluster_distro        | fedora-atomic                        |
1528
-    | image_id              | fedora-atomic-latest                 |
1528
+    | image_id              | fedora-atomic-ocata                  |
1529 1529
     | volume_driver         | None                                 |
1530 1530
     | registry_enabled      | False                                |
1531 1531
     | docker_storage_driver | devicemapper                         |
@@ -2497,7 +2497,7 @@ Kubernetes on CoreOS
2497 2497
 --------------------
2498 2498
 
2499 2499
 CoreOS 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>`_
2501 2501
 that is being used to deploy Kubernetes.
2502 2502
 This image has the following OS/software:
2503 2503
 

+ 7
- 7
install-guide/source/launch-instance.rst View File

@@ -18,12 +18,12 @@ developer/magnum/userguide.html#cluster>`__ is constructed. Following this
18 18
 example, you will provision a Docker Swarm cluster with one master
19 19
 and 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 22
    required to provision the cluster:
23 23
 
24 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 28
 #. Source the ``demo`` credentials to perform
29 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 40
       $ openstack image create \
41 41
                             --disk-format=qcow2 \
42 42
                             --container-format=bare \
43
-                            --file=fedora-atomic-latest.qcow2 \
43
+                            --file=fedora-atomic-ocata.qcow2 \
44 44
                             --property os_distro='fedora-atomic' \
45
-                            fedora-atomic-latest
45
+                            fedora-atomic-ocata
46 46
       +------------------+------------------------------------------------------+
47 47
       | Field            | Value                                                |
48 48
       +------------------+------------------------------------------------------+
@@ -54,7 +54,7 @@ and one node. Then, using docker's native API you will create a container.
54 54
       | id               | 81b25935-3400-441a-9f2e-f984a46c89dd                 |
55 55
       | min_disk         | 0                                                    |
56 56
       | min_ram          | 0                                                    |
57
-      | name             | fedora-atomic-latest                                 |
57
+      | name             | fedora-atomic-ocata                                  |
58 58
       | owner            | c4b42942156741dfbc4775dbcb032841                     |
59 59
       | properties       | os_distro='fedora-atomic'                            |
60 60
       | protected        | False                                                |
@@ -88,7 +88,7 @@ and one node. Then, using docker's native API you will create a container.
88 88
    .. code-block:: console
89 89
 
90 90
       $ magnum cluster-template-create --name swarm-cluster-template \
91
-                           --image fedora-atomic-latest \
91
+                           --image fedora-atomic-ocata \
92 92
                            --keypair mykey \
93 93
                            --external-network public \
94 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 115
       | server_type           | vm                                   |
116 116
       | external_network_id   | public                               |
117 117
       | cluster_distro        | fedora-atomic                        |
118
-      | image_id              | fedora-atomic-latest                 |
118
+      | image_id              | fedora-atomic-ocata                  |
119 119
       | volume_driver         | -                                    |
120 120
       | registry_enabled      | False                                |
121 121
       | docker_storage_driver | devicemapper                         |

+ 6
- 6
magnum/tests/contrib/gate_hook.sh View File

@@ -34,12 +34,12 @@ export DEVSTACK_LOCAL_CONFIG+=$'\n'"disable_service ceilometer-api"
34 34
 export DEVSTACK_LOCAL_CONFIG+=$'\n'"disable_service ceilometer-collector"
35 35
 
36 36
 if [ "$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"
38 38
 elif [ "$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"
40 40
 elif [ "${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'"
42
-    export DEVSTACK_LOCAL_CONFIG+=$'\n'"MAGNUM_IMAGE_NAME='fedora-25-kubernetes-ironic'"
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-ocata'"
43 43
 
44 44
     export DEVSTACK_GATE_VIRT_DRIVER="ironic"
45 45
     # NOTE(yuanying): Current implementation requires only 1 subnet under network
@@ -75,8 +75,8 @@ elif [ "${coe}${special}" = "k8s-ironic" ]; then
75 75
     export DEVSTACK_LOCAL_CONFIG+=$'\n'"IRONIC_VM_SPECS_DISK=10"
76 76
     export DEVSTACK_LOCAL_CONFIG+=$'\n'"IRONIC_VM_EPHEMERAL_DISK=5"
77 77
 else
78
-    export DEVSTACK_LOCAL_CONFIG+=$'\n'"MAGNUM_GUEST_IMAGE_URL='https://fedorapeople.org/groups/magnum/fedora-atomic-25-latest.qcow2'"
79
-    export DEVSTACK_LOCAL_CONFIG+=$'\n'"MAGNUM_IMAGE_NAME='fedora-atomic-25-latest'"
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-ocata'"
80 80
 fi
81 81
 
82 82
 # Enable magnum plugin in the last step

Loading…
Cancel
Save