summaryrefslogtreecommitdiffstats
path: root/mcp/patches
diff options
context:
space:
mode:
authorMichael Polenchuk <mpolenchuk@mirantis.com>2017-11-27 07:54:17 +0000
committerGerrit Code Review <gerrit@opnfv.org>2017-11-27 07:54:17 +0000
commit9c5e6936910b89fb8f3709e66f30b507a7e32857 (patch)
treedb244f27e2c4dd54ee0e20e76f245cbd71f1f363 /mcp/patches
parent052af82aa875dd6acf4a060484780e50b21448af (diff)
parent9a96a6292f82411a00faf373ca180cb32c26061c (diff)
Merge "[baremetal] MaaS: Fix adding mcp.rsa.pub"
Diffstat (limited to 'mcp/patches')
-rw-r--r--mcp/patches/0004-maas-region-use-authorized_keys-1st-entry.patch9
1 files changed, 6 insertions, 3 deletions
diff --git a/mcp/patches/0004-maas-region-use-authorized_keys-1st-entry.patch b/mcp/patches/0004-maas-region-use-authorized_keys-1st-entry.patch
index 9be6ca5a9..a4fb44b05 100644
--- a/mcp/patches/0004-maas-region-use-authorized_keys-1st-entry.patch
+++ b/mcp/patches/0004-maas-region-use-authorized_keys-1st-entry.patch
@@ -20,12 +20,13 @@ Signed-off-by: Charalampos Kominos <Charalampos.Kominos@enea.com>
---
diff --git a/maas/region.sls b/maas/region.sls
-index d3227ca..8a2243d 100644
--- a/maas/region.sls
+++ b/maas/region.sls
-@@ -179,8 +179,14 @@
+@@ -242,12 +242,16 @@
+ - require:
- module: maas_config
+-{%- if region.get('sshprefs', False) %}
maas_sshprefs:
- module.run:
- - name: maas.process_sshprefs
@@ -35,8 +36,10 @@ index d3227ca..8a2243d 100644
+# - name: maas.process_sshprefs
+# - require:
+ cmd.run:
-+ - name: "maas login {{ region.admin.username }} http://{{ region.bind.host }}:5240/MAAS/api/2.0 - < /var/lib/maas/.maas_credentials && SSH_KEY=$(cat authorized_keys | head -1) && maas opnfv sshkeys create \"key=$SSH_KEY\""
++ - name: "maas login {{ region.admin.username }} http://{{ region.bind.host }}:5240/MAAS/api/2.0 - < /var/lib/maas/.maas_credentials && SSH_KEY=$(cat authorized_keys | head -1) && (maas opnfv sshkeys read | grep -q \"$SSH_KEY\" || maas opnfv sshkeys create \"key=$SSH_KEY\")"
+ - cwd: "/home/ubuntu/.ssh"
- require:
- module: maas_config
+-{%- endif %}
+ {%- endif %}