diff options
| -rw-r--r-- | docs/how-to-use/LibraryUsage.rst | 3 | ||||
| -rw-r--r-- | examples/complex-network/deploy-complex-network.yaml | 4 | ||||
| -rw-r--r-- | examples/launch.py | 1 | ||||
| -rw-r--r-- | snaps/domain/role.py | 2 | ||||
| -rw-r--r-- | snaps/domain/user.py | 2 | ||||
| -rw-r--r-- | snaps/openstack/os_credentials.py | 4 | ||||
| -rw-r--r-- | snaps/openstack/tests/create_network_tests.py | 3 |
7 files changed, 10 insertions, 9 deletions
diff --git a/docs/how-to-use/LibraryUsage.rst b/docs/how-to-use/LibraryUsage.rst index 0a137ba..353891e 100644 --- a/docs/how-to-use/LibraryUsage.rst +++ b/docs/how-to-use/LibraryUsage.rst @@ -31,7 +31,7 @@ attributes are listed below: - project\_name (aka. tenant\_name) - identity\_api\_version (for obtaining Keystone authorization token. Versions 2.0 & v3 only validated.) -- image\_api\_version (Glance version 1 currently only validated) +- image\_api\_version (Glance version 1 & 2 only validated) - network\_api\_version (Neutron version 2 currently only validated) - compute\_api\_version (Nova version 2 currently only validated) - heat\_api\_version (Heat version 1 currently only validated) @@ -39,6 +39,7 @@ attributes are listed below: - project\_domain\_id (default='default') - interface (default='admin', used to specify the endpoint type for keystone: public, admin, internal) - cacert (default=False, expected values T|F to denote server certificate verification, else value contains the path to an HTTPS certificate) +- region_name (The region name default=None) - proxy\_settings - host (the HTTP proxy host) diff --git a/examples/complex-network/deploy-complex-network.yaml b/examples/complex-network/deploy-complex-network.yaml index eff36c9..7915c38 100644 --- a/examples/complex-network/deploy-complex-network.yaml +++ b/examples/complex-network/deploy-complex-network.yaml @@ -128,7 +128,7 @@ openstack: - subnet_name: mgr-subnet-2 ip: 10.0.2.30 floating_ips: -# TODO - Why is only one of these floating IPs not working and why does it vary which one? +# Add back after validation of multiple floating IP support # - floating_ip: # name: fip1 # port_name: mgr-app-port @@ -199,7 +199,7 @@ openstack: port_name: site2-host-port subnet_name: site2-subnet router_name: site2-router -# TODO - Add a playbook here... +# Add a playbook here... #ansible: # - playbook_location: main.yml # hosts: diff --git a/examples/launch.py b/examples/launch.py index 9067730..65142ef 100644 --- a/examples/launch.py +++ b/examples/launch.py @@ -266,7 +266,6 @@ def __create_instances(os_conn_config, instances_config, image_dict, raise e logger.info('Created configured instances') - # TODO Should there be an error if there isn't an instances config return vm_dict diff --git a/snaps/domain/role.py b/snaps/domain/role.py index 565a3f2..a68683e 100644 --- a/snaps/domain/role.py +++ b/snaps/domain/role.py @@ -23,7 +23,7 @@ class Role: """ Constructor :param name: the user's name - :param id: the user's id + :param role_id: the user's id """ self.name = name self.id = role_id diff --git a/snaps/domain/user.py b/snaps/domain/user.py index 0631642..e1b469f 100644 --- a/snaps/domain/user.py +++ b/snaps/domain/user.py @@ -23,7 +23,7 @@ class User: """ Constructor :param name: the user's name - :param id: the user's id + :param user_id: the user's id """ self.name = name self.id = user_id diff --git a/snaps/openstack/os_credentials.py b/snaps/openstack/os_credentials.py index 3054478..0cecfa5 100644 --- a/snaps/openstack/os_credentials.py +++ b/snaps/openstack/os_credentials.py @@ -42,8 +42,8 @@ class OSCreds: clients :param heat_api_version: The OpenStack's API version to use for Heat clients - :param user_domain_id: Used for v3 APIs - :param project_domain_id: Used for v3 APIs + :param user_domain_id: Used for v3 APIs (default='default') + :param project_domain_id: Used for v3 APIs (default='default') :param interface: Used to specify the endpoint type for keystone as public, admin, internal :param proxy_settings: instance of os_credentials.ProxySettings class diff --git a/snaps/openstack/tests/create_network_tests.py b/snaps/openstack/tests/create_network_tests.py index bd373f1..e941c67 100644 --- a/snaps/openstack/tests/create_network_tests.py +++ b/snaps/openstack/tests/create_network_tests.py @@ -614,8 +614,9 @@ class CreateNetworkTypeTests(OSComponentTestCase): # Create Network network_type = 'flat' - # TODO - this value must be variable to work on all OpenStack pods + # This value must be variable to work on all OpenStack pods physical_network = 'datacentre' + net_settings = NetworkSettings( name=self.net_config.network_settings.name, subnet_settings=self.net_config.network_settings.subnet_settings, |