From 4da42fb35f2393617ecaed33844edb12c9c1ed96 Mon Sep 17 00:00:00 2001 From: Emilien Macchi Date: Tue, 28 Mar 2017 18:09:59 -0400 Subject: [PATCH] Remove os-cloud-config Depracted in Ocata, we don't need it anymore. We're removing it everywhere. Change-Id: Ib3984c57b4ffe77e1ed30a8b593af6b0cc764749 Related-Bug: #1677008 --- scripts/tripleo-jobs-gerrit.py | 1 - scripts/tripleo.sh | 2 +- scripts/website/tripleo-reviewday.yaml | 1 - 3 files changed, 1 insertion(+), 3 deletions(-) diff --git a/scripts/tripleo-jobs-gerrit.py b/scripts/tripleo-jobs-gerrit.py index 6671af931..d339b0a10 100755 --- a/scripts/tripleo-jobs-gerrit.py +++ b/scripts/tripleo-jobs-gerrit.py @@ -35,7 +35,6 @@ DEFAULT_PROJECTS = [ 'openstack/instack', 'openstack/instack-undercloud', 'openstack/os-apply-config', - 'openstack/os-cloud-config', 'openstack/os-collect-config', 'openstack/os-net-config', 'openstack/os-refresh-config', diff --git a/scripts/tripleo.sh b/scripts/tripleo.sh index f07e9ac18..3648b5a33 100755 --- a/scripts/tripleo.sh +++ b/scripts/tripleo.sh @@ -329,7 +329,7 @@ function repo_setup { sudo sed -i 's/\[delorean\]/\[delorean-current\]/' $REPO_PREFIX/delorean-current.repo sudo /bin/bash -c "cat <<-EOF>>$REPO_PREFIX/delorean-current.repo -includepkgs=diskimage-builder,instack,instack-undercloud,os-apply-config,os-cloud-config,os-collect-config,os-net-config,os-refresh-config,python-tripleoclient,openstack-tripleo-common,openstack-tripleo-heat-templates,openstack-tripleo-image-elements,openstack-tripleo,openstack-tripleo-puppet-elements,openstack-puppet-modules,openstack-tripleo-ui,puppet-* +includepkgs=diskimage-builder,instack,instack-undercloud,os-apply-config,os-collect-config,os-net-config,os-refresh-config,python-tripleoclient,openstack-tripleo-common,openstack-tripleo-heat-templates,openstack-tripleo-image-elements,openstack-tripleo,openstack-tripleo-puppet-elements,openstack-puppet-modules,openstack-tripleo-ui,puppet-* EOF" cat $REPO_PREFIX/delorean-current.repo else diff --git a/scripts/website/tripleo-reviewday.yaml b/scripts/website/tripleo-reviewday.yaml index 5042f792d..e92990b74 100644 --- a/scripts/website/tripleo-reviewday.yaml +++ b/scripts/website/tripleo-reviewday.yaml @@ -7,7 +7,6 @@ projects: - name: instack-undercloud launchpad_project: tripleo - name: os-apply-config - - name: os-cloud-config - name: os-collect-config - name: os-net-config - name: os-refresh-config