summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2016-06-29 16:06:12 +0000
committerGerrit Code Review <review@openstack.org>2016-06-29 16:06:13 +0000
commiteeebb60a921dd448b9f5bf5c3df5f94fd428dbe4 (patch)
tree4dcfa801acff0182a5a818f0d7624f63cafdd477
parentc59840efc25302b5cd1406610f984a9bcc445eb7 (diff)
parent629ca1f785fcd38464fa7ef4c1c2a797871e7435 (diff)
Merge "Remove fuel-mirror package"
-rw-r--r--config.mk3
-rwxr-xr-xiso/bootstrap_admin_node.sh12
-rw-r--r--packages/deb/module.mk1
-rw-r--r--packages/module.mk2
-rw-r--r--packages/rpm/module.mk1
-rw-r--r--repos.mk1
-rw-r--r--requirements-fuel-rpm.txt1
-rw-r--r--specs/fuel-main.spec1
8 files changed, 8 insertions, 14 deletions
diff --git a/config.mk b/config.mk
index 8178ad3..512d9e0 100644
--- a/config.mk
+++ b/config.mk
@@ -84,7 +84,6 @@ FUEL_AGENT_REPO?=https://github.com/openstack/fuel-agent.git
84FUEL_NAILGUN_AGENT_REPO?=https://github.com/openstack/fuel-nailgun-agent.git 84FUEL_NAILGUN_AGENT_REPO?=https://github.com/openstack/fuel-nailgun-agent.git
85ASTUTE_REPO?=https://github.com/openstack/fuel-astute.git 85ASTUTE_REPO?=https://github.com/openstack/fuel-astute.git
86OSTF_REPO?=https://github.com/openstack/fuel-ostf.git 86OSTF_REPO?=https://github.com/openstack/fuel-ostf.git
87FUEL_MIRROR_REPO?=https://github.com/openstack/fuel-mirror.git
88FUELMENU_REPO?=https://github.com/openstack/fuel-menu.git 87FUELMENU_REPO?=https://github.com/openstack/fuel-menu.git
89SHOTGUN_REPO?=https://github.com/openstack/shotgun.git 88SHOTGUN_REPO?=https://github.com/openstack/shotgun.git
90NETWORKCHECKER_REPO?=https://github.com/openstack/network-checker.git 89NETWORKCHECKER_REPO?=https://github.com/openstack/network-checker.git
@@ -98,7 +97,6 @@ FUEL_AGENT_GERRIT_URL?=https://review.openstack.org/openstack/fuel-agent
98FUEL_NAILGUN_AGENT_GERRIT_URL?=https://review.openstack.org/openstack/fuel-nailgun-agent 97FUEL_NAILGUN_AGENT_GERRIT_URL?=https://review.openstack.org/openstack/fuel-nailgun-agent
99ASTUTE_GERRIT_URL?=https://review.openstack.org/openstack/fuel-astute 98ASTUTE_GERRIT_URL?=https://review.openstack.org/openstack/fuel-astute
100OSTF_GERRIT_URL?=https://review.openstack.org/openstack/fuel-ostf 99OSTF_GERRIT_URL?=https://review.openstack.org/openstack/fuel-ostf
101FUEL_MIRROR_GERRIT_URL?=https://review.openstack.org/openstack/fuel-mirror
102FUELMENU_GERRIT_URL?=https://review.openstack.org/openstack/fuel-menu 100FUELMENU_GERRIT_URL?=https://review.openstack.org/openstack/fuel-menu
103SHOTGUN_GERRIT_URL?=https://review.openstack.org/openstack/shotgun 101SHOTGUN_GERRIT_URL?=https://review.openstack.org/openstack/shotgun
104NETWORKCHECKER_GERRIT_URL?=https://review.openstack.org/openstack/network-checker 102NETWORKCHECKER_GERRIT_URL?=https://review.openstack.org/openstack/network-checker
@@ -111,7 +109,6 @@ FUEL_AGENT_GERRIT_COMMIT?=none
111FUEL_NAILGUN_AGENT_GERRIT_COMMIT?=none 109FUEL_NAILGUN_AGENT_GERRIT_COMMIT?=none
112ASTUTE_GERRIT_COMMIT?=none 110ASTUTE_GERRIT_COMMIT?=none
113OSTF_GERRIT_COMMIT?=none 111OSTF_GERRIT_COMMIT?=none
114FUEL_MIRROR_GERRIT_COMMIT?=none
115FUELMAIN_GERRIT_COMMIT?=none 112FUELMAIN_GERRIT_COMMIT?=none
116FUELMENU_GERRIT_COMMIT?=none 113FUELMENU_GERRIT_COMMIT?=none
117SHOTGUN_GERRIT_COMMIT?=none 114SHOTGUN_GERRIT_COMMIT?=none
diff --git a/iso/bootstrap_admin_node.sh b/iso/bootstrap_admin_node.sh
index 655bc51..9a0010e 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
302cat >> /etc/motd << EOF 302cat >> /etc/motd << EOF
303 303
304All environments use online repositories by default. 304All environments use online repositories by default.
305Use the following commands to create local repositories 305Use the python-packetary package to create local repositories:
306on master node and change default repository settings:
307 306
308* CentOS: fuel-mirror (see --help for options) 307yum install python-packetary
309* Ubuntu: fuel-mirror (see --help for options) 308packetary --help
309
310Use python-fuelclient package to modify default repository settings:
311
312yum install python-fuelclient (installed by default)
313fuel2 --help
310 314
311EOF 315EOF
312 316
diff --git a/packages/deb/module.mk b/packages/deb/module.mk
index c0ba737..eb51b4a 100644
--- a/packages/deb/module.mk
+++ b/packages/deb/module.mk
@@ -75,7 +75,6 @@ fuel_debian_packages:=fuel-nailgun \
75astute \ 75astute \
76fuel-agent \ 76fuel-agent \
77fuel-library$(FUEL_LIBRARY_VERSION) \ 77fuel-library$(FUEL_LIBRARY_VERSION) \
78fuel-mirror \
79nailgun-agent \ 78nailgun-agent \
80network-checker 79network-checker
81 80
diff --git a/packages/module.mk b/packages/module.mk
index 55bca8f..764a0d8 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
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))) 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#FUEL-IMAGE PKGS 77#FUEL-IMAGE PKGS
78$(eval $(call prepare_git_source,fuel-main,fuel-$(PACKAGE_VERSION).tar.gz,$(BUILD_DIR)/repos/fuel-main,HEAD,$(FUELMAIN_GERRIT_COMMIT))) 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#FUEL-MENU PKGS 79#FUEL-MENU PKGS
82$(eval $(call prepare_git_source,fuelmenu,fuelmenu-$(PACKAGE_VERSION).tar.gz,$(BUILD_DIR)/repos/fuelmenu,HEAD,$(FUELMENU_GERRIT_COMMIT))) 80$(eval $(call prepare_git_source,fuelmenu,fuelmenu-$(PACKAGE_VERSION).tar.gz,$(BUILD_DIR)/repos/fuelmenu,HEAD,$(FUELMENU_GERRIT_COMMIT)))
83#FUEL-UI PKGS 81#FUEL-UI PKGS
diff --git a/packages/rpm/module.mk b/packages/rpm/module.mk
index b235f1d..a923393 100644
--- a/packages/rpm/module.mk
+++ b/packages/rpm/module.mk
@@ -85,7 +85,6 @@ astute \
85fuel-agent \ 85fuel-agent \
86fuel-library$(FUEL_LIBRARY_VERSION) \ 86fuel-library$(FUEL_LIBRARY_VERSION) \
87fuel-main \ 87fuel-main \
88fuel-mirror \
89fuel-nailgun \ 88fuel-nailgun \
90fuel-ostf \ 89fuel-ostf \
91fuel-ui \ 90fuel-ui \
diff --git a/repos.mk b/repos.mk
index eb5606c..617b24a 100644
--- a/repos.mk
+++ b/repos.mk
@@ -36,7 +36,6 @@ $(eval $(call build_repo,nailgun-agent,$(FUEL_NAILGUN_AGENT_REPO),$(FUEL_NAILGUN
36$(eval $(call build_repo,astute,$(ASTUTE_REPO),$(ASTUTE_COMMIT),$(ASTUTE_GERRIT_URL),$(ASTUTE_GERRIT_COMMIT))) 36$(eval $(call build_repo,astute,$(ASTUTE_REPO),$(ASTUTE_COMMIT),$(ASTUTE_GERRIT_URL),$(ASTUTE_GERRIT_COMMIT)))
37$(eval $(call build_repo,fuel-library,$(FUELLIB_REPO),$(FUELLIB_COMMIT),$(FUELLIB_GERRIT_URL),$(FUELLIB_GERRIT_COMMIT))) 37$(eval $(call build_repo,fuel-library,$(FUELLIB_REPO),$(FUELLIB_COMMIT),$(FUELLIB_GERRIT_URL),$(FUELLIB_GERRIT_COMMIT)))
38$(eval $(call build_repo,fuel-ostf,$(OSTF_REPO),$(OSTF_COMMIT),$(OSTF_GERRIT_URL),$(OSTF_GERRIT_COMMIT))) 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$(eval $(call build_repo,fuelmenu,$(FUELMENU_REPO),$(FUELMENU_COMMIT),$(FUELMENU_GERRIT_URL),$(FUELMENU_GERRIT_COMMIT))) 39$(eval $(call build_repo,fuelmenu,$(FUELMENU_REPO),$(FUELMENU_COMMIT),$(FUELMENU_GERRIT_URL),$(FUELMENU_GERRIT_COMMIT)))
41$(eval $(call build_repo,shotgun,$(SHOTGUN_REPO),$(SHOTGUN_COMMIT),$(SHOTGUN_GERRIT_URL),$(SHOTGUN_GERRIT_COMMIT))) 40$(eval $(call build_repo,shotgun,$(SHOTGUN_REPO),$(SHOTGUN_COMMIT),$(SHOTGUN_GERRIT_URL),$(SHOTGUN_GERRIT_COMMIT)))
42$(eval $(call build_repo,network-checker,$(NETWORKCHECKER_REPO),$(NETWORKCHECKER_COMMIT),$(NETWORKCHECKER_GERRIT_URL),$(NETWORKCHECKER_GERRIT_COMMIT))) 41$(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 b575e1c..1211149 100644
--- a/requirements-fuel-rpm.txt
+++ b/requirements-fuel-rpm.txt
@@ -6,7 +6,6 @@ fuel-ha-utils
6fuel-library 6fuel-library
7fuelmenu 7fuelmenu
8fuel-migrate 8fuel-migrate
9fuel-mirror
10fuel-misc 9fuel-misc
11fuel-nailgun 10fuel-nailgun
12fuel-notify 11fuel-notify
diff --git a/specs/fuel-main.spec b/specs/fuel-main.spec
index 9d38a34..ca4849f 100644
--- a/specs/fuel-main.spec
+++ b/specs/fuel-main.spec
@@ -21,7 +21,6 @@ Requires: fuelmenu >= %{version}
21Requires: fuel-release >= %{version} 21Requires: fuel-release >= %{version}
22Requires: network-checker >= %{version} 22Requires: network-checker >= %{version}
23Requires: python-fuelclient >= %{version} 23Requires: python-fuelclient >= %{version}
24Requires: fuel-mirror >= %{version}
25Requires: shotgun >= %{version} 24Requires: shotgun >= %{version}
26Requires: yum 25Requires: yum
27 26