Merge "Pin images for ocata" into stable/ocata
This commit is contained in:
commit
b2d43a32fa
|
@ -13,7 +13,7 @@ if is_service_enabled magnum-api magnum-cond; then
|
||||||
echo_summary "Installing magnum"
|
echo_summary "Installing magnum"
|
||||||
install_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-ocata.qcow2"}
|
||||||
IMAGE_URLS+=",${MAGNUM_GUEST_IMAGE_URL}"
|
IMAGE_URLS+=",${MAGNUM_GUEST_IMAGE_URL}"
|
||||||
|
|
||||||
LIBS_FROM_GIT="${LIBS_FROM_GIT},python-magnumclient"
|
LIBS_FROM_GIT="${LIBS_FROM_GIT},python-magnumclient"
|
||||||
|
|
|
@ -211,7 +211,7 @@ when installing devstack use::
|
||||||
| 090de3a2-2c0c-42d5-b5a3-cfcddd6d011b | cirros-0.3.4-x86_64-uec | ami | ami | 25165824 | active | f98b9727094d40c78b1ed40e3bc91e80 |
|
| 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 |
|
| 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 |
|
| 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-ocata | qcow2 | bare | 507928064 | active | f98b9727094d40c78b1ed40e3bc91e80 |
|
||||||
+--------------------------------------+---------------------------------+-------------+------------------+-----------+--------+----------------------------------+
|
+--------------------------------------+---------------------------------+-------------+------------------+-----------+--------+----------------------------------+
|
||||||
|
|
||||||
To list the available commands and resources for magnum, use::
|
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
|
||||||
be specified as well::
|
be specified as well::
|
||||||
|
|
||||||
magnum cluster-template-create --name k8s-cluster-template \
|
magnum cluster-template-create --name k8s-cluster-template \
|
||||||
--image fedora-atomic-latest \
|
--image fedora-atomic-ocata \
|
||||||
--keypair testkey \
|
--keypair testkey \
|
||||||
--external-network public \
|
--external-network public \
|
||||||
--dns-nameserver 8.8.8.8 \
|
--dns-nameserver 8.8.8.8 \
|
||||||
|
@ -335,7 +335,7 @@ Building a Kubernetes Cluster - Based on CoreOS
|
||||||
You can create a Kubernetes cluster based on CoreOS as an alternative to
|
You can create a Kubernetes cluster based on CoreOS as an alternative to
|
||||||
Atomic. First, download the official CoreOS image::
|
Atomic. First, download the official CoreOS image::
|
||||||
|
|
||||||
wget http://beta.release.core-os.net/amd64-usr/current/coreos_production_openstack_image.img.bz2
|
wget http://beta.release.core-os.net/amd64-usr/1298.4.0/coreos_production_openstack_image.img.bz2
|
||||||
bunzip2 coreos_production_openstack_image.img.bz2
|
bunzip2 coreos_production_openstack_image.img.bz2
|
||||||
|
|
||||||
Upload the image to glance::
|
Upload the image to glance::
|
||||||
|
@ -525,7 +525,7 @@ except for the absence of some Kubernetes-specific arguments and the use of
|
||||||
'swarm' as the COE::
|
'swarm' as the COE::
|
||||||
|
|
||||||
magnum cluster-template-create --name swarm-cluster-template \
|
magnum cluster-template-create --name swarm-cluster-template \
|
||||||
--image fedora-atomic-latest \
|
--image fedora-atomic-ocata \
|
||||||
--keypair testkey \
|
--keypair testkey \
|
||||||
--external-network public \
|
--external-network public \
|
||||||
--dns-nameserver 8.8.8.8 \
|
--dns-nameserver 8.8.8.8 \
|
||||||
|
|
|
@ -41,7 +41,7 @@ You can specify all three proxy parameters while creating ClusterTemplate of
|
||||||
any coe type. All of proxy parameters are optional.
|
any coe type. All of proxy parameters are optional.
|
||||||
|
|
||||||
magnum cluster-template-create --name k8s-cluster-template \
|
magnum cluster-template-create --name k8s-cluster-template \
|
||||||
--image fedora-atomic-latest \
|
--image fedora-atomic-ocata \
|
||||||
--keypair testkey \
|
--keypair testkey \
|
||||||
--external-network public \
|
--external-network public \
|
||||||
--dns-nameserver 8.8.8.8 \
|
--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> \
|
--https-proxy <https://abc-proxy.com:8080> \
|
||||||
--no-proxy <172.24.4.4,172.24.4.9,172.24.4.8>
|
--no-proxy <172.24.4.4,172.24.4.9,172.24.4.8>
|
||||||
magnum cluster-template-create --name swarm-cluster-template \
|
magnum cluster-template-create --name swarm-cluster-template \
|
||||||
--image fedora-atomic-latest \
|
--image fedora-atomic-ocata \
|
||||||
--keypair testkey \
|
--keypair testkey \
|
||||||
--external-network public \
|
--external-network public \
|
||||||
--dns-nameserver 8.8.8.8 \
|
--dns-nameserver 8.8.8.8 \
|
||||||
|
|
|
@ -935,7 +935,7 @@ When Magnum deploys a Kubernetes cluster, it uses parameters defined in the
|
||||||
ClusterTemplate and specified on the cluster-create command, for example::
|
ClusterTemplate and specified on the cluster-create command, for example::
|
||||||
|
|
||||||
magnum cluster-template-create --name k8s-cluster-template \
|
magnum cluster-template-create --name k8s-cluster-template \
|
||||||
--image fedora-atomic-latest \
|
--image fedora-atomic-ocata \
|
||||||
--keypair testkey \
|
--keypair testkey \
|
||||||
--external-network public \
|
--external-network public \
|
||||||
--dns-nameserver 8.8.8.8 \
|
--dns-nameserver 8.8.8.8 \
|
||||||
|
@ -993,7 +993,7 @@ Image (image)
|
||||||
Current supported images are Fedora Atomic (download from `Fedora
|
Current supported images are Fedora Atomic (download from `Fedora
|
||||||
<https://alt.fedoraproject.org/pub/alt/atomic/stable/Cloud-Images/x86_64/Images>`_ )
|
<https://alt.fedoraproject.org/pub/alt/atomic/stable/Cloud-Images/x86_64/Images>`_ )
|
||||||
and CoreOS (download from `CoreOS
|
and CoreOS (download from `CoreOS
|
||||||
<http://beta.release.core-os.net/amd64-usr/current/coreos_production_openstack_image.img.bz2>`_ )
|
<http://beta.release.core-os.net/amd64-usr/1298.4.0/coreos_production_openstack_image.img.bz2>`_ )
|
||||||
|
|
||||||
TLS (tls-disabled)
|
TLS (tls-disabled)
|
||||||
Transport Layer Security is enabled by default, so you need a key and
|
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
|
||||||
example::
|
example::
|
||||||
|
|
||||||
magnum cluster-template-create --name swarm-cluster-template \
|
magnum cluster-template-create --name swarm-cluster-template \
|
||||||
--image fedora-atomic-latest \
|
--image fedora-atomic-ocata \
|
||||||
--keypair testkey \
|
--keypair testkey \
|
||||||
--external-network public \
|
--external-network public \
|
||||||
--dns-nameserver 8.8.8.8 \
|
--dns-nameserver 8.8.8.8 \
|
||||||
|
@ -1500,7 +1500,7 @@ Magnum, therefore it does not need to be specified via a parameter::
|
||||||
magnum cluster-template-create --name secure-kubernetes \
|
magnum cluster-template-create --name secure-kubernetes \
|
||||||
--keypair default \
|
--keypair default \
|
||||||
--external-network public \
|
--external-network public \
|
||||||
--image fedora-atomic-latest \
|
--image fedora-atomic-ocata \
|
||||||
--dns-nameserver 8.8.8.8 \
|
--dns-nameserver 8.8.8.8 \
|
||||||
--flavor m1.small \
|
--flavor m1.small \
|
||||||
--docker-volume-size 3 \
|
--docker-volume-size 3 \
|
||||||
|
@ -1525,7 +1525,7 @@ Magnum, therefore it does not need to be specified via a parameter::
|
||||||
| server_type | vm |
|
| server_type | vm |
|
||||||
| external_network_id | public |
|
| external_network_id | public |
|
||||||
| cluster_distro | fedora-atomic |
|
| cluster_distro | fedora-atomic |
|
||||||
| image_id | fedora-atomic-latest |
|
| image_id | fedora-atomic-ocata |
|
||||||
| volume_driver | None |
|
| volume_driver | None |
|
||||||
| registry_enabled | False |
|
| registry_enabled | False |
|
||||||
| docker_storage_driver | devicemapper |
|
| docker_storage_driver | devicemapper |
|
||||||
|
@ -2497,7 +2497,7 @@ Kubernetes on CoreOS
|
||||||
--------------------
|
--------------------
|
||||||
|
|
||||||
CoreOS publishes a `stock image
|
CoreOS publishes a `stock image
|
||||||
<http://beta.release.core-os.net/amd64-usr/current/coreos_production_openstack_image.img.bz2>`_
|
<http://beta.release.core-os.net/amd64-usr/1298.4.0/coreos_production_openstack_image.img.bz2>`_
|
||||||
that is being used to deploy Kubernetes.
|
that is being used to deploy Kubernetes.
|
||||||
This image has the following OS/software:
|
This image has the following OS/software:
|
||||||
|
|
||||||
|
|
|
@ -18,12 +18,12 @@ developer/magnum/userguide.html#cluster>`__ is constructed. Following this
|
||||||
example, you will provision a Docker Swarm cluster with one master
|
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.
|
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 ocata Fedora Atomic image built by magnum team, which is
|
||||||
required to provision the cluster:
|
required to provision the cluster:
|
||||||
|
|
||||||
.. code-block:: console
|
.. code-block:: console
|
||||||
|
|
||||||
$ wget https://fedorapeople.org/groups/magnum/fedora-atomic-latest.qcow2
|
$ wget https://fedorapeople.org/groups/magnum/fedora-atomic-ocata.qcow2
|
||||||
|
|
||||||
#. Source the ``demo`` credentials to perform
|
#. Source the ``demo`` credentials to perform
|
||||||
the following steps as a non-administrative project:
|
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 \
|
$ openstack image create \
|
||||||
--disk-format=qcow2 \
|
--disk-format=qcow2 \
|
||||||
--container-format=bare \
|
--container-format=bare \
|
||||||
--file=fedora-atomic-latest.qcow2 \
|
--file=fedora-atomic-ocata.qcow2 \
|
||||||
--property os_distro='fedora-atomic' \
|
--property os_distro='fedora-atomic' \
|
||||||
fedora-atomic-latest
|
fedora-atomic-ocata
|
||||||
+------------------+------------------------------------------------------+
|
+------------------+------------------------------------------------------+
|
||||||
| Field | Value |
|
| 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 |
|
| id | 81b25935-3400-441a-9f2e-f984a46c89dd |
|
||||||
| min_disk | 0 |
|
| min_disk | 0 |
|
||||||
| min_ram | 0 |
|
| min_ram | 0 |
|
||||||
| name | fedora-atomic-latest |
|
| name | fedora-atomic-ocata |
|
||||||
| owner | c4b42942156741dfbc4775dbcb032841 |
|
| owner | c4b42942156741dfbc4775dbcb032841 |
|
||||||
| properties | os_distro='fedora-atomic' |
|
| properties | os_distro='fedora-atomic' |
|
||||||
| protected | False |
|
| protected | False |
|
||||||
|
@ -88,7 +88,7 @@ and one node. Then, using docker's native API you will create a container.
|
||||||
.. code-block:: console
|
.. code-block:: console
|
||||||
|
|
||||||
$ magnum cluster-template-create --name swarm-cluster-template \
|
$ magnum cluster-template-create --name swarm-cluster-template \
|
||||||
--image fedora-atomic-latest \
|
--image fedora-atomic-ocata \
|
||||||
--keypair mykey \
|
--keypair mykey \
|
||||||
--external-network public \
|
--external-network public \
|
||||||
--dns-nameserver 8.8.8.8 \
|
--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 |
|
| server_type | vm |
|
||||||
| external_network_id | public |
|
| external_network_id | public |
|
||||||
| cluster_distro | fedora-atomic |
|
| cluster_distro | fedora-atomic |
|
||||||
| image_id | fedora-atomic-latest |
|
| image_id | fedora-atomic-ocata |
|
||||||
| volume_driver | - |
|
| volume_driver | - |
|
||||||
| registry_enabled | False |
|
| registry_enabled | False |
|
||||||
| docker_storage_driver | devicemapper |
|
| docker_storage_driver | devicemapper |
|
||||||
|
|
|
@ -34,12 +34,12 @@ export DEVSTACK_LOCAL_CONFIG+=$'\n'"disable_service ceilometer-api"
|
||||||
export DEVSTACK_LOCAL_CONFIG+=$'\n'"disable_service ceilometer-collector"
|
export DEVSTACK_LOCAL_CONFIG+=$'\n'"disable_service ceilometer-collector"
|
||||||
|
|
||||||
if [ "$coe" = "mesos" ]; then
|
if [ "$coe" = "mesos" ]; then
|
||||||
export DEVSTACK_LOCAL_CONFIG+=$'\n'"MAGNUM_GUEST_IMAGE_URL=https://tarballs.openstack.org/magnum/images/ubuntu-mesos.qcow2"
|
export DEVSTACK_LOCAL_CONFIG+=$'\n'"MAGNUM_GUEST_IMAGE_URL=https://fedorapeople.org/groups/magnum/ubuntu-mesos-ocata.qcow2"
|
||||||
elif [ "$coe" = "k8s-coreos" ]; then
|
elif [ "$coe" = "k8s-coreos" ]; then
|
||||||
export DEVSTACK_LOCAL_CONFIG+=$'\n'"MAGNUM_GUEST_IMAGE_URL=http://beta.release.core-os.net/amd64-usr/current/coreos_production_openstack_image.img.bz2"
|
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"
|
||||||
elif [ "${coe}${special}" = "k8s-ironic" ]; then
|
elif [ "${coe}${special}" = "k8s-ironic" ]; then
|
||||||
export DEVSTACK_LOCAL_CONFIG+=$'\n'"MAGNUM_GUEST_IMAGE_URL='https://fedorapeople.org/groups/magnum/fedora-25-kubernetes-ironic.tar.gz'"
|
export DEVSTACK_LOCAL_CONFIG+=$'\n'"MAGNUM_GUEST_IMAGE_URL='https://fedorapeople.org/groups/magnum/fedora-25-kubernetes-ironic-ocata.tar.gz'"
|
||||||
export DEVSTACK_LOCAL_CONFIG+=$'\n'"MAGNUM_IMAGE_NAME='fedora-25-kubernetes-ironic'"
|
export DEVSTACK_LOCAL_CONFIG+=$'\n'"MAGNUM_IMAGE_NAME='fedora-25-kubernetes-ironic-ocata'"
|
||||||
|
|
||||||
export DEVSTACK_GATE_VIRT_DRIVER="ironic"
|
export DEVSTACK_GATE_VIRT_DRIVER="ironic"
|
||||||
# NOTE(yuanying): Current implementation requires only 1 subnet under network
|
# NOTE(yuanying): Current implementation requires only 1 subnet under network
|
||||||
|
@ -75,8 +75,8 @@ elif [ "${coe}${special}" = "k8s-ironic" ]; then
|
||||||
export DEVSTACK_LOCAL_CONFIG+=$'\n'"IRONIC_VM_SPECS_DISK=10"
|
export DEVSTACK_LOCAL_CONFIG+=$'\n'"IRONIC_VM_SPECS_DISK=10"
|
||||||
export DEVSTACK_LOCAL_CONFIG+=$'\n'"IRONIC_VM_EPHEMERAL_DISK=5"
|
export DEVSTACK_LOCAL_CONFIG+=$'\n'"IRONIC_VM_EPHEMERAL_DISK=5"
|
||||||
else
|
else
|
||||||
export DEVSTACK_LOCAL_CONFIG+=$'\n'"MAGNUM_GUEST_IMAGE_URL='https://fedorapeople.org/groups/magnum/fedora-atomic-25-latest.qcow2'"
|
export DEVSTACK_LOCAL_CONFIG+=$'\n'"MAGNUM_GUEST_IMAGE_URL='https://fedorapeople.org/groups/magnum/fedora-atomic-ocata.qcow2'"
|
||||||
export DEVSTACK_LOCAL_CONFIG+=$'\n'"MAGNUM_IMAGE_NAME='fedora-atomic-25-latest'"
|
export DEVSTACK_LOCAL_CONFIG+=$'\n'"MAGNUM_IMAGE_NAME='fedora-atomic-ocata'"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
# Enable magnum plugin in the last step
|
# Enable magnum plugin in the last step
|
||||||
|
|
Loading…
Reference in New Issue