From b2765c517495078ea0fcee71d079c6d0929220bd Mon Sep 17 00:00:00 2001 From: Maksim Malchuk Date: Tue, 22 Sep 2015 11:26:53 +0300 Subject: [PATCH] Rename package 'nailgun' into 'fuel-nailgun' Change-Id: I759b988f4fe6cfd0c0360aeb87d1208b5d0444cb Depends-On: If273e46b528478f9f6bbf5c76bd394e0c040379d Closes-Bug: #1439679 --- bootstrap/module.mk | 6 +++--- iso/module.mk | 4 ++-- packages/deb/module.mk | 2 +- packages/module.mk | 2 +- packages/rpm/module.mk | 2 +- repos.mk | 2 +- upgrade/module.mk | 10 +++++----- 7 files changed, 14 insertions(+), 14 deletions(-) diff --git a/bootstrap/module.mk b/bootstrap/module.mk index 810219840..5a8fea5c5 100644 --- a/bootstrap/module.mk +++ b/bootstrap/module.mk @@ -121,8 +121,8 @@ $(BUILD_DIR)/bootstrap/customize-initram-root.done: \ $(BUILD_DIR)/packages/rpm/build.done \ $(BUILD_DIR)/bootstrap/prepare-initram-root.done \ $(call find-files,$(SOURCE_DIR)/bootstrap/sync) \ - $(BUILD_DIR)/repos/nailgun.done \ - $(call find-files,$(BUILD_DIR)/repos/nailgun/bin/send2syslog.py) \ + $(BUILD_DIR)/repos/fuel-nailgun.done \ + $(call find-files,$(BUILD_DIR)/repos/fuel-nailgun/bin/send2syslog.py) \ $(SOURCE_DIR)/bootstrap/ssh/id_rsa.pub \ $(BUILD_DIR)/bootstrap/etc/yum.conf \ $(BUILD_DIR)/bootstrap/etc/yum.repos.d/base.repo @@ -135,7 +135,7 @@ $(BUILD_DIR)/bootstrap/customize-initram-root.done: \ # Copying custom files 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 sudo chroot $(INITRAMROOT) chkconfig setup-bootdev on diff --git a/iso/module.mk b/iso/module.mk index 7a6b0fddd..4da631acd 100644 --- a/iso/module.mk +++ b/iso/module.mk @@ -168,8 +168,8 @@ else $(ISOROOT)/bootstrap_admin_node.sh: $(SOURCE_DIR)/iso/bootstrap_admin_node.sh ; $(ACTION.COPY) endif $(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) -$(BUILD_DIR)/repos/nailgun/bin/send2syslog.py: $(BUILD_DIR)/repos/nailgun.done +$(ISOROOT)/send2syslog.py: $(BUILD_DIR)/repos/fuel-nailgun/bin/send2syslog.py ; $(ACTION.COPY) +$(BUILD_DIR)/repos/fuel-nailgun/bin/send2syslog.py: $(BUILD_DIR)/repos/fuel-nailgun.done ifeq ($(PRODUCTION),docker) $(BUILD_DIR)/iso/isoroot.done: $(ISOROOT)/docker.done diff --git a/packages/deb/module.mk b/packages/deb/module.mk index 64bf1524f..0b8d265b2 100644 --- a/packages/deb/module.mk +++ b/packages/deb/module.mk @@ -72,6 +72,6 @@ $(BUILD_DIR)/packages/deb/repocleanup.done: $(packages_list:%=$(BUILD_DIR)/packa $(BUILD_DIR)/packages/deb/build.done: $(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))) diff --git a/packages/module.mk b/packages/module.mk index a9ed1c64f..f4a81d696 100644 --- a/packages/module.mk +++ b/packages/module.mk @@ -60,7 +60,7 @@ $(BUILD_DIR)/packages/source_%.done: $(ACTION.TOUCH) #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 $(eval $(call prepare_git_source,fuel-ostf,fuel-ostf-$(PACKAGE_VERSION).tar.gz,$(BUILD_DIR)/repos/fuel-ostf,HEAD,$(OSTF_GERRIT_COMMIT))) #ASTUTE_PKGS diff --git a/packages/rpm/module.mk b/packages/rpm/module.mk index f814de165..34b43e9e3 100644 --- a/packages/rpm/module.mk +++ b/packages/rpm/module.mk @@ -84,7 +84,7 @@ fuel-library$(PRODUCT_VERSION) \ fuel-main \ fuel-nailgun-agent \ fuel-ostf \ -nailgun \ +fuel-nailgun \ python-fuelclient $(eval $(foreach pkg,$(packages_list),$(call build_rpm,$(pkg))$(NEWLINE))) diff --git a/repos.mk b/repos.mk index 787fa91fb..bb53cc0e6 100644 --- a/repos.mk +++ b/repos.mk @@ -38,7 +38,7 @@ endif 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,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))) diff --git a/upgrade/module.mk b/upgrade/module.mk index 8537608e7..a7c9334bd 100644 --- a/upgrade/module.mk +++ b/upgrade/module.mk @@ -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) $(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) - cp $(BUILD_DIR)/repos/nailgun/nailgun/nailgun/fixtures/openstack.yaml $@ + cp $(BUILD_DIR)/repos/fuel-nailgun/nailgun/nailgun/fixtures/openstack.yaml $@ ######################## # UPGRADE DEPENDENCIES ######################## $(BUILD_DIR)/upgrade/deps.done: \ - $(BUILD_DIR)/repos/nailgun.done + $(BUILD_DIR)/repos/fuel-nailgun.done mkdir -p $(BUILD_DIR)/upgrade/deps virtualenv $(BUILD_DIR)/upgrade/venv # Requires virtualenv, pip, python-dev packages ifeq ($(USE_UPGRADE_PIP_ART_HTTP_LINK),) 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 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 @@ -51,7 +51,7 @@ else mkdir -p $(BUILD_DIR)/upgrade/deps/ tar xvf $(BUILD_DIR)/upgrade/deps.tar.gz --strip-components=1 -C $(BUILD_DIR)/upgrade/deps/ 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) # Save pip artifact, if needed