X-Git-Url: https://gerrit.akraino.org/r/gitweb?p=ta%2Fcm-plugins.git;a=blobdiff_plain;f=inventoryhandlers%2Fopenstack%2Fopenstackinventory.py;fp=inventoryhandlers%2Fopenstack%2Fopenstackinventory.py;h=e3c748e32da953463ea83c82c193dbabc90e6f5a;hp=a8e8679febee93c584fbe463cbf610ac9a2cd7e1;hb=24d618be517a31349dffea80f538290b1989ee10;hpb=b3603a371a729a17e5130216fc71d67b6f0827e8 diff --git a/inventoryhandlers/openstack/openstackinventory.py b/inventoryhandlers/openstack/openstackinventory.py index a8e8679..e3c748e 100644 --- a/inventoryhandlers/openstack/openstackinventory.py +++ b/inventoryhandlers/openstack/openstackinventory.py @@ -37,7 +37,8 @@ json_text_setup = """ "keystone_auth_admin_password": "{{ general.openstack_password }}" }, "sudo_user": "{{ general.admin }}", - "sudo_user_password": "{{ general.password }}" + "sudo_user_password": "{{ general.password }}", + "sudo_user_authorized_keys": [ {% for key in general.admin_authorized_keys %}"{{ key }}"{% if not loop.last %},{% endif %}{% endfor %} ] } } } @@ -1098,6 +1099,7 @@ class General: self.admin = None self.password = None self.openstack_password = None + self.admin_authorized_keys = [] class Network: def __init__(self): @@ -1509,3 +1511,4 @@ class openstackinventory(cmansibleinventoryconfig.CMAnsibleInventoryConfigPlugin else: openstackconfighandler = self.confman.get_openstack_config_handler() self.general.openstack_password = openstackconfighandler.get_admin_password() + self.general.admin_authorized_keys = usersconf.get_admin_user_authorized_keys()