Browse Source

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
Vladimir Kozhukalov 2 years ago
parent
commit
629ca1f785

+ 0
- 3
config.mk View File

@@ -84,7 +84,6 @@ FUEL_AGENT_REPO?=https://github.com/openstack/fuel-agent.git
84 84
 FUEL_NAILGUN_AGENT_REPO?=https://github.com/openstack/fuel-nailgun-agent.git
85 85
 ASTUTE_REPO?=https://github.com/openstack/fuel-astute.git
86 86
 OSTF_REPO?=https://github.com/openstack/fuel-ostf.git
87
-FUEL_MIRROR_REPO?=https://github.com/openstack/fuel-mirror.git
88 87
 FUELMENU_REPO?=https://github.com/openstack/fuel-menu.git
89 88
 SHOTGUN_REPO?=https://github.com/openstack/shotgun.git
90 89
 NETWORKCHECKER_REPO?=https://github.com/openstack/network-checker.git
@@ -99,7 +98,6 @@ FUEL_AGENT_GERRIT_URL?=https://review.openstack.org/openstack/fuel-agent
99 98
 FUEL_NAILGUN_AGENT_GERRIT_URL?=https://review.openstack.org/openstack/fuel-nailgun-agent
100 99
 ASTUTE_GERRIT_URL?=https://review.openstack.org/openstack/fuel-astute
101 100
 OSTF_GERRIT_URL?=https://review.openstack.org/openstack/fuel-ostf
102
-FUEL_MIRROR_GERRIT_URL?=https://review.openstack.org/openstack/fuel-mirror
103 101
 FUELMENU_GERRIT_URL?=https://review.openstack.org/openstack/fuel-menu
104 102
 SHOTGUN_GERRIT_URL?=https://review.openstack.org/openstack/shotgun
105 103
 NETWORKCHECKER_GERRIT_URL?=https://review.openstack.org/openstack/network-checker
@@ -113,7 +111,6 @@ FUEL_AGENT_GERRIT_COMMIT?=none
113 111
 FUEL_NAILGUN_AGENT_GERRIT_COMMIT?=none
114 112
 ASTUTE_GERRIT_COMMIT?=none
115 113
 OSTF_GERRIT_COMMIT?=none
116
-FUEL_MIRROR_GERRIT_COMMIT?=none
117 114
 FUELMAIN_GERRIT_COMMIT?=none
118 115
 FUELMENU_GERRIT_COMMIT?=none
119 116
 SHOTGUN_GERRIT_COMMIT?=none

+ 8
- 4
iso/bootstrap_admin_node.sh View File

@@ -302,11 +302,15 @@ sed -i -e "s/^\s*PrintMotd no/PrintMotd yes/g" /etc/ssh/sshd_config
302 302
 cat >> /etc/motd << EOF
303 303
 
304 304
 All environments use online repositories by default.
305
-Use the following commands to create local repositories
306
-on master node and change default repository settings:
305
+Use the python-packetary package to create local repositories:
307 306
 
308
-* CentOS: fuel-mirror (see --help for options)
309
-* Ubuntu: fuel-mirror (see --help for options)
307
+yum install python-packetary
308
+packetary --help
309
+
310
+Use python-fuelclient package to modify default repository settings:
311
+
312
+yum install python-fuelclient (installed by default)
313
+fuel2 --help
310 314
 
311 315
 EOF
312 316
 

+ 0
- 1
packages/deb/module.mk View File

@@ -75,7 +75,6 @@ fuel_debian_packages:=fuel-nailgun \
75 75
 astute \
76 76
 fuel-agent \
77 77
 fuel-library$(FUEL_LIBRARY_VERSION) \
78
-fuel-mirror \
79 78
 nailgun-agent \
80 79
 network-checker
81 80
 

+ 0
- 2
packages/module.mk View File

@@ -76,8 +76,6 @@ $(eval $(call prepare_git_source,fuel-agent,fuel-agent-$(PACKAGE_VERSION).tar.gz
76 76
 $(eval $(call prepare_git_source,nailgun-agent,nailgun-agent-$(PACKAGE_VERSION).tar.gz,$(BUILD_DIR)/repos/nailgun-agent,HEAD,$(FUEL_NAILGUN_AGENT_GERRIT_COMMIT)))
77 77
 #FUEL-IMAGE PKGS
78 78
 $(eval $(call prepare_git_source,fuel-main,fuel-$(PACKAGE_VERSION).tar.gz,$(BUILD_DIR)/repos/fuel-main,HEAD,$(FUELMAIN_GERRIT_COMMIT)))
79
-#FUEL-MIRROR PKGS
80
-$(eval $(call prepare_git_source,fuel-mirror,fuel-mirror-$(PACKAGE_VERSION).tar.gz,$(BUILD_DIR)/repos/fuel-mirror,HEAD,$(FUEL_MIRROR_GERRIT_COMMIT)))
81 79
 #FUEL-MENU PKGS
82 80
 $(eval $(call prepare_git_source,fuelmenu,fuelmenu-$(PACKAGE_VERSION).tar.gz,$(BUILD_DIR)/repos/fuelmenu,HEAD,$(FUELMENU_GERRIT_COMMIT)))
83 81
 #FUEL-UI PKGS

+ 0
- 1
packages/rpm/module.mk View File

@@ -85,7 +85,6 @@ astute \
85 85
 fuel-agent \
86 86
 fuel-library$(FUEL_LIBRARY_VERSION) \
87 87
 fuel-main \
88
-fuel-mirror \
89 88
 fuel-nailgun \
90 89
 fuel-ostf \
91 90
 fuel-ui \

+ 0
- 1
repos.mk View File

@@ -36,7 +36,6 @@ $(eval $(call build_repo,nailgun-agent,$(FUEL_NAILGUN_AGENT_REPO),$(FUEL_NAILGUN
36 36
 $(eval $(call build_repo,astute,$(ASTUTE_REPO),$(ASTUTE_COMMIT),$(ASTUTE_GERRIT_URL),$(ASTUTE_GERRIT_COMMIT)))
37 37
 $(eval $(call build_repo,fuel-library,$(FUELLIB_REPO),$(FUELLIB_COMMIT),$(FUELLIB_GERRIT_URL),$(FUELLIB_GERRIT_COMMIT)))
38 38
 $(eval $(call build_repo,fuel-ostf,$(OSTF_REPO),$(OSTF_COMMIT),$(OSTF_GERRIT_URL),$(OSTF_GERRIT_COMMIT)))
39
-$(eval $(call build_repo,fuel-mirror,$(FUEL_MIRROR_REPO),$(FUEL_MIRROR_COMMIT),$(FUEL_MIRROR_GERRIT_URL),$(FUEL_MIRROR_GERRIT_COMMIT)))
40 39
 $(eval $(call build_repo,fuelmenu,$(FUELMENU_REPO),$(FUELMENU_COMMIT),$(FUELMENU_GERRIT_URL),$(FUELMENU_GERRIT_COMMIT)))
41 40
 $(eval $(call build_repo,shotgun,$(SHOTGUN_REPO),$(SHOTGUN_COMMIT),$(SHOTGUN_GERRIT_URL),$(SHOTGUN_GERRIT_COMMIT)))
42 41
 $(eval $(call build_repo,network-checker,$(NETWORKCHECKER_REPO),$(NETWORKCHECKER_COMMIT),$(NETWORKCHECKER_GERRIT_URL),$(NETWORKCHECKER_GERRIT_COMMIT)))

+ 0
- 1
requirements-fuel-rpm.txt View File

@@ -6,7 +6,6 @@ fuel-ha-utils
6 6
 fuel-library
7 7
 fuelmenu
8 8
 fuel-migrate
9
-fuel-mirror
10 9
 fuel-misc
11 10
 fuel-nailgun
12 11
 fuel-notify

+ 0
- 1
specs/fuel-main.spec View File

@@ -21,7 +21,6 @@ Requires: fuelmenu >= %{version}
21 21
 Requires: fuel-release >= %{version}
22 22
 Requires: network-checker >= %{version}
23 23
 Requires: python-fuelclient >= %{version}
24
-Requires: fuel-mirror >= %{version}
25 24
 Requires: shotgun >= %{version}
26 25
 Requires: yum
27 26
 

Loading…
Cancel
Save