openstack
/
fuel-main
Code Issues Proposed changes

fuel-createmirror is replaced by fuel-mirror 

fuel-package-updates is also replaced by fuel-mirror

Depends-On: #I296a5f356ca805deda28ea984df15c0b63b43a80
Closes-Bug: #1487077
Implements: blueprint refactor-local-mirror-scripts
Doc-Impact

Change-Id: I72e9ced2c20c615e841ec73b9c7e7bca022918cf
This commit is contained in:
bgaifullin 2015-11-27 00:24:22 +03:00 committed by Bulat Gaifullin
parent da9e572283
commit d1cda9fa50
8 changed files with 14 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
config.mk
View File

@ -96,7 +96,7 @@ FUEL_AGENT_COMMIT?=master
FUEL_NAILGUN_AGENT_COMMIT?=master FUEL_NAILGUN_AGENT_COMMIT?=master
ASTUTE_COMMIT?=master ASTUTE_COMMIT?=master
OSTF_COMMIT?=master OSTF_COMMIT?=master
CREATEMIRROR_COMMIT?=master FUEL_MIRROR_COMMIT?=master
FUELMENU_COMMIT?=master FUELMENU_COMMIT?=master
SHOTGUN_COMMIT?=master SHOTGUN_COMMIT?=master
NETWORKCHECKER_COMMIT?=master NETWORKCHECKER_COMMIT?=master
@ -109,7 +109,7 @@ FUEL_AGENT_REPO?=https://github.com/openstack/fuel-agent.git
FUEL_NAILGUN_AGENT_REPO?=https://github.com/openstack/fuel-nailgun-agent.git FUEL_NAILGUN_AGENT_REPO?=https://github.com/openstack/fuel-nailgun-agent.git
ASTUTE_REPO?=https://github.com/openstack/fuel-astute.git ASTUTE_REPO?=https://github.com/openstack/fuel-astute.git
OSTF_REPO?=https://github.com/openstack/fuel-ostf.git OSTF_REPO?=https://github.com/openstack/fuel-ostf.git
CREATEMIRROR_REPO?=https://github.com/openstack/fuel-mirror.git FUEL_MIRROR_REPO?=https://github.com/openstack/fuel-mirror.git
FUELMENU_REPO?=https://github.com/openstack/fuel-menu.git FUELMENU_REPO?=https://github.com/openstack/fuel-menu.git
SHOTGUN_REPO?=https://github.com/openstack/shotgun.git SHOTGUN_REPO?=https://github.com/openstack/shotgun.git
NETWORKCHECKER_REPO?=https://github.com/openstack/network-checker.git NETWORKCHECKER_REPO?=https://github.com/openstack/network-checker.git
@ -123,7 +123,7 @@ FUEL_AGENT_GERRIT_URL?=https://review.openstack.org/openstack/fuel-agent
FUEL_NAILGUN_AGENT_GERRIT_URL?=https://review.openstack.org/openstack/fuel-nailgun-agent FUEL_NAILGUN_AGENT_GERRIT_URL?=https://review.openstack.org/openstack/fuel-nailgun-agent
ASTUTE_GERRIT_URL?=https://review.openstack.org/openstack/fuel-astute ASTUTE_GERRIT_URL?=https://review.openstack.org/openstack/fuel-astute
OSTF_GERRIT_URL?=https://review.openstack.org/openstack/fuel-ostf OSTF_GERRIT_URL?=https://review.openstack.org/openstack/fuel-ostf
CREATEMIRROR_GERRIT_URL?=https://review.openstack.org/openstack/fuel-mirror FUEL_MIRROR_GERRIT_URL?=https://review.openstack.org/openstack/fuel-mirror
FUELMENU_GERRIT_URL?=https://review.openstack.org/openstack/fuel-menu FUELMENU_GERRIT_URL?=https://review.openstack.org/openstack/fuel-menu
SHOTGUN_GERRIT_URL?=https://review.openstack.org/openstack/shotgun SHOTGUN_GERRIT_URL?=https://review.openstack.org/openstack/shotgun
NETWORKCHECKER_GERRIT_URL?=https://review.openstack.org/openstack/network-checker NETWORKCHECKER_GERRIT_URL?=https://review.openstack.org/openstack/network-checker
@ -136,7 +136,7 @@ FUEL_AGENT_GERRIT_COMMIT?=none
FUEL_NAILGUN_AGENT_GERRIT_COMMIT?=none FUEL_NAILGUN_AGENT_GERRIT_COMMIT?=none
ASTUTE_GERRIT_COMMIT?=none ASTUTE_GERRIT_COMMIT?=none
OSTF_GERRIT_COMMIT?=none OSTF_GERRIT_COMMIT?=none
CREATEMIRROR_GERRIT_COMMIT?=none FUEL_MIRROR_GERRIT_COMMIT?=none
FUELMAIN_GERRIT_COMMIT?=none FUELMAIN_GERRIT_COMMIT?=none
FUELMENU_GERRIT_COMMIT?=none FUELMENU_GERRIT_COMMIT?=none
SHOTGUN_GERRIT_COMMIT?=none SHOTGUN_GERRIT_COMMIT?=none

7
iso/ks.template
View File

@ -254,12 +254,11 @@ dhcp
docker-io docker-io
fuel-bootstrap-image fuel-bootstrap-image
fuel-bootstrap-image-builder fuel-bootstrap-image-builder
fuel-createmirror
# NOTE(kozhukalov): We don't need target centos images in 8.0 # NOTE(kozhukalov): We don't need target centos images in 8.0
# fuel-target-centos-images{{CENTOS_RELEASE}} # fuel-target-centos-images{{CENTOS_RELEASE}}
fuel-package-updates
fuelmenu fuelmenu
fuel-docker-images fuel-docker-images
fuel-mirror
gdisk gdisk
lrzip lrzip
lsof lsof
@ -527,8 +526,8 @@ All environments use online repositories by default.
Use the following commands to create local repositories Use the following commands to create local repositories
on master node and change default repository settings: on master node and change default repository settings:
* CentOS: fuel-package-updates (see --help for options) * CentOS: fuel-mirror (see --help for options)
* Ubuntu: fuel-createmirror (see --help for options) * Ubuntu: fuel-mirror (see --help for options)
Please refer to the following guide for more information: Please refer to the following guide for more information:
https://docs.mirantis.com/openstack/fuel/fuel-7.0/reference-architecture.html#fuel-rep-mirror https://docs.mirantis.com/openstack/fuel/fuel-7.0/reference-architecture.html#fuel-rep-mirror

2
packages/deb/module.mk
View File

@ -76,8 +76,8 @@ fuel_debian_packages:=fuel-nailgun \
astute \ astute \
fuel-agent \ fuel-agent \
fuel-library$(PRODUCT_VERSION) \ fuel-library$(PRODUCT_VERSION) \
fuel-mirror \
fuel-nailgun-agent \ fuel-nailgun-agent \
fuel-createmirror \
network-checker network-checker
$(eval $(foreach pkg,$(fuel_debian_packages),$(call build_deb,$(pkg))$(NEWLINE))) $(eval $(foreach pkg,$(fuel_debian_packages),$(call build_deb,$(pkg))$(NEWLINE)))

4
packages/module.mk
View File

@ -75,8 +75,8 @@ $(eval $(call prepare_git_source,fuel-agent,fuel-agent-$(PACKAGE_VERSION).tar.gz
$(eval $(call prepare_git_source,fuel-nailgun-agent,fuel-nailgun-agent-$(PACKAGE_VERSION).tar.gz,$(BUILD_DIR)/repos/fuel-nailgun-agent,HEAD,$(FUEL_NAILGUN_AGENT_GERRIT_COMMIT))) $(eval $(call prepare_git_source,fuel-nailgun-agent,fuel-nailgun-agent-$(PACKAGE_VERSION).tar.gz,$(BUILD_DIR)/repos/fuel-nailgun-agent,HEAD,$(FUEL_NAILGUN_AGENT_GERRIT_COMMIT)))
#FUEL-IMAGE PKGS #FUEL-IMAGE PKGS
$(eval $(call prepare_git_source,fuel-main,fuel-main-$(PACKAGE_VERSION).tar.gz,$(BUILD_DIR)/repos/fuel-main,HEAD,$(FUELMAIN_GERRIT_COMMIT))) $(eval $(call prepare_git_source,fuel-main,fuel-main-$(PACKAGE_VERSION).tar.gz,$(BUILD_DIR)/repos/fuel-main,HEAD,$(FUELMAIN_GERRIT_COMMIT)))
#FUEL-CREATEMIRROR PKGS #FUEL-MIRROR PKGS
$(eval $(call prepare_git_source,fuel-createmirror,fuel-createmirror-$(PACKAGE_VERSION).tar.gz,$(BUILD_DIR)/repos/fuel-createmirror,HEAD,$(CREATEMIRROR_GERRIT_COMMIT))) $(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 #FUEL-MENU PKGS
$(eval $(call prepare_git_source,fuelmenu,fuelmenu-$(PACKAGE_VERSION).tar.gz,$(BUILD_DIR)/repos/fuelmenu,HEAD,$(FUELMENU_GERRIT_COMMIT))) $(eval $(call prepare_git_source,fuelmenu,fuelmenu-$(PACKAGE_VERSION).tar.gz,$(BUILD_DIR)/repos/fuelmenu,HEAD,$(FUELMENU_GERRIT_COMMIT)))
#SHOTGUN PKGS #SHOTGUN PKGS

2
packages/rpm/module.mk
View File

@ -81,10 +81,10 @@ endef
packages_list:=\ packages_list:=\
astute \ astute \
fuel-agent \ fuel-agent \
fuel-createmirror \
fuel-library$(PRODUCT_VERSION) \ fuel-library$(PRODUCT_VERSION) \
fuel-main \ fuel-main \
fuelmenu \ fuelmenu \
fuel-mirror \
fuel-nailgun \ fuel-nailgun \
fuel-nailgun-agent \ fuel-nailgun-agent \
fuel-ostf \ fuel-ostf \

2
repos.mk
View File

@ -45,7 +45,7 @@ $(eval $(call build_repo,fuel-nailgun-agent,$(FUEL_NAILGUN_AGENT_REPO),$(FUEL_NA
$(eval $(call build_repo,astute,$(ASTUTE_REPO),$(ASTUTE_COMMIT),$(ASTUTE_GERRIT_URL),$(ASTUTE_GERRIT_COMMIT))) $(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-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-ostf,$(OSTF_REPO),$(OSTF_COMMIT),$(OSTF_GERRIT_URL),$(OSTF_GERRIT_COMMIT)))
$(eval $(call build_repo,fuel-createmirror,$(CREATEMIRROR_REPO),$(CREATEMIRROR_COMMIT),$(CREATEMIRROR_GERRIT_URL),$(CREATEMIRROR_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,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,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))) $(eval $(call build_repo,network-checker,$(NETWORKCHECKER_REPO),$(NETWORKCHECKER_COMMIT),$(NETWORKCHECKER_GERRIT_URL),$(NETWORKCHECKER_GERRIT_COMMIT)))

3
requirements-fuel-rpm.txt
View File

@ -2,18 +2,17 @@ fencing-agent
fuel fuel
fuel-agent fuel-agent
fuel-bootstrap-cli fuel-bootstrap-cli
fuel-createmirror
fuel-dockerctl fuel-dockerctl
fuel-ha-utils fuel-ha-utils
fuel-library fuel-library
fuelmenu fuelmenu
fuel-migrate fuel-migrate
fuel-mirror
fuel-misc fuel-misc
fuel-nailgun fuel-nailgun
fuel-notify fuel-notify
fuel-openstack-metadata fuel-openstack-metadata
fuel-ostf fuel-ostf
fuel-package-updates
fuel-provisioning-scripts fuel-provisioning-scripts
fuel-rabbit-fence fuel-rabbit-fence
fuel-release fuel-release

3
specs/fuel-main.spec
View File

@ -16,18 +16,17 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-buildroot
Prefix: %{_prefix} Prefix: %{_prefix}
BuildArch: noarch BuildArch: noarch
Requires: fuel-bootstrap-image >= %{version} Requires: fuel-bootstrap-image >= %{version}
Requires: fuel-createmirror >= 8.0
Requires: fuel-dockerctl >= 8.0 Requires: fuel-dockerctl >= 8.0
Requires: fuel-docker-images >= %{version} Requires: fuel-docker-images >= %{version}
Requires: fuel-library8.0 Requires: fuel-library8.0
Requires: fuelmenu >= %{version} Requires: fuelmenu >= %{version}
Requires: fuel-package-updates >= %{version}
Requires: fuel-provisioning-scripts >= %{version} Requires: fuel-provisioning-scripts >= %{version}
Requires: fuel-release >= %{version} Requires: fuel-release >= %{version}
# NOTE(kozhukalov): We don't need target centos images in 8.0 # NOTE(kozhukalov): We don't need target centos images in 8.0
# Requires: fuel-target-centos-images6.6 >= %{version} # Requires: fuel-target-centos-images6.6 >= %{version}
Requires: network-checker >= %{version} Requires: network-checker >= %{version}
Requires: python-fuelclient >= %{version} Requires: python-fuelclient >= %{version}
Requires: fuel-mirror >= %{version}
Requires: yum Requires: yum
%description %description