#!/usr/bin/env python3
+# Copyright 2019 Canonical Ltd.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
import asyncio
import datetime
import logging
def get_descriptor(descriptor):
desc = None
try:
- tmp = yaml.load(descriptor)
+ tmp = yaml.safe_load(descriptor)
# Remove the envelope
root = list(tmp.keys())[0]
vca_user = os.getenv('VCA_USER', 'admin')
vca_charms = os.getenv('VCA_CHARMS', None)
vca_secret = os.getenv('VCA_SECRET', None)
+ vca_cacert = os.getenv('VCA_CACERT', None)
# Get the Juju Public key
juju_public_key = get_juju_public_key()
artifacts=vca_charms,
loop=loop,
juju_public_key=juju_public_key,
+ ca_cert=vca_cacert,
)
return client
)
machine_spec = {
- 'host': hostname,
- 'user': 'ubuntu',
+ 'hostname': hostname,
+ 'username': 'ubuntu',
}
await self.n2vc.DeployCharms(
return True
except Exception as ex:
debug("execute_initial_config_primitives exception: {}".format(ex))
-
+ raise ex
+
return False
@classmethod