Merge "Remove fuel-mirror package"
This commit is contained in:
commit
eeebb60a92
|
@ -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
|
||||
|
@ -98,7 +97,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
|
||||
|
@ -111,7 +109,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
|
||||
|
|
|
@ -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
|
||||
|
||||
|
|
|
@ -75,7 +75,6 @@ fuel_debian_packages:=fuel-nailgun \
|
|||
astute \
|
||||
fuel-agent \
|
||||
fuel-library$(FUEL_LIBRARY_VERSION) \
|
||||
fuel-mirror \
|
||||
nailgun-agent \
|
||||
network-checker
|
||||
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -85,7 +85,6 @@ astute \
|
|||
fuel-agent \
|
||||
fuel-library$(FUEL_LIBRARY_VERSION) \
|
||||
fuel-main \
|
||||
fuel-mirror \
|
||||
fuel-nailgun \
|
||||
fuel-ostf \
|
||||
fuel-ui \
|
||||
|
|
1
repos.mk
1
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)))
|
||||
|
|
|
@ -6,7 +6,6 @@ fuel-ha-utils
|
|||
fuel-library
|
||||
fuelmenu
|
||||
fuel-migrate
|
||||
fuel-mirror
|
||||
fuel-misc
|
||||
fuel-nailgun
|
||||
fuel-notify
|
||||
|
|
|
@ -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
|
||||
|
||||
|
|
Loading…
Reference in New Issue