From 152ec2ed75703ac216b17dc660ba94e551a8400c Mon Sep 17 00:00:00 2001 From: Ilya Dmitrichenko Date: Wed, 25 Mar 2015 12:56:24 +0000 Subject: [PATCH 1/3] coreos/azure: Do cleanup storage account (Azure/azure-xplat-cli#1615) --- docs/getting-started-guides/coreos/azure/lib/azure_wrapper.js | 3 +-- docs/getting-started-guides/coreos/azure/package.json | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/docs/getting-started-guides/coreos/azure/lib/azure_wrapper.js b/docs/getting-started-guides/coreos/azure/lib/azure_wrapper.js index 74ec0a8e4af..fb2eb870043 100644 --- a/docs/getting-started-guides/coreos/azure/lib/azure_wrapper.js +++ b/docs/getting-started-guides/coreos/azure/lib/azure_wrapper.js @@ -247,8 +247,7 @@ exports.destroy_cluster = function (state_file) { }); task_queue.push(['network', 'vnet', 'delete', '--quiet', conf.resources['vnet']]); - - // TODO: add storage deletion when AZURE_STORAGE_ACCOUNT is unset (depends on Azure/azure-xplat-cli#1615) + task_queue.push(['storage', 'account', 'delete', '--quiet', conf.storage_account]); exports.run_task_queue(); }; diff --git a/docs/getting-started-guides/coreos/azure/package.json b/docs/getting-started-guides/coreos/azure/package.json index 2644c5d17e2..1f28c503740 100644 --- a/docs/getting-started-guides/coreos/azure/package.json +++ b/docs/getting-started-guides/coreos/azure/package.json @@ -9,7 +9,7 @@ "author": "Ilya Dmitrichenko ", "license": "Apache 2.0", "dependencies": { - "azure-cli": "^0.8.15", + "azure-cli": "^0.8.16", "colors": "^1.0.3", "js-yaml": "^3.2.5", "openssl-wrapper": "^0.2.1", From edb39e0601568a0bde43a0d8c3b7270ac4475299 Mon Sep 17 00:00:00 2001 From: Ilya Dmitrichenko Date: Wed, 25 Mar 2015 13:40:10 +0000 Subject: [PATCH 2/3] coreos/azure: Move `storage_account` under resources --- .../coreos/azure/lib/azure_wrapper.js | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/docs/getting-started-guides/coreos/azure/lib/azure_wrapper.js b/docs/getting-started-guides/coreos/azure/lib/azure_wrapper.js index fb2eb870043..5075b46500b 100644 --- a/docs/getting-started-guides/coreos/azure/lib/azure_wrapper.js +++ b/docs/getting-started-guides/coreos/azure/lib/azure_wrapper.js @@ -165,17 +165,17 @@ exports.queue_default_network = function () { exports.queue_storage_if_needed = function() { if (!process.env['AZURE_STORAGE_ACCOUNT']) { - conf.storage_account = util.rand_suffix; + conf.resources['storage_account'] = util.rand_suffix; task_queue.push([ 'storage', 'account', 'create', get_location(), - conf.storage_account, + conf.resources['storage_account'], ]); - process.env['AZURE_STORAGE_ACCOUNT'] = conf.storage_account; + process.env['AZURE_STORAGE_ACCOUNT'] = conf.resources['storage_account']; } else { // Preserve it for resizing, so we don't create a new one by accedent, // when the environment variable is unset - conf.storage_account = process.env['AZURE_STORAGE_ACCOUNT']; + conf.resources['storage_account'] = process.env['AZURE_STORAGE_ACCOUNT']; } }; @@ -247,7 +247,7 @@ exports.destroy_cluster = function (state_file) { }); task_queue.push(['network', 'vnet', 'delete', '--quiet', conf.resources['vnet']]); - task_queue.push(['storage', 'account', 'delete', '--quiet', conf.storage_account]); + task_queue.push(['storage', 'account', 'delete', '--quiet', conf.resources['storage_account']]); exports.run_task_queue(); }; @@ -264,5 +264,5 @@ exports.load_state_for_resizing = function (state_file, node_type, new_nodes) { conf.nodes[node_type] += new_nodes; hosts.collection = conf.hosts; hosts.ssh_port_counter += conf.hosts.length; - process.env['AZURE_STORAGE_ACCOUNT'] = conf.storage_account; + process.env['AZURE_STORAGE_ACCOUNT'] = conf.resources['storage_account']; } From b6cc4cb22f628ff4d746e4ab60151145ea537c0b Mon Sep 17 00:00:00 2001 From: Ilya Dmitrichenko Date: Wed, 25 Mar 2015 13:42:59 +0000 Subject: [PATCH 3/3] coreos/azure: Update image IDs --- .../coreos/azure/lib/azure_wrapper.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/docs/getting-started-guides/coreos/azure/lib/azure_wrapper.js b/docs/getting-started-guides/coreos/azure/lib/azure_wrapper.js index 5075b46500b..9468add14a1 100644 --- a/docs/getting-started-guides/coreos/azure/lib/azure_wrapper.js +++ b/docs/getting-started-guides/coreos/azure/lib/azure_wrapper.js @@ -13,9 +13,9 @@ var inspect = require('util').inspect; var util = require('./util.js'); var coreos_image_ids = { - 'stable': '2b171e93f07c4903bcad35bda10acf22__CoreOS-Stable-557.2.0', - 'beta': '2b171e93f07c4903bcad35bda10acf22__CoreOS-Beta-557.2.0', - 'alpha': '2b171e93f07c4903bcad35bda10acf22__CoreOS-Alpha-584.0.0', + 'stable': '2b171e93f07c4903bcad35bda10acf22__CoreOS-Stable-607.0.0', + 'beta': '2b171e93f07c4903bcad35bda10acf22__CoreOS-Beta-612.1.0', // untested + 'alpha': '2b171e93f07c4903bcad35bda10acf22__CoreOS-Alpha-626.0.0', // untested }; var conf = {};