Cherry-pick from [1] for file:
magnum/drivers/common/templates/fragments/configure_docker_storage_driver_atomic.sh
Revert changes in:
magnum/drivers/common/templates/fragments/configure-docker-storage.sh
magnum/drivers/common/templates/fragments/configure-cvmfs.sh

Related-Ticket: OS-4106
[1] https://review.openstack.org/#/c/417457/

drop all neutron objects, replace _ with - in nova nodes, add
cern-services false to instance metadata, replace first_address with
resources.0.dcos_master_external_ip in dcoscluster apiaddress output.

Cherry-pick: https://review.openstack.org/#/c/386435/

This patch provides support for installing dcos on centos using magnum.
A new coe type(dcos) is added. This provides support for vm.
Design spec and steps on how to test can be found in
contrib/drivers/dcos_centos_v1/README.md.

Problems:
1. Public agent nodes are not supported now.
2. There are still some bugs when load balancer creation in heat template.
   See https://bugs.launchpad.net/neutron/+bug/1635449



Co-Authored-By: fengbeihong <(fengbeihong@gmail.com)>
Co-Authored-By: vmud213 <(vinay50muddu@yahoo.com)>

Change-Id: I58b378b4bd6df34fd43307e4252cfbbd9bf593d8
Partially-Implements: blueprint mesos-dcos

Conflicts:
	magnum/tests/unit/objects/test_objects.py

Removed DCOS from magnum/objects/fields.py.

Cherry-pick: https://review.openstack.org/#/c/405374/

If nothing is specified a set of recommended default plugins is used,
which includes the ServiceAccount one.

Change-Id: I1383aae09ba68f8e83b07e3eaae40ab071f7be94
Closes-Bug: #1646489

Conflicts:
	doc/source/userguide.rst
	magnum/drivers/common/k8s_template_def.py
	magnum/drivers/common/templates/kubernetes/fragments/configure-kubernetes-master.sh
	magnum/drivers/k8s_coreos_v1/templates/kubecluster.yaml
	magnum/drivers/k8s_fedora_atomic_v1/templates/kubecluster.yaml
	magnum/drivers/k8s_fedora_atomic_v1/templates/kubemaster.yaml
	magnum/drivers/k8s_fedora_ironic_v1/templates/kubecluster.yaml
	magnum/drivers/k8s_fedora_ironic_v1/templates/kubemaster.yaml
	magnum/tests/functional/k8s/test_k8s_python_client.py
	magnum/tests/unit/conductor/handlers/test_k8s_cluster_conductor.py
	magnum/tests/unit/drivers/test_template_definition.py

it seems the kubelet looks for new plugins when started, so we need to
restart the kubelet after copying the cvmfs binary to its destination.

add systemd setup to configure cvmfs via docker-volume-cvmfs.

add new labels to configure cvmfs:
* cvmfs_enabled: if cvmfs configuration should be done (default true)
* cvmfs_tag: which docker-volume-cvmfs tag to use (default latest)

Implements OS-3825.

Cherry-pick: https://review.openstack.org/#/c/404782/

Podmaster is deprecated since k8s 1.2 and its docker
image is v1, incompatible with docker >=1.12.

* Remove podmaster pod
* Update manifests of kube-controller-manager and kube-scheduler
* Rename SoftwareConfig to reflect the new functionality

Closes-Bug: #1646109
Change-Id: Ibf4ce06cbf5b79a4241c58c67b13a7c68145d3ae

Conflicts:
	magnum/drivers/k8s_fedora_atomic_v1/templates/kubemaster.yaml

Cherry-pick: https://review.openstack.org/#/c/404789/7

Remove custom docker unit file and pass the necessary options
through /etc/sysconfig/docker file.

Change-Id: I6bf91843b9120b700d13aad54cef38342ae1f8bd
Closes-Bug: #1646123

Conflicts:
	magnum/drivers/swarm_fedora_atomic_v1/templates/fragments/write-docker-service.sh
	magnum/drivers/swarm_fedora_atomic_v1/templates/swarmmaster.yaml
	magnum/drivers/swarm_fedora_atomic_v1/templates/swarmnode.yaml

Cherry-pick: https://review.openstack.org/#/c/417457/8

Image contains:
kubernetes-1.4.7-1.fc25.x86_64
docker-1.12.5-4.git03508cc.fc25.x86_64
flannel-0.5.5-8.fc25.x86_64
etcd-3.0.15-1.fc25.x86_64

* For this upgrade the upstream image is used, which is
  uploaded here [1].
* Minor changes for flannel and docker-storage-setup
  were needed.
* The image will be built in the CI and uploaded to
  tarballs.openstack.org as soon as possible.

[1] https://fedorapeople.org/groups/magnum/fedora-atomic-25-20161221.qcow2

Change-Id: Iac6e30c530821a49a5c3978e335e0b1d56a576e0

Conflicts:
	magnum/drivers/common/templates/fragments/configure_docker_storage_driver_atomic.sh
	magnum/drivers/common/templates/kubernetes/fragments/write-network-config.sh
	magnum/drivers/k8s_fedora_atomic_v1/version.py
	magnum/drivers/swarm_fedora_atomic_v1/version.py
	magnum/tests/contrib/gate_hook.sh

Cherry-pick: https://review.openstack.org/#/c/407374/

With this patch following are done:-
- Configure Etcd with TLS support

Configure Following to commuicate with TLS enabled Etcd:-
- Flannel

Etcd also listens at http://127.0.0.1:2379, so on master nodes
etcdctl and kube apiserver can communicate without using
certificates.

if TLS_DISABLED="True" then TLS is not enabled for etcd.

Change-Id: I2147b67c4e346a4415e1f76c19ac68e94cb0a0fa
Partially-Implements: blueprint secure-etcd-cluster-coe

Conflicts:
	magnum/drivers/common/templates/kubernetes/fragments/configure-kubernetes-master.sh
	magnum/drivers/common/templates/kubernetes/fragments/configure-kubernetes-minion.sh
	magnum/drivers/common/templates/kubernetes/fragments/network-config-service.sh

Cern newton allpatches

See merge request !2

Change-Id: I63098bc0e16e4c75961d0078345007aabc31db61

drop dependency on neutron networks, subnets, routers, floating ips,
security groups, load balancers.

we don't currently have neutron enabled everywhere, and for several
cases these concepts are not yet supported by our neutron setup
(routers, floating ips, security groups, load balancers) or are
not available to users (networks, subnets).

for cases where the node ip is required, rely instead on the first_ip
exposed by the heat resource.

done for kubernetes, swarm and mesos.

Change-Id: I9c37053b6b1f381873766b72b260bd6eba622429

nova integrates with cern dns, which does not allows '_' in device names.
rename all magnum master and slave nodes on all drivers to use '-'
instead.

Change-Id: Ib2a05469e409f053e65a3d62b714fc5e263aae4c

set metadata property cern-services to false to all master and slave nodes
in swarm, kubernetes and mesos. this prevents nova from waiting until the
node appears in the cern dns before considering it active.

we don't rely on dns for any part of the magnum installation.

Change-Id: If9898b6386c8f753eb51d9fb04932d2238bd4791

add by default an additional pod with skydns, and configure kubernetes
to rely on it for the cluster internal dns resolve.

Change-Id: I9af4a1ccc5e068090cf4cdcd7be7105015130bc9

drop the cern ca certificates in the default location, so standard tools
can do remote calls to CERN services without disable tls checks.

Change-Id: I6ea9def9f1e75362c577d91995f5cf1a94c32e78

Cherry-Pick: https://review.openstack.org/#/c/391830/

In the swarm_atomic and k8s_atomic drivers container images are
stored in a dedicated cinder volume per cluster node. It is
proven that this architecture can be a scalability bottleneck.

Make the use of cinder volumes for container images and opt-in
option.  If docker-volume-size is not specified no cinder
volumes will be created. Before, if docker-volume-size wasn't
specified the default value was 25.

To use cinder volumes for container storage the user will
interact with magnum as before, (meaning the valid values are
integers starting from 1).

Closes-Bug: #1638006
Change-Id: I3394c62a43bbf950b7cf0b86a71b1d9b0481d68f

Conflicts:
* magnum/drivers/common/swarm_fedora_template_def.py
  [edited magnum/drivers/swarm_fedora_atomic_v1/template_def.py instead ]
* magnum/tests/unit/conductor/handlers/test_k8s_cluster_conductor.py
  Removed the unit test for the empty docker_volume_size case.
  Fixed the new unit to not metnion the driver.

allow magnum usage with nova network by disabling the requirement for
neutron.

this won't go upstream as it's not generic enough, but can be dropped
once we finish migrating all cells to neutron.

Change-Id: Ie98beae6b97cd2cb7f43aaf66d4e03aa7dac79b1

Cherry-Pick: https://review.openstack.org/#/c/381307/

Keypair can now be added during Cluster create command. This allows
Clusters to be created from the same ClusterTemplate but have
different keypair values when created. If not specified on create
then the value from the ClusterTemplate will be used. Adds keypair_id
to Cluster object and uses of keypair_id will use the value from Cluster
instead of ClusterTemplate.

Change-Id: I177a5aa06f881156944a9f74c9ccc3cd2abac492
Implements: blueprint keypair-override-on-create

Change-Id: I2e5c0f1cdac4b0ada48f016c29790bc7257475b5

Keypair can now be added during Cluster create command. This allows
Clusters to be created from the same ClusterTemplate but have
different keypair values when created. If not specified on create
then the value from the ClusterTemplate will be used. Adds keypair_id
to Cluster object and uses of keypair_id will use the value from Cluster
instead of ClusterTemplate.

Change-Id: I177a5aa06f881156944a9f74c9ccc3cd2abac492
Implements: blueprint keypair-override-on-create

Fix node name and auth_url

Backport to stable/newton.
Update the url to Keystone v2 which has been changed.
The name of the node registered in the kube-apiserver
was also changed at some point to use the IP instead of the
Nova instance name as was done originally, and this
breaks the Kubernetes plugin code.  Change the node name
back to the Nova instance name in the option
--hostname-override for kubelet.

Some update to the document.

With this patch, the load balancer works with Magnum Newton
and later, along with the image fedora-atomic-latest.
Important notes:
1. The current image has Kubernetes release 1.2 and this only
works with neutron LBaaS v1.  Support for LBaaS v2 requires
Kubernetes release 1.3 or later.  Magnum support for 1.3
is still in development.
2. LBaaS v1 has been removed in Newton and is only available
in Mitaka or by custom installation (likely requires some hacking).
This means to get the load balancer feature, you will want to
install Openstack Mitaka and Magnum Newton.

Change-Id: Iff51f4e667663c217b6365a75d502e64c9420629
Closes-Bug: #1524025

Output param is wrongly set in mesoscluster.yaml.
Corrected as below:-
mesos_slave_private --> mesos_slaves_private

Change-Id: I2a456c2153945ebf1ded6bcdd537d194b0d3a9bb

master node is not registered in k8s_coreos, it should
register but should be marked as non schedulable.
This is done by adding following parameters to kubelet
args:-
    --register-node=true
    --register-schedulable=false

Change-Id: Ifc2d52dadc128f4e09cfe5b1bea924dae725cd7c
Closes-Bug: #1625581
(cherry picked from commit b8dd781f)

cinder volume driver of kubernetes requires hostname to be
same as instance name so that volume can be attached to
node running the pod, hostname-override is not required
by cinder volume driver.

hostname-override was introduced with following patch:
I55df72c8f36d81852bde36018c17670101860f79

In this patch following are fixed:
1) v3 --> v2(incorrect keystone version) is changed to v3 --> v2.0
2) --hostname-override is not added to KUBELET_ARGS for cinder
volume driver.

Change-Id: I1347b934d99ad6fe04e124e295c4961fe77c6b20
Closes-Bug: #1625479
Closes-Bug: #1620455

Based on past experience, some failures are caused by using the
stable branch with latest image. In CoreOS, we cut the newton release
based on the image of version 1153.4.0, so newton branch should use
with that image.

Change-Id: I3af881946425c3a3bec41d4c61b8d6603bd77ba2

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
"ubuntu-14.04.3-mesos-0.25.0" to "ubuntu-mesos-newton" in this branch
In fedorapeople, a soft link was created from
"ubuntu-mesos-newton.qcow2" to "ubuntu-14.04.3-mesos-0.25.0.qcow2"

Change-Id: Ib80e29312ebdb8c420875c9fe4bd1d4f2c28453e

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

Change-Id: I619478bf83dfb55018bf69c0d9de5bb7bd2db646

Change-Id: Ib13faecab90dfc598f025de7a826bc6b21817229