File 0001-Fix-magnum-functional-api-v1-tests.patch of Package openstack-magnum
Index: magnum-3.1.2.dev20/magnum/drivers/swarm_fedora_atomic_v1/templates/cluster.yaml
===================================================================
--- magnum-3.1.2.dev20.orig/magnum/drivers/swarm_fedora_atomic_v1/templates/cluster.yaml
+++ magnum-3.1.2.dev20/magnum/drivers/swarm_fedora_atomic_v1/templates/cluster.yaml
@@ -420,6 +420,7 @@ resources:
auth_url: {get_param: auth_url}
volume_driver: {get_param: volume_driver}
rexray_preempt: {get_param: rexray_preempt}
+ node_name_id: 'swarm-master%index%'
swarm_nodes:
type: "OS::Heat::ResourceGroup"
@@ -465,6 +466,7 @@ resources:
registry_chunksize: {get_param: registry_chunksize}
volume_driver: {get_param: volume_driver}
rexray_preempt: {get_param: rexray_preempt}
+ node_name_id: 'swarm-node%index%'
outputs:
Index: magnum-3.1.2.dev20/magnum/drivers/swarm_fedora_atomic_v1/templates/swarmmaster.yaml
===================================================================
--- magnum-3.1.2.dev20.orig/magnum/drivers/swarm_fedora_atomic_v1/templates/swarmmaster.yaml
+++ magnum-3.1.2.dev20/magnum/drivers/swarm_fedora_atomic_v1/templates/swarmmaster.yaml
@@ -155,6 +155,10 @@ parameters:
other hosts are using the volume
default: "false"
+ node_name_id:
+ type: string
+ description: Node name
+
resources:
master_wait_handle:
@@ -382,6 +386,8 @@ resources:
swarm_master:
type: "OS::Nova::Server"
properties:
+ name:
+ get_param: node_name_id
image:
get_param: server_image
flavor:
Index: magnum-3.1.2.dev20/magnum/drivers/swarm_fedora_atomic_v1/templates/swarmnode.yaml
===================================================================
--- magnum-3.1.2.dev20.orig/magnum/drivers/swarm_fedora_atomic_v1/templates/swarmnode.yaml
+++ magnum-3.1.2.dev20/magnum/drivers/swarm_fedora_atomic_v1/templates/swarmnode.yaml
@@ -161,6 +161,10 @@ parameters:
other hosts are using the volume
default: "false"
+ node_name_id:
+ type: string
+ description: Node name
+
resources:
node_wait_handle:
@@ -346,6 +350,8 @@ resources:
swarm_node:
type: "OS::Nova::Server"
properties:
+ name:
+ get_param: node_name_id
image:
get_param: server_image
flavor: