diff --git a/kolla_cli/api/properties.py b/kolla_cli/api/properties.py index e3b170f..0de120a 100644 --- a/kolla_cli/api/properties.py +++ b/kolla_cli/api/properties.py @@ -145,10 +145,8 @@ class PropertyApi(object): property_list = ansible_properties.get_all_unique() elif property_type == GROUP_TYPE: property_list = ansible_properties.get_group_list(get_set) - elif property_type == HOST_TYPE: - property_list = ansible_properties.get_host_list(get_set) else: - property_list = ansible_properties.get_default_unique() + property_list = ansible_properties.get_host_list(get_set) override_flags = ansible_properties.get_all_override_flags() diff --git a/kolla_cli/common/properties.py b/kolla_cli/common/properties.py index 2f33e89..50e6664 100644 --- a/kolla_cli/common/properties.py +++ b/kolla_cli/common/properties.py @@ -33,13 +33,6 @@ GLOBALS_PATH = 'ansible/group_vars/__GLOBAL__' ANSIBLE_ROLES_PATH = 'ansible/roles' ANSIBLE_DEFAULTS_PATH = 'defaults/main.yml' -DEFAULT_KEYS = ['kolla_base_distro', - 'kolla_install_type', - 'openstack_release', - 'kolla_internal_vip_address', - 'network_interface', - 'neutron_external_interface'] - class AnsibleProperties(object): @@ -246,14 +239,6 @@ class AnsibleProperties(object): unique_list.append(value) return sorted(unique_list, key=lambda x: x.name) - def get_default_unique(self): - self._load_properties() - default_list = [] - for key, value in self.unique_global_props.items(): - if key in DEFAULT_KEYS or key.startswith('enable_'): - default_list.append(value) - return default_list - def get_all_override_flags(self): self._load_properties() return self.unique_override_flags