Rename package 'nailgun' into 'fuel-nailgun'
Change-Id: I759b988f4fe6cfd0c0360aeb87d1208b5d0444cb Depends-On: If273e46b528478f9f6bbf5c76bd394e0c040379d Closes-Bug: #1439679
This commit is contained in:
parent
0bdcbdf5e3
commit
b2765c5174
|
@ -121,8 +121,8 @@ $(BUILD_DIR)/bootstrap/customize-initram-root.done: \
|
||||||
$(BUILD_DIR)/packages/rpm/build.done \
|
$(BUILD_DIR)/packages/rpm/build.done \
|
||||||
$(BUILD_DIR)/bootstrap/prepare-initram-root.done \
|
$(BUILD_DIR)/bootstrap/prepare-initram-root.done \
|
||||||
$(call find-files,$(SOURCE_DIR)/bootstrap/sync) \
|
$(call find-files,$(SOURCE_DIR)/bootstrap/sync) \
|
||||||
$(BUILD_DIR)/repos/nailgun.done \
|
$(BUILD_DIR)/repos/fuel-nailgun.done \
|
||||||
$(call find-files,$(BUILD_DIR)/repos/nailgun/bin/send2syslog.py) \
|
$(call find-files,$(BUILD_DIR)/repos/fuel-nailgun/bin/send2syslog.py) \
|
||||||
$(SOURCE_DIR)/bootstrap/ssh/id_rsa.pub \
|
$(SOURCE_DIR)/bootstrap/ssh/id_rsa.pub \
|
||||||
$(BUILD_DIR)/bootstrap/etc/yum.conf \
|
$(BUILD_DIR)/bootstrap/etc/yum.conf \
|
||||||
$(BUILD_DIR)/bootstrap/etc/yum.repos.d/base.repo
|
$(BUILD_DIR)/bootstrap/etc/yum.repos.d/base.repo
|
||||||
|
@ -135,7 +135,7 @@ $(BUILD_DIR)/bootstrap/customize-initram-root.done: \
|
||||||
|
|
||||||
# Copying custom files
|
# Copying custom files
|
||||||
sudo rsync -rlptDK $(SOURCE_DIR)/bootstrap/sync/ $(INITRAMROOT)
|
sudo rsync -rlptDK $(SOURCE_DIR)/bootstrap/sync/ $(INITRAMROOT)
|
||||||
sudo cp -r $(BUILD_DIR)/repos/nailgun/bin/send2syslog.py $(INITRAMROOT)/usr/bin
|
sudo cp -r $(BUILD_DIR)/repos/fuel-nailgun/bin/send2syslog.py $(INITRAMROOT)/usr/bin
|
||||||
|
|
||||||
# Enabling pre-init boot interface discovery
|
# Enabling pre-init boot interface discovery
|
||||||
sudo chroot $(INITRAMROOT) chkconfig setup-bootdev on
|
sudo chroot $(INITRAMROOT) chkconfig setup-bootdev on
|
||||||
|
|
|
@ -168,8 +168,8 @@ else
|
||||||
$(ISOROOT)/bootstrap_admin_node.sh: $(SOURCE_DIR)/iso/bootstrap_admin_node.sh ; $(ACTION.COPY)
|
$(ISOROOT)/bootstrap_admin_node.sh: $(SOURCE_DIR)/iso/bootstrap_admin_node.sh ; $(ACTION.COPY)
|
||||||
endif
|
endif
|
||||||
$(ISOROOT)/bootstrap_admin_node.conf: $(SOURCE_DIR)/iso/bootstrap_admin_node.conf ; $(ACTION.COPY)
|
$(ISOROOT)/bootstrap_admin_node.conf: $(SOURCE_DIR)/iso/bootstrap_admin_node.conf ; $(ACTION.COPY)
|
||||||
$(ISOROOT)/send2syslog.py: $(BUILD_DIR)/repos/nailgun/bin/send2syslog.py ; $(ACTION.COPY)
|
$(ISOROOT)/send2syslog.py: $(BUILD_DIR)/repos/fuel-nailgun/bin/send2syslog.py ; $(ACTION.COPY)
|
||||||
$(BUILD_DIR)/repos/nailgun/bin/send2syslog.py: $(BUILD_DIR)/repos/nailgun.done
|
$(BUILD_DIR)/repos/fuel-nailgun/bin/send2syslog.py: $(BUILD_DIR)/repos/fuel-nailgun.done
|
||||||
|
|
||||||
ifeq ($(PRODUCTION),docker)
|
ifeq ($(PRODUCTION),docker)
|
||||||
$(BUILD_DIR)/iso/isoroot.done: $(ISOROOT)/docker.done
|
$(BUILD_DIR)/iso/isoroot.done: $(ISOROOT)/docker.done
|
||||||
|
|
|
@ -72,6 +72,6 @@ $(BUILD_DIR)/packages/deb/repocleanup.done: $(packages_list:%=$(BUILD_DIR)/packa
|
||||||
$(BUILD_DIR)/packages/deb/build.done:
|
$(BUILD_DIR)/packages/deb/build.done:
|
||||||
$(ACTION.TOUCH)
|
$(ACTION.TOUCH)
|
||||||
|
|
||||||
fuel_debian_packages:=nailgun astute fuel-agent fuel-library$(PRODUCT_VERSION) fuel-nailgun-agent
|
fuel_debian_packages:=fuel-nailgun astute fuel-agent fuel-library$(PRODUCT_VERSION) fuel-nailgun-agent
|
||||||
|
|
||||||
$(eval $(foreach pkg,$(fuel_debian_packages),$(call build_deb,$(pkg))$(NEWLINE)))
|
$(eval $(foreach pkg,$(fuel_debian_packages),$(call build_deb,$(pkg))$(NEWLINE)))
|
||||||
|
|
|
@ -60,7 +60,7 @@ $(BUILD_DIR)/packages/source_%.done:
|
||||||
$(ACTION.TOUCH)
|
$(ACTION.TOUCH)
|
||||||
|
|
||||||
#NAILGUN_PKGS
|
#NAILGUN_PKGS
|
||||||
$(eval $(call prepare_git_source,nailgun,nailgun-$(PACKAGE_VERSION).tar.gz,$(BUILD_DIR)/repos/nailgun,HEAD,$(NAILGUN_GERRIT_COMMIT)))
|
$(eval $(call prepare_git_source,fuel-nailgun,fuel-nailgun-$(PACKAGE_VERSION).tar.gz,$(BUILD_DIR)/repos/fuel-nailgun,HEAD,$(NAILGUN_GERRIT_COMMIT)))
|
||||||
#FUEL_OSTF_PKGS
|
#FUEL_OSTF_PKGS
|
||||||
$(eval $(call prepare_git_source,fuel-ostf,fuel-ostf-$(PACKAGE_VERSION).tar.gz,$(BUILD_DIR)/repos/fuel-ostf,HEAD,$(OSTF_GERRIT_COMMIT)))
|
$(eval $(call prepare_git_source,fuel-ostf,fuel-ostf-$(PACKAGE_VERSION).tar.gz,$(BUILD_DIR)/repos/fuel-ostf,HEAD,$(OSTF_GERRIT_COMMIT)))
|
||||||
#ASTUTE_PKGS
|
#ASTUTE_PKGS
|
||||||
|
|
|
@ -84,7 +84,7 @@ fuel-library$(PRODUCT_VERSION) \
|
||||||
fuel-main \
|
fuel-main \
|
||||||
fuel-nailgun-agent \
|
fuel-nailgun-agent \
|
||||||
fuel-ostf \
|
fuel-ostf \
|
||||||
nailgun \
|
fuel-nailgun \
|
||||||
python-fuelclient
|
python-fuelclient
|
||||||
|
|
||||||
$(eval $(foreach pkg,$(packages_list),$(call build_rpm,$(pkg))$(NEWLINE)))
|
$(eval $(foreach pkg,$(packages_list),$(call build_rpm,$(pkg))$(NEWLINE)))
|
||||||
|
|
2
repos.mk
2
repos.mk
|
@ -38,7 +38,7 @@ endif
|
||||||
endef
|
endef
|
||||||
|
|
||||||
|
|
||||||
$(eval $(call build_repo,nailgun,$(NAILGUN_REPO),$(NAILGUN_COMMIT),$(NAILGUN_GERRIT_URL),$(NAILGUN_GERRIT_COMMIT)))
|
$(eval $(call build_repo,fuel-nailgun,$(NAILGUN_REPO),$(NAILGUN_COMMIT),$(NAILGUN_GERRIT_URL),$(NAILGUN_GERRIT_COMMIT)))
|
||||||
$(eval $(call build_repo,python-fuelclient,$(PYTHON_FUELCLIENT_REPO),$(PYTHON_FUELCLIENT_COMMIT),$(PYTHON_FUELCLIENT_GERRIT_URL),$(PYTHON_FUELCLIENT_GERRIT_COMMIT)))
|
$(eval $(call build_repo,python-fuelclient,$(PYTHON_FUELCLIENT_REPO),$(PYTHON_FUELCLIENT_COMMIT),$(PYTHON_FUELCLIENT_GERRIT_URL),$(PYTHON_FUELCLIENT_GERRIT_COMMIT)))
|
||||||
$(eval $(call build_repo,fuel-agent,$(FUEL_AGENT_REPO),$(FUEL_AGENT_COMMIT),$(FUEL_AGENT_GERRIT_URL),$(FUEL_AGENT_GERRIT_COMMIT)))
|
$(eval $(call build_repo,fuel-agent,$(FUEL_AGENT_REPO),$(FUEL_AGENT_COMMIT),$(FUEL_AGENT_GERRIT_URL),$(FUEL_AGENT_GERRIT_COMMIT)))
|
||||||
$(eval $(call build_repo,fuel-nailgun-agent,$(FUEL_NAILGUN_AGENT_REPO),$(FUEL_NAILGUN_AGENT_COMMIT),$(FUEL_NAILGUN_AGENT_GERRIT_URL),$(FUEL_NAILGUN_AGENT_GERRIT_COMMIT)))
|
$(eval $(call build_repo,fuel-nailgun-agent,$(FUEL_NAILGUN_AGENT_REPO),$(FUEL_NAILGUN_AGENT_COMMIT),$(FUEL_NAILGUN_AGENT_GERRIT_URL),$(FUEL_NAILGUN_AGENT_GERRIT_COMMIT)))
|
||||||
|
|
|
@ -29,21 +29,21 @@ openstack-yaml: $(ARTS_DIR)/$(OPENSTACK_YAML_ART_NAME)
|
||||||
$(ARTS_DIR)/$(OPENSTACK_YAML_ART_NAME): $(BUILD_DIR)/upgrade/$(OPENSTACK_YAML_ART_NAME)
|
$(ARTS_DIR)/$(OPENSTACK_YAML_ART_NAME): $(BUILD_DIR)/upgrade/$(OPENSTACK_YAML_ART_NAME)
|
||||||
$(ACTION.COPY)
|
$(ACTION.COPY)
|
||||||
|
|
||||||
$(BUILD_DIR)/upgrade/$(OPENSTACK_YAML_ART_NAME): $(BUILD_DIR)/repos/nailgun.done
|
$(BUILD_DIR)/upgrade/$(OPENSTACK_YAML_ART_NAME): $(BUILD_DIR)/repos/fuel-nailgun.done
|
||||||
mkdir -p $(@D)
|
mkdir -p $(@D)
|
||||||
cp $(BUILD_DIR)/repos/nailgun/nailgun/nailgun/fixtures/openstack.yaml $@
|
cp $(BUILD_DIR)/repos/fuel-nailgun/nailgun/nailgun/fixtures/openstack.yaml $@
|
||||||
|
|
||||||
########################
|
########################
|
||||||
# UPGRADE DEPENDENCIES
|
# UPGRADE DEPENDENCIES
|
||||||
########################
|
########################
|
||||||
$(BUILD_DIR)/upgrade/deps.done: \
|
$(BUILD_DIR)/upgrade/deps.done: \
|
||||||
$(BUILD_DIR)/repos/nailgun.done
|
$(BUILD_DIR)/repos/fuel-nailgun.done
|
||||||
mkdir -p $(BUILD_DIR)/upgrade/deps
|
mkdir -p $(BUILD_DIR)/upgrade/deps
|
||||||
virtualenv $(BUILD_DIR)/upgrade/venv
|
virtualenv $(BUILD_DIR)/upgrade/venv
|
||||||
# Requires virtualenv, pip, python-dev packages
|
# Requires virtualenv, pip, python-dev packages
|
||||||
ifeq ($(USE_UPGRADE_PIP_ART_HTTP_LINK),)
|
ifeq ($(USE_UPGRADE_PIP_ART_HTTP_LINK),)
|
||||||
echo "Using mirror pip-install approach"
|
echo "Using mirror pip-install approach"
|
||||||
$(BUILD_DIR)/upgrade/venv/bin/pip install -r $(BUILD_DIR)/repos/nailgun/fuel_upgrade_system/fuel_upgrade/requirements.txt --download $(BUILD_DIR)/upgrade/deps --no-use-wheel
|
$(BUILD_DIR)/upgrade/venv/bin/pip install -r $(BUILD_DIR)/repos/fuel-nailgun/fuel_upgrade_system/fuel_upgrade/requirements.txt --download $(BUILD_DIR)/upgrade/deps --no-use-wheel
|
||||||
else
|
else
|
||||||
echo "Using artifact from $(USE_UPGRADE_PIP_ART_HTTP_LINK) for pip-install"
|
echo "Using artifact from $(USE_UPGRADE_PIP_ART_HTTP_LINK) for pip-install"
|
||||||
wget -v --no-check-certificate $(USE_UPGRADE_PIP_ART_HTTP_LINK) -O $(BUILD_DIR)/upgrade/deps.tar.gz.tmp
|
wget -v --no-check-certificate $(USE_UPGRADE_PIP_ART_HTTP_LINK) -O $(BUILD_DIR)/upgrade/deps.tar.gz.tmp
|
||||||
|
@ -51,7 +51,7 @@ else
|
||||||
mkdir -p $(BUILD_DIR)/upgrade/deps/
|
mkdir -p $(BUILD_DIR)/upgrade/deps/
|
||||||
tar xvf $(BUILD_DIR)/upgrade/deps.tar.gz --strip-components=1 -C $(BUILD_DIR)/upgrade/deps/
|
tar xvf $(BUILD_DIR)/upgrade/deps.tar.gz --strip-components=1 -C $(BUILD_DIR)/upgrade/deps/
|
||||||
endif
|
endif
|
||||||
cd $(BUILD_DIR)/repos/nailgun/fuel_upgrade_system/fuel_upgrade && $(BUILD_DIR)/upgrade/venv/bin/python setup.py sdist --dist-dir $(BUILD_DIR)/upgrade/deps
|
cd $(BUILD_DIR)/repos/fuel-nailgun/fuel_upgrade_system/fuel_upgrade && $(BUILD_DIR)/upgrade/venv/bin/python setup.py sdist --dist-dir $(BUILD_DIR)/upgrade/deps
|
||||||
$(ACTION.TOUCH)
|
$(ACTION.TOUCH)
|
||||||
|
|
||||||
# Save pip artifact, if needed
|
# Save pip artifact, if needed
|
||||||
|
|
Loading…
Reference in New Issue