diff options
| -rw-r--r-- | snaps/openstack/create_user.py | 3 | ||||
| -rw-r--r-- | snaps/openstack/utils/launch_utils.py | 6 |
2 files changed, 9 insertions, 0 deletions
diff --git a/snaps/openstack/create_user.py b/snaps/openstack/create_user.py index 5da3a5e..64912b3 100644 --- a/snaps/openstack/create_user.py +++ b/snaps/openstack/create_user.py @@ -91,6 +91,9 @@ class OpenStackUser(OpenStackIdentityObject): credentials :return: """ + if not project_name: + project_name = self._os_creds.project_name + return OSCreds( username=self.user_settings.name, password=self.user_settings.password, diff --git a/snaps/openstack/utils/launch_utils.py b/snaps/openstack/utils/launch_utils.py index 05d4cb5..0d65c61 100644 --- a/snaps/openstack/utils/launch_utils.py +++ b/snaps/openstack/utils/launch_utils.py @@ -675,6 +675,12 @@ def __get_network_variable_value(var_config_values, networks_dict): return subnet.gateway_ip if 'ip_range' == var_config_values['value']: return subnet.start + ' ' + subnet.end + if 'ip_range_start' == var_config_values['value']: + return subnet.start + if 'ip_range_end' == var_config_values['value']: + return subnet.end + if 'cidr' == var_config_values['value']: + return subnet.cidr if 'cidr_ip' == var_config_values['value']: cidr_split = subnet.cidr.split('/') return cidr_split[0] |