From 0df577c6f0acc672b53d470e4cfedb1d7d9c53d1 Mon Sep 17 00:00:00 2001 From: Dan Prince Date: Mon, 15 Aug 2016 15:11:38 -0400 Subject: Add tripleo-packages composable service This creates a new service to help manage the puppet-tripleo class that enables and disables package installation features. NOTE: we can't move the upgrade setting into the new composable service yet due to coupling with the UpgradeDeployment resources. Change-Id: If35cf6a6f023e12ae8ebbc2d9929d244eb3ffa3a --- puppet/manifests/overcloud_cephstorage.pp | 1 - puppet/manifests/overcloud_compute.pp | 1 - puppet/manifests/overcloud_controller.pp | 1 - puppet/manifests/overcloud_controller_pacemaker.pp | 1 - puppet/manifests/overcloud_object.pp | 1 - puppet/manifests/overcloud_volume.pp | 1 - 6 files changed, 6 deletions(-) (limited to 'puppet/manifests') diff --git a/puppet/manifests/overcloud_cephstorage.pp b/puppet/manifests/overcloud_cephstorage.pp index df83496f..39b7aca2 100644 --- a/puppet/manifests/overcloud_cephstorage.pp +++ b/puppet/manifests/overcloud_cephstorage.pp @@ -13,7 +13,6 @@ # License for the specific language governing permissions and limitations # under the License. -include ::tripleo::packages include ::tripleo::firewall if hiera('step') >= 4 { diff --git a/puppet/manifests/overcloud_compute.pp b/puppet/manifests/overcloud_compute.pp index 19ec575a..b8f75c9c 100644 --- a/puppet/manifests/overcloud_compute.pp +++ b/puppet/manifests/overcloud_compute.pp @@ -13,7 +13,6 @@ # License for the specific language governing permissions and limitations # under the License. -include ::tripleo::packages include ::tripleo::firewall if hiera('step') >= 4 { diff --git a/puppet/manifests/overcloud_controller.pp b/puppet/manifests/overcloud_controller.pp index 30e7c8d9..6290cac3 100644 --- a/puppet/manifests/overcloud_controller.pp +++ b/puppet/manifests/overcloud_controller.pp @@ -13,7 +13,6 @@ # License for the specific language governing permissions and limitations # under the License. -include ::tripleo::packages include ::tripleo::firewall if hiera('step') >= 4 { diff --git a/puppet/manifests/overcloud_controller_pacemaker.pp b/puppet/manifests/overcloud_controller_pacemaker.pp index a782207e..ea6130c2 100644 --- a/puppet/manifests/overcloud_controller_pacemaker.pp +++ b/puppet/manifests/overcloud_controller_pacemaker.pp @@ -13,7 +13,6 @@ # License for the specific language governing permissions and limitations # under the License. -include ::tripleo::packages include ::tripleo::firewall if hiera('step') >= 4 { diff --git a/puppet/manifests/overcloud_object.pp b/puppet/manifests/overcloud_object.pp index 18e90d1f..428ba0f2 100644 --- a/puppet/manifests/overcloud_object.pp +++ b/puppet/manifests/overcloud_object.pp @@ -13,7 +13,6 @@ # License for the specific language governing permissions and limitations # under the License. -include ::tripleo::packages include ::tripleo::firewall if hiera('step') >= 4 { diff --git a/puppet/manifests/overcloud_volume.pp b/puppet/manifests/overcloud_volume.pp index f6787719..821474dc 100644 --- a/puppet/manifests/overcloud_volume.pp +++ b/puppet/manifests/overcloud_volume.pp @@ -13,7 +13,6 @@ # License for the specific language governing permissions and limitations # under the License. -include ::tripleo::packages include ::tripleo::firewall if hiera('step') >= 4 { -- cgit 1.2.3-korg