From 629ca1f785fcd38464fa7ef4c1c2a797871e7435 Mon Sep 17 00:00:00 2001 From: Vladimir Kozhukalov Date: Mon, 27 Jun 2016 14:39:10 +0300 Subject: [PATCH] Remove fuel-mirror package Since now Packetary is a recommended tool to build/clone rpm/deb repositories and Fuel client is to be used to modify default repository settings. Change-Id: Ifd4ee718e70ff7dc8b4724c2a00f2aaeb3813b7f --- config.mk | 3 --- iso/bootstrap_admin_node.sh | 12 ++++++++---- packages/deb/module.mk | 1 - packages/module.mk | 2 -- packages/rpm/module.mk | 1 - repos.mk | 1 - requirements-fuel-rpm.txt | 1 - specs/fuel-main.spec | 1 - 8 files changed, 8 insertions(+), 14 deletions(-) diff --git a/config.mk b/config.mk index 44316b6fd..c777f6487 100644 --- a/config.mk +++ b/config.mk @@ -84,7 +84,6 @@ FUEL_AGENT_REPO?=https://github.com/openstack/fuel-agent.git FUEL_NAILGUN_AGENT_REPO?=https://github.com/openstack/fuel-nailgun-agent.git ASTUTE_REPO?=https://github.com/openstack/fuel-astute.git OSTF_REPO?=https://github.com/openstack/fuel-ostf.git -FUEL_MIRROR_REPO?=https://github.com/openstack/fuel-mirror.git FUELMENU_REPO?=https://github.com/openstack/fuel-menu.git SHOTGUN_REPO?=https://github.com/openstack/shotgun.git NETWORKCHECKER_REPO?=https://github.com/openstack/network-checker.git @@ -99,7 +98,6 @@ FUEL_AGENT_GERRIT_URL?=https://review.openstack.org/openstack/fuel-agent FUEL_NAILGUN_AGENT_GERRIT_URL?=https://review.openstack.org/openstack/fuel-nailgun-agent ASTUTE_GERRIT_URL?=https://review.openstack.org/openstack/fuel-astute OSTF_GERRIT_URL?=https://review.openstack.org/openstack/fuel-ostf -FUEL_MIRROR_GERRIT_URL?=https://review.openstack.org/openstack/fuel-mirror FUELMENU_GERRIT_URL?=https://review.openstack.org/openstack/fuel-menu SHOTGUN_GERRIT_URL?=https://review.openstack.org/openstack/shotgun NETWORKCHECKER_GERRIT_URL?=https://review.openstack.org/openstack/network-checker @@ -113,7 +111,6 @@ FUEL_AGENT_GERRIT_COMMIT?=none FUEL_NAILGUN_AGENT_GERRIT_COMMIT?=none ASTUTE_GERRIT_COMMIT?=none OSTF_GERRIT_COMMIT?=none -FUEL_MIRROR_GERRIT_COMMIT?=none FUELMAIN_GERRIT_COMMIT?=none FUELMENU_GERRIT_COMMIT?=none SHOTGUN_GERRIT_COMMIT?=none diff --git a/iso/bootstrap_admin_node.sh b/iso/bootstrap_admin_node.sh index 655bc51ae..9a0010e4a 100755 --- a/iso/bootstrap_admin_node.sh +++ b/iso/bootstrap_admin_node.sh @@ -302,11 +302,15 @@ sed -i -e "s/^\s*PrintMotd no/PrintMotd yes/g" /etc/ssh/sshd_config cat >> /etc/motd << EOF All environments use online repositories by default. -Use the following commands to create local repositories -on master node and change default repository settings: +Use the python-packetary package to create local repositories: -* CentOS: fuel-mirror (see --help for options) -* Ubuntu: fuel-mirror (see --help for options) +yum install python-packetary +packetary --help + +Use python-fuelclient package to modify default repository settings: + +yum install python-fuelclient (installed by default) +fuel2 --help EOF diff --git a/packages/deb/module.mk b/packages/deb/module.mk index c0ba73775..eb51b4a38 100644 --- a/packages/deb/module.mk +++ b/packages/deb/module.mk @@ -75,7 +75,6 @@ fuel_debian_packages:=fuel-nailgun \ astute \ fuel-agent \ fuel-library$(FUEL_LIBRARY_VERSION) \ -fuel-mirror \ nailgun-agent \ network-checker diff --git a/packages/module.mk b/packages/module.mk index 55bca8f34..764a0d8db 100644 --- a/packages/module.mk +++ b/packages/module.mk @@ -76,8 +76,6 @@ $(eval $(call prepare_git_source,fuel-agent,fuel-agent-$(PACKAGE_VERSION).tar.gz $(eval $(call prepare_git_source,nailgun-agent,nailgun-agent-$(PACKAGE_VERSION).tar.gz,$(BUILD_DIR)/repos/nailgun-agent,HEAD,$(FUEL_NAILGUN_AGENT_GERRIT_COMMIT))) #FUEL-IMAGE PKGS $(eval $(call prepare_git_source,fuel-main,fuel-$(PACKAGE_VERSION).tar.gz,$(BUILD_DIR)/repos/fuel-main,HEAD,$(FUELMAIN_GERRIT_COMMIT))) -#FUEL-MIRROR PKGS -$(eval $(call prepare_git_source,fuel-mirror,fuel-mirror-$(PACKAGE_VERSION).tar.gz,$(BUILD_DIR)/repos/fuel-mirror,HEAD,$(FUEL_MIRROR_GERRIT_COMMIT))) #FUEL-MENU PKGS $(eval $(call prepare_git_source,fuelmenu,fuelmenu-$(PACKAGE_VERSION).tar.gz,$(BUILD_DIR)/repos/fuelmenu,HEAD,$(FUELMENU_GERRIT_COMMIT))) #FUEL-UI PKGS diff --git a/packages/rpm/module.mk b/packages/rpm/module.mk index b235f1d72..a92339361 100644 --- a/packages/rpm/module.mk +++ b/packages/rpm/module.mk @@ -85,7 +85,6 @@ astute \ fuel-agent \ fuel-library$(FUEL_LIBRARY_VERSION) \ fuel-main \ -fuel-mirror \ fuel-nailgun \ fuel-ostf \ fuel-ui \ diff --git a/repos.mk b/repos.mk index b467bbfec..b60b74ebf 100644 --- a/repos.mk +++ b/repos.mk @@ -36,7 +36,6 @@ $(eval $(call build_repo,nailgun-agent,$(FUEL_NAILGUN_AGENT_REPO),$(FUEL_NAILGUN $(eval $(call build_repo,astute,$(ASTUTE_REPO),$(ASTUTE_COMMIT),$(ASTUTE_GERRIT_URL),$(ASTUTE_GERRIT_COMMIT))) $(eval $(call build_repo,fuel-library,$(FUELLIB_REPO),$(FUELLIB_COMMIT),$(FUELLIB_GERRIT_URL),$(FUELLIB_GERRIT_COMMIT))) $(eval $(call build_repo,fuel-ostf,$(OSTF_REPO),$(OSTF_COMMIT),$(OSTF_GERRIT_URL),$(OSTF_GERRIT_COMMIT))) -$(eval $(call build_repo,fuel-mirror,$(FUEL_MIRROR_REPO),$(FUEL_MIRROR_COMMIT),$(FUEL_MIRROR_GERRIT_URL),$(FUEL_MIRROR_GERRIT_COMMIT))) $(eval $(call build_repo,fuelmenu,$(FUELMENU_REPO),$(FUELMENU_COMMIT),$(FUELMENU_GERRIT_URL),$(FUELMENU_GERRIT_COMMIT))) $(eval $(call build_repo,shotgun,$(SHOTGUN_REPO),$(SHOTGUN_COMMIT),$(SHOTGUN_GERRIT_URL),$(SHOTGUN_GERRIT_COMMIT))) $(eval $(call build_repo,network-checker,$(NETWORKCHECKER_REPO),$(NETWORKCHECKER_COMMIT),$(NETWORKCHECKER_GERRIT_URL),$(NETWORKCHECKER_GERRIT_COMMIT))) diff --git a/requirements-fuel-rpm.txt b/requirements-fuel-rpm.txt index b575e1c48..1211149ca 100644 --- a/requirements-fuel-rpm.txt +++ b/requirements-fuel-rpm.txt @@ -6,7 +6,6 @@ fuel-ha-utils fuel-library fuelmenu fuel-migrate -fuel-mirror fuel-misc fuel-nailgun fuel-notify diff --git a/specs/fuel-main.spec b/specs/fuel-main.spec index 9d38a3468..ca4849f56 100644 --- a/specs/fuel-main.spec +++ b/specs/fuel-main.spec @@ -21,7 +21,6 @@ Requires: fuelmenu >= %{version} Requires: fuel-release >= %{version} Requires: network-checker >= %{version} Requires: python-fuelclient >= %{version} -Requires: fuel-mirror >= %{version} Requires: shotgun >= %{version} Requires: yum