Remove openstack_version file

/etc/fuel_openstack_version file is provided
by fuel-openstack-metadata package and can
be used to format paths where we put repos
and puppet modules during ISO build.
This patch removes all the lines that
assume direct using of openstack.yaml file.

Change-Id: I728fa53c16462bfb44328a619a151dc836573875
Closes-Bug: #1524359

config.mk

@@ -41,7 +41,6 @@ DEPS_DIR_CURRENT:=$(abspath $(DEPS_DIR_CURRENT))
 
 # Artifacts names
 ISO_NAME?=fuel-$(PRODUCT_VERSION)
-OPENSTACK_PATCH_TARBALL_NAME?=fuel-$(PRODUCT_VERSION)-patch
 VBOX_SCRIPTS_NAME?=vbox-scripts-$(PRODUCT_VERSION)
 BOOTSTRAP_ART_NAME?=bootstrap.tar.gz
 DOCKER_ART_NAME?=fuel-images.tar.lrz
@@ -49,8 +48,6 @@ VERSION_YAML_ART_NAME?=version.yaml
 CENTOS_REPO_ART_NAME?=centos-repo.tar
 UBUNTU_REPO_ART_NAME?=ubuntu-repo.tar
 PUPPET_ART_NAME?=puppet.tgz
-OPENSTACK_YAML_ART_NAME?=openstack.yaml
-
 
 
 # Where we put artifacts
@@ -280,4 +277,3 @@ expand_repo_url=$(shell url=$1; echo $${url} | grep -q -e '.*\.target\.txt$$' &&
 #MIRROR_CENTOS_KERNEL:=$(call expand_repo_url,$(MIRROR_CENTOS_KERNEL))
 #SANDBOX_MIRROR_CENTOS_UPSTREAM:=$(call expand_repo_url,$(SANDBOX_MIRROR_CENTOS_UPSTREAM))
 MIRROR_FUEL:=$(call expand_repo_url,$(MIRROR_FUEL))
-

iso/ks.template

@@ -44,6 +44,7 @@ fuel-bootstrap-image-builder
 fuelmenu
 fuel-docker-images
 fuel-mirror
+fuel-openstack-metadata
 gdisk
 lrzip
 lsof
@@ -388,7 +389,8 @@ elif test -e /dev/disk/by-uuid/will_be_substituted_with_actual_uuid; then
     mount -o loop ${FS}/nailgun.iso ${SOURCE}
 fi
 
-OPENSTACK_VERSION=`cat ${SOURCE}/openstack_version`
+# this file is provided by fuel-openstack-metadata package
+OPENSTACK_VERSION=`cat /etc/fuel_openstack_version`
 
 # ----------------------
 # UNPACKING REPOSITORIES

iso/module.mk

@@ -1,7 +1,7 @@
 .PHONY: all iso version-yaml centos-repo ubuntu-repo
 .DELETE_ON_ERROR: $(ISO_PATH)
 
-all: iso version-yaml openstack-yaml
+all: iso version-yaml
 
 ISOROOT:=$(BUILD_DIR)/iso/isoroot
 
@@ -17,17 +17,13 @@ $(ARTS_DIR)/$(VERSION_YAML_ART_NAME): $(ISOROOT)/$(VERSION_YAML_ART_NAME)
 
 $(ISOROOT)/$(VERSION_YAML_ART_NAME): $(call depv,PRODUCT_VERSION)
 $(ISOROOT)/$(VERSION_YAML_ART_NAME): $(call depv,FEATURE_GROUPS)
-$(ISOROOT)/$(VERSION_YAML_ART_NAME): $(BUILD_DIR)/repos/repos.done \
-		$(ISOROOT)/openstack_version
+$(ISOROOT)/$(VERSION_YAML_ART_NAME): $(BUILD_DIR)/repos/repos.done
 	mkdir -p $(@D)
 	echo "VERSION:" > $@
 	echo "  feature_groups:" >> $@
 	$(foreach group,$(FEATURE_GROUPS),echo "    - $(group)" >> $@;)
 	echo "  production: \"$(PRODUCTION)\"" >> $@
 	echo "  release: \"$(PRODUCT_VERSION)\"" >> $@
-	echo -n "  openstack_version: \"" >> $@
-	cat $(ISOROOT)/openstack_version | tr -d '\n' >> $@
-	echo "\"" >> $@
 	echo "  api: \"1.0\"" >> $@
 ifdef BUILD_NUMBER
 	echo "  build_number: \"$(BUILD_NUMBER)\"" >> $@
@@ -126,21 +122,6 @@ $(BUILD_DIR)/iso/isoroot-dotfiles.done: \
 		$(ISOROOT)/.treeinfo
 	$(ACTION.TOUCH)
 
-$(ISOROOT)/openstack_version: $(BUILD_DIR)/iso/$(OPENSTACK_YAML_ART_NAME)
-	mkdir -p $(@D)
-	python -c "import yaml; print filter(lambda r: r['fields'].get('name'), yaml.load(open('$(BUILD_DIR)/iso/$(OPENSTACK_YAML_ART_NAME)')))[0]['fields']['version']" > $@
-
-
-openstack-yaml: $(ARTS_DIR)/$(OPENSTACK_YAML_ART_NAME)
-
-$(ARTS_DIR)/$(OPENSTACK_YAML_ART_NAME): $(BUILD_DIR)/iso/$(OPENSTACK_YAML_ART_NAME)
-	$(ACTION.COPY)
-
-$(BUILD_DIR)/iso/$(OPENSTACK_YAML_ART_NAME): $(BUILD_DIR)/repos/fuel-nailgun.done
-	mkdir -p $(@D)
-	cp $(BUILD_DIR)/repos/fuel-nailgun/nailgun/nailgun/fixtures/openstack.yaml $@
-
-
 $(BUILD_DIR)/iso/isoroot-files.done: \
 		$(BUILD_DIR)/iso/isoroot-dotfiles.done \
 		$(ISOROOT)/isolinux/isolinux.cfg \
@@ -149,8 +130,7 @@ $(BUILD_DIR)/iso/isoroot-files.done: \
 		$(ISOROOT)/bootstrap_admin_node.sh \
 		$(ISOROOT)/bootstrap_admin_node.conf \
 		$(ISOROOT)/send2syslog.py \
-		$(ISOROOT)/version.yaml \
-		$(ISOROOT)/openstack_version
+		$(ISOROOT)/version.yaml
 	$(ACTION.TOUCH)
 
 $(ISOROOT)/.discinfo: $(SOURCE_DIR)/iso/.discinfo ; $(ACTION.COPY)