diff --git a/type/__recycledcloud_opennebula_node/files/lnth.ch.pub b/type/__recycledcloud_opennebula_node/files/lnth.ch.pub deleted file mode 100644 index cd38ef4..0000000 --- a/type/__recycledcloud_opennebula_node/files/lnth.ch.pub +++ /dev/null @@ -1 +0,0 @@ -ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQDEPIotg1yfaCg++zGUCg2MR2Aq/xfXb8+wWwYyIfgTdCoNB6L8EWcxpo73Wx8HkGjyYufo6nQOPBfkos1mrdpZCdxMShfixk6weywGCaIph0EEMwgvftTnK1HmZz935DEhJMm0GEEx2RNCUXVjfkPM8ASpfaNGzikseL1/HudBXgNb0umddnoHt5N15J5gTE9dNgnwvXqHAdeyPqJK+Mc0cxVQIt5tG9fps71/9Ovh0vJs8LQfpzdicB1QkRTxTI9Td9It843lz6iihznwSzFrzWpuc3HpSyx+1IUGoPUl+LdDeuxT0jK78MibCJ+r+t8pY62AochPd10Gjj5GF7DlE3dTHd0HurcvPtWzO/fx6ZLh7/kj4TKTs0AULJVH5puJ3j1RdCPJNPzYLUKoifxuoXnhtgBeyAoaZoV25aR/HPFj2kwOKCuS1SoctqNvG6ZPqFkWll5tc8QxddhHcul5+jMBTTOCzAHePKVinIRUbGVF9/MirYDjIfs7eounpok= oneadmin@bottom-center diff --git a/type/__recycledcloud_opennebula_node/files/lsne.ch.pub b/type/__recycledcloud_opennebula_node/files/lsne.ch.pub deleted file mode 100644 index 1f2296e..0000000 --- a/type/__recycledcloud_opennebula_node/files/lsne.ch.pub +++ /dev/null @@ -1 +0,0 @@ -ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQCtLXNb7LYaYpUSynmP5+25AJX0II0M0IuNHC++plxuYBu/ziouiSHsfyoVeBUTXbPAxmz1Ginp1qSzXdL5R9J1ryUPDq8Ml/V+Wj3HrISxGjIrhBXABCct3U2XfN4Ag4KYapmDREe2EJ1TaSNOGUaVoL2/kxw4Uz8v4V6YNiXsN2l8d3H9Tp2c0VpXRmSIaMWqETl0yl3f8rz2IAFRPNkc4GW+ChbYy3YR9dy8P2okBJR5d0nQqLtSSgneexNePG8X/1E8cqTOwJGFZh8G7gLdhHlalgrqLbEGR7JH5RZm87ml1OvlDWQQqjlTZLRdeHKz5ebHy+tHeYUCns2akNdu7+mSzUX4ZYY/3vrCE14G9Yoebff1kRcGnzS4mqG0dNAnOy+HT62rdfAuGCWQZqkNhgOTjaokxiK4Zhg5jUyTcyRiJaa1I25wdyOfRZQnqd2FTkW6zhalh+MloCXL9yugKHd2395lKwIualKVolqrRAtrdztsaiW9EgD5Fl9OJUk= oneadmin@gentle-pony diff --git a/type/__recycledcloud_opennebula_node/manifest b/type/__recycledcloud_opennebula_node/manifest index 3d490ee..54da80a 100644 --- a/type/__recycledcloud_opennebula_node/manifest +++ b/type/__recycledcloud_opennebula_node/manifest @@ -16,7 +16,7 @@ case "$os" in ;; esac -zone=$(cat "${__object:?}/parameter/zone") +oneadmin_pubkey=$(cat "${__object:?}/parameter/oneadmin-pubkey") LIBVIRT_KEY=$(cat "${__object:?}/parameter/ceph-secret") export LIBVIRT_KEY @@ -25,7 +25,7 @@ __opennebula_repo --one-release $ONE_RELEASE require="__opennebula_repo" __package opennebula-node require="__package/opennebula-node" __ssh_authorized_keys oneadmin \ - --key "$(cat "${__type:?}/files/$zone.pub")" + --key "$oneadmin_pubkey" mkdir -p "${__object:?}/files" "${__type:?}/files/ceph.client.libvirt.keyring.sh" > "${__object:?}/files/ceph.client.libvirt.keyring" diff --git a/type/__recycledcloud_opennebula_node/parameter/required b/type/__recycledcloud_opennebula_node/parameter/required index e0e554a..559a795 100644 --- a/type/__recycledcloud_opennebula_node/parameter/required +++ b/type/__recycledcloud_opennebula_node/parameter/required @@ -1,3 +1,3 @@ -zone ceph-secret ceph-secret-uuid +oneadmin-pubkey