Merge "vCenter integration for Fuel 9.0kilo" into fuel9-kilo

deployment_scripts/puppet/manifests/common-repo.pp

@@ -13,5 +13,4 @@
 #    under the License.
 
 notice('MODULAR: contrail/common-repo.pp')
-
-class { 'contrail::common_repo': }
+include contrail::common_repo

deployment_scripts/puppet/manifests/compute-hiera.pp

@@ -14,4 +14,4 @@
 
 notice('MODULAR: contrail/compute-hiera.pp')
 
-class { 'contrail::compute::hiera': }
+include contrail::compute::hiera

deployment_scripts/puppet/manifests/contrail-compute-aggregate.pp

@@ -15,5 +15,4 @@
 notice('MODULAR: contrail/contrail-compute-aggregate.pp')
 
 include contrail
-
-class { 'contrail::compute::aggregate': }
+include contrail::compute::aggregate

deployment_scripts/puppet/manifests/contrail-compute-firewall.pp

@@ -15,4 +15,4 @@
 notice('MODULAR: contrail/contrail-compute-firewall.pp')
 
 include contrail
-class { 'contrail::compute::firewall': }
+include contrail::compute::firewall

deployment_scripts/puppet/manifests/contrail-compute-hugepages.pp

@@ -15,4 +15,4 @@
 notice('MODULAR: contrail/contrail-compute-hugepages.pp')
 
 include contrail
-class { 'contrail::compute::hugepages': }
+include contrail::compute::hugepages

deployment_scripts/puppet/manifests/contrail-compute-network.pp

@@ -15,4 +15,4 @@
 notice('MODULAR: contrail/contrail-compute-network.pp')
 
 include contrail
-class { 'contrail::compute::network': }
+include contrail::compute::network

deployment_scripts/puppet/manifests/contrail-compute-nova.pp

@@ -15,4 +15,4 @@
 notice('MODULAR: contrail/contrail-compute-nova.pp')
 
 include contrail
-class { 'contrail::compute::nova': }
+include contrail::compute::nova

deployment_scripts/puppet/manifests/contrail-compute-override.pp

@@ -15,5 +15,4 @@
 notice('MODULAR: contrail/contrail-compute-override.pp')
 
 include contrail
-
-class { 'contrail::compute::compute_override': }
+include contrail::compute::compute_override

deployment_scripts/puppet/manifests/contrail-compute-provision.pp

@@ -15,4 +15,4 @@
 notice('MODULAR: contrail/contrail-compute-provision.pp')
 
 include contrail
-class { 'contrail::provision::compute': }
+include contrail::provision::compute

deployment_scripts/puppet/manifests/contrail-compute-repo.pp

@@ -14,4 +14,4 @@
 
 notice('MODULAR: contrail/contrail-compute-repo.pp')
 
-class { 'contrail::compute::compute_repo':}
+include contrail::compute::compute_repo

deployment_scripts/puppet/manifests/contrail-compute-vmware-pkg.pp

@@ -0,0 +1,19 @@
+#    Copyright 2016 Mirantis, Inc.
+#
+#    Licensed under the Apache License, Version 2.0 (the "License"); you may
+#    not use this file except in compliance with the License. You may obtain
+#    a copy of the License at
+#
+#         http://www.apache.org/licenses/LICENSE-2.0
+#
+#    Unless required by applicable law or agreed to in writing, software
+#    distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+#    WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+#    License for the specific language governing permissions and limitations
+#    under the License.
+
+notice('MODULAR: contrail/contrail-compute-vmware-pkg.pp')
+
+include contrail
+include contrail::compute::vmware_pkg
+

deployment_scripts/puppet/manifests/contrail-compute-vmware-repo.pp

@@ -0,0 +1,19 @@
+#    Copyright 2016 Mirantis, Inc.
+#
+#    Licensed under the Apache License, Version 2.0 (the "License"); you may
+#    not use this file except in compliance with the License. You may obtain
+#    a copy of the License at
+#
+#         http://www.apache.org/licenses/LICENSE-2.0
+#
+#    Unless required by applicable law or agreed to in writing, software
+#    distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+#    WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+#    License for the specific language governing permissions and limitations
+#    under the License.
+
+notice('MODULAR: contrail/contrail-compute-vmware-repo.pp')
+
+include contrail
+include contrail::compute::vmware_repo
+

deployment_scripts/puppet/manifests/contrail-compute-vmware.pp

@@ -0,0 +1,19 @@
+#    Copyright 2016 Mirantis, Inc.
+#
+#    Licensed under the Apache License, Version 2.0 (the "License"); you may
+#    not use this file except in compliance with the License. You may obtain
+#    a copy of the License at
+#
+#         http://www.apache.org/licenses/LICENSE-2.0
+#
+#    Unless required by applicable law or agreed to in writing, software
+#    distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+#    WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+#    License for the specific language governing permissions and limitations
+#    under the License.
+
+notice('MODULAR: contrail/contrail-compute-vmware.pp')
+
+include contrail
+include contrail::compute::vmware
+

deployment_scripts/puppet/manifests/contrail-compute-vrouter.pp

@@ -15,4 +15,4 @@
 notice('MODULAR: contrail/contrail-compute-vrouter.pp')
 
 include contrail
-class { 'contrail::compute::vrouter': }
+include contrail::compute::vrouter

deployment_scripts/puppet/manifests/contrail-config-provision.pp

@@ -15,4 +15,4 @@
 notice('MODULAR: contrail/contrail-config-provision.pp')
 
 include contrail
-class { 'contrail::provision::config': }
+include contrail::provision::config

deployment_scripts/puppet/manifests/contrail-config.pp

@@ -15,6 +15,6 @@
 notice('MODULAR: contrail/contrail-config.pp')
 
 include contrail
-class { 'contrail::config': }
-class { 'contrail::analytics': }
-class { 'contrail::webui': }
+include contrail::config
+include contrail::analytics
+include contrail::webui

deployment_scripts/puppet/manifests/contrail-control-provision.pp

@@ -15,4 +15,4 @@
 notice('MODULAR: contrail/contrail-control-provision.pp')
 
 include contrail
-class { 'contrail::provision::control': }
+include contrail::provision::control

deployment_scripts/puppet/manifests/contrail-control.pp

@@ -15,4 +15,4 @@
 notice('MODULAR: contrail/contrail-control.pp')
 
 include contrail
-class { 'contrail::control': }
+include contrail::control

deployment_scripts/puppet/manifests/contrail-controller-aggregate.pp

@@ -15,5 +15,4 @@
 notice('MODULAR: contrail/contrail-controller-aggregate.pp')
 
 include contrail
-
-class { 'contrail::controller::aggregate': }
+include contrail::controller::aggregate

deployment_scripts/puppet/manifests/contrail-db-provision.pp

@@ -15,4 +15,4 @@
 notice('MODULAR: contrail/contrail-db-provision.pp')
 
 include contrail
-class { 'contrail::provision::db': }
+include contrail::provision::db

deployment_scripts/puppet/manifests/contrail-db.pp

@@ -15,4 +15,4 @@
 notice('MODULAR: contrail/contrail-db.pp')
 
 include contrail
-class { 'contrail::database': }
+include contrail::database

deployment_scripts/puppet/manifests/contrail-utils.pp

@@ -15,5 +15,4 @@
 notice('MODULAR: contrail/contrail-utils.pp')
 
 include contrail
-
-class { 'contrail::utils': }
+include contrail::utils

deployment_scripts/puppet/manifests/contrail-vmware.pp

@@ -0,0 +1,19 @@
+#    Copyright 2016 Mirantis, Inc.
+#
+#    Licensed under the Apache License, Version 2.0 (the "License"); you may
+#    not use this file except in compliance with the License. You may obtain
+#    a copy of the License at
+#
+#         http://www.apache.org/licenses/LICENSE-2.0
+#
+#    Unless required by applicable law or agreed to in writing, software
+#    distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+#    WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+#    License for the specific language governing permissions and limitations
+#    under the License.
+
+notice('MODULAR: contrail/contrail-vmware.pp')
+
+include contrail
+include contrail::contrail_vmware
+

deployment_scripts/puppet/manifests/controller-config.pp

@@ -15,4 +15,4 @@
 notice('MODULAR: contrail/controller-config.pp')
 
 include contrail
-class { 'contrail::controller': }
+include contrail::controller

deployment_scripts/puppet/manifests/controller-hiera-post.pp

@@ -15,5 +15,4 @@
 notice('MODULAR: contrail/controller-hiera-post.pp')
 
 include contrail
-
-class { 'contrail::controller::hiera_post':}
+include contrail::controller::hiera_post

deployment_scripts/puppet/manifests/controller-hiera-pre.pp

@@ -14,4 +14,4 @@
 
 notice('MODULAR: contrail/controller-hiera-pre.pp')
 
-class { 'contrail::controller::hiera_pre':}
+include contrail::controller::hiera_pre

deployment_scripts/puppet/manifests/controller-provision.pp

@@ -15,4 +15,4 @@
 notice('MODULAR: contrail/controller-provision.pp')
 
 include contrail
-class { 'contrail::provision::controller': }
+include contrail::provision::controller

deployment_scripts/puppet/manifests/controller-scheduler.pp

@@ -15,5 +15,4 @@
 notice('MODULAR: contrail/controller-scheduler.pp')
 
 include contrail
-
-class { 'contrail::controller::scheduler': }
+include contrail::controller::scheduler

deployment_scripts/puppet/manifests/controller-vip.pp

@@ -15,4 +15,4 @@
 notice('MODULAR: contrail/controller-vip.pp')
 
 include contrail
-class { 'contrail::vip': }
+include contrail::vip

deployment_scripts/puppet/manifests/controller-vmware.pp

@@ -0,0 +1,19 @@
+#    Copyright 2016 Mirantis, Inc.
+#
+#    Licensed under the Apache License, Version 2.0 (the "License"); you may
+#    not use this file except in compliance with the License. You may obtain
+#    a copy of the License at
+#
+#         http://www.apache.org/licenses/LICENSE-2.0
+#
+#    Unless required by applicable law or agreed to in writing, software
+#    distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+#    WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+#    License for the specific language governing permissions and limitations
+#    under the License.
+
+notice('MODULAR: contrail/controller-vmware.pp')
+
+include contrail
+include contrail::controller::vmware
+