diff --git a/config.yaml b/config.yaml index 9305efd2..751b66b3 100755 --- a/config.yaml +++ b/config.yaml @@ -176,7 +176,7 @@ options: description: Name of the organization to create in Nuage VSD vsd-netpart-name: type: string - default: csp + default: juju-enterprise description: Name of the organization to create in Nuage VSD vsd-config-file: type: string diff --git a/hooks/neutron_api_hooks.py b/hooks/neutron_api_hooks.py index 6dad90f6..da218424 100755 --- a/hooks/neutron_api_hooks.py +++ b/hooks/neutron_api_hooks.py @@ -156,8 +156,6 @@ def vsd_changed(relation_id=None, remote_unit=None): with open (vsd_config_file, "r") as vsp: contents = vsp.read() log('vsd-rest-api-relation-changed: contents after: {}'.format(contents)) - configure_https() - @hooks.hook('upgrade-charm') @hooks.hook('config-changed') diff --git a/templates/icehouse/nuage_plugin.ini b/templates/icehouse/nuage_plugin.ini index 44d72d83..c6f8aaaf 100644 --- a/templates/icehouse/nuage_plugin.ini +++ b/templates/icehouse/nuage_plugin.ini @@ -3,7 +3,7 @@ # [ WARNING ] # Configuration file maintained by Juju. Local changes may be overwritten. ############################################################################### -[DEFAULT] +[restproxy] server = {{ vsd_server }} serverauth = {{ vsd_auth }} auth_resource = {{ vsd_auth_resource }}