Removing docker iaas provider from cc xml
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/2b5cbd81 Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/2b5cbd81 Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/2b5cbd81 Branch: refs/heads/master Commit: 2b5cbd818aa035f58f7b3c8f97ca84c04949008f Parents: c1ad7a5 Author: Nirmal Fernando <[email protected]> Authored: Sat Dec 6 17:03:51 2014 +0530 Committer: Nirmal Fernando <[email protected]> Committed: Sun Dec 7 18:00:49 2014 +0530 ---------------------------------------------------------------------- .../src/main/resources/conf/cloud-controller.xml | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/stratos/blob/2b5cbd81/features/cloud-controller/org.apache.stratos.cloud.controller.feature/src/main/resources/conf/cloud-controller.xml ---------------------------------------------------------------------- diff --git a/features/cloud-controller/org.apache.stratos.cloud.controller.feature/src/main/resources/conf/cloud-controller.xml b/features/cloud-controller/org.apache.stratos.cloud.controller.feature/src/main/resources/conf/cloud-controller.xml index 8817d9a..7d9424c 100644 --- a/features/cloud-controller/org.apache.stratos.cloud.controller.feature/src/main/resources/conf/cloud-controller.xml +++ b/features/cloud-controller/org.apache.stratos.cloud.controller.feature/src/main/resources/conf/cloud-controller.xml @@ -49,7 +49,7 @@ is not necessary [0..1]. But you can use this section to avoid specifying same property over and over again. --> <iaasProviders> - <!-- iaasProvider type="openstack" name="openstack specific details"> + <iaasProvider type="openstack" name="openstack specific details"> <className>org.apache.stratos.cloud.controller.iaases.OpenstackNovaIaas</className> <provider>openstack-nova</provider> <identity svns:secretAlias="cloud.controller.openstack.identity">demo:demo</identity> @@ -60,12 +60,6 @@ <property name="openstack.networking.provider" value="nova" /> <property name="X" value="x" /> <property name="Y" value="y" /> - </iaasProvider --> - <iaasProvider type="docker" name="Docker"> - <className>org.apache.stratos.cloud.controller.iaases.DockerIaas</className> - <provider>docker</provider> - <identity svns:secretAlias="cloud.controller.docker.identity">identity</identity> - <credential svns:secretAlias="cloud.controller.docker.credential">credential</credential> - </iaasProvider> + </iaasProvider> </iaasProviders> </cloudController>
