From e232c7f1a28bb4a98e4d9e4748d70ea4f5877bed Mon Sep 17 00:00:00 2001
From: Hua Wang <wanghua.humble@gmail.com>
Date: Mon, 18 Apr 2016 19:00:45 +0800
Subject: [PATCH] Heat params are different in swarm master and swarm node

Heat parameters are different in swarm master and swarm node.
So we should use different scripts to write the heat parameters.

Change-Id: I81625613913773e627d96f54374ae57af6fe64d3
Closes-Bug: #1571582
---
 ...ams.yaml => write-heat-params-master.yaml} |  0
 .../fragments/write-heat-params-node.yaml     | 26 +++++++++++++++++++
 magnum/templates/swarm/swarmmaster.yaml       |  2 +-
 magnum/templates/swarm/swarmnode.yaml         |  2 +-
 4 files changed, 28 insertions(+), 2 deletions(-)
 rename magnum/templates/swarm/fragments/{write-heat-params.yaml => write-heat-params-master.yaml} (100%)
 create mode 100644 magnum/templates/swarm/fragments/write-heat-params-node.yaml

diff --git a/magnum/templates/swarm/fragments/write-heat-params.yaml b/magnum/templates/swarm/fragments/write-heat-params-master.yaml
similarity index 100%
rename from magnum/templates/swarm/fragments/write-heat-params.yaml
rename to magnum/templates/swarm/fragments/write-heat-params-master.yaml
diff --git a/magnum/templates/swarm/fragments/write-heat-params-node.yaml b/magnum/templates/swarm/fragments/write-heat-params-node.yaml
new file mode 100644
index 0000000000..36b624f30a
--- /dev/null
+++ b/magnum/templates/swarm/fragments/write-heat-params-node.yaml
@@ -0,0 +1,26 @@
+#cloud-config
+merge_how: dict(recurse_array)+list(append)
+write_files:
+  - path: /etc/sysconfig/heat-params
+    owner: "root:root"
+    permissions: "0644"
+    content: |
+      WAIT_HANDLE="$WAIT_HANDLE"
+      DOCKER_VOLUME="$DOCKER_VOLUME"
+      HTTP_PROXY="$HTTP_PROXY"
+      HTTPS_PROXY="$HTTPS_PROXY"
+      NO_PROXY="$NO_PROXY"
+      SWARM_API_IP="$SWARM_API_IP"
+      SWARM_NODE_IP="$SWARM_NODE_IP"
+      BAY_UUID="$BAY_UUID"
+      MAGNUM_URL="$MAGNUM_URL"
+      TLS_DISABLED="$TLS_DISABLED"
+      NETWORK_DRIVER="$NETWORK_DRIVER"
+      ETCD_SERVER_IP="$ETCD_SERVER_IP"
+      API_IP_ADDRESS="$API_IP_ADDRESS"
+      SWARM_VERSION="$SWARM_VERSION"
+      AGENT_WAIT_HANDLE="$AGENT_WAIT_HANDLE"
+      TRUSTEE_USER_ID="$TRUSTEE_USER_ID"
+      TRUSTEE_PASSWORD="$TRUSTEE_PASSWORD"
+      TRUST_ID="$TRUST_ID"
+      AUTH_URL="$AUTH_URL"
diff --git a/magnum/templates/swarm/swarmmaster.yaml b/magnum/templates/swarm/swarmmaster.yaml
index 06dd366dfd..a6d44eb2c7 100644
--- a/magnum/templates/swarm/swarmmaster.yaml
+++ b/magnum/templates/swarm/swarmmaster.yaml
@@ -171,7 +171,7 @@ resources:
       group: ungrouped
       config:
         str_replace:
-          template: {get_file: fragments/write-heat-params.yaml}
+          template: {get_file: fragments/write-heat-params-master.yaml}
           params:
             "$WAIT_HANDLE": {get_resource: cloud_init_wait_handle}
             "$DOCKER_VOLUME": {get_resource: docker_volume}
diff --git a/magnum/templates/swarm/swarmnode.yaml b/magnum/templates/swarm/swarmnode.yaml
index 9a9e8450a7..89593f4534 100644
--- a/magnum/templates/swarm/swarmnode.yaml
+++ b/magnum/templates/swarm/swarmnode.yaml
@@ -147,7 +147,7 @@ resources:
       group: ungrouped
       config:
         str_replace:
-          template: {get_file: fragments/write-heat-params.yaml}
+          template: {get_file: fragments/write-heat-params-node.yaml}
           params:
             "$WAIT_HANDLE": {get_resource: node_cloud_init_wait_handle}
             "$DOCKER_VOLUME": {get_resource: docker_volume}