Merge remote-tracking branch 'gerrit/master' into f/centos76
Change-Id: Ie61d5660be65a9faa80265c72db5b23a97dcfe2f Signed-off-by: Saul Wold <sgw@linux.intel.com>
This commit is contained in:
commit
b2a3c20808
|
@ -53,3 +53,5 @@ openstack/python-wsme
|
||||||
openstack/distributedcloud
|
openstack/distributedcloud
|
||||||
openstack/distributedcloud-client
|
openstack/distributedcloud-client
|
||||||
openstack/stx-ocf-scripts
|
openstack/stx-ocf-scripts
|
||||||
|
openstack/openstack-helm
|
||||||
|
openstack/openstack-helm-infra
|
||||||
|
|
|
@ -11,6 +11,7 @@ Packager: Wind River <info@windriver.com>
|
||||||
URL: https://github.com/openstack/openstack-helm-infra
|
URL: https://github.com/openstack/openstack-helm-infra
|
||||||
|
|
||||||
Source0: %{name}-%{sha}.tar.gz
|
Source0: %{name}-%{sha}.tar.gz
|
||||||
|
Source1: repositories.yaml
|
||||||
|
|
||||||
BuildArch: noarch
|
BuildArch: noarch
|
||||||
|
|
||||||
|
@ -31,8 +32,20 @@ Openstack Helm Infra charts
|
||||||
|
|
||||||
%build
|
%build
|
||||||
# initialize helm and build the toolkit
|
# initialize helm and build the toolkit
|
||||||
helm init --client-only
|
# helm init --client-only does not work if there is no networking
|
||||||
make helm-toolkit
|
# The following commands do essentially the same as: helm init
|
||||||
|
%define helm_home %{getenv:HOME}/.helm
|
||||||
|
mkdir %{helm_home}
|
||||||
|
mkdir %{helm_home}/repository
|
||||||
|
mkdir %{helm_home}/repository/cache
|
||||||
|
mkdir %{helm_home}/repository/local
|
||||||
|
mkdir %{helm_home}/plugins
|
||||||
|
mkdir %{helm_home}/starters
|
||||||
|
mkdir %{helm_home}/cache
|
||||||
|
mkdir %{helm_home}/cache/archive
|
||||||
|
|
||||||
|
# Stage a repository file that only has a local repo
|
||||||
|
cp %{SOURCE1} %{helm_home}/repository/repositories.yaml
|
||||||
|
|
||||||
# Host a server for the charts
|
# Host a server for the charts
|
||||||
helm serve /tmp/charts --address localhost:8879 --url http://localhost:8879/charts &
|
helm serve /tmp/charts --address localhost:8879 --url http://localhost:8879/charts &
|
||||||
|
@ -40,6 +53,7 @@ helm repo rm local
|
||||||
helm repo add local http://localhost:8879/charts
|
helm repo add local http://localhost:8879/charts
|
||||||
|
|
||||||
# Make the charts. These produce tgz files
|
# Make the charts. These produce tgz files
|
||||||
|
make helm-toolkit
|
||||||
make gnocchi
|
make gnocchi
|
||||||
make ingress
|
make ingress
|
||||||
make libvirt
|
make libvirt
|
||||||
|
@ -48,6 +62,9 @@ make memcached
|
||||||
make openvswitch
|
make openvswitch
|
||||||
make rabbitmq
|
make rabbitmq
|
||||||
|
|
||||||
|
# terminate helm server (the last backgrounded task)
|
||||||
|
kill %1
|
||||||
|
|
||||||
%install
|
%install
|
||||||
install -d -m 755 ${RPM_BUILD_ROOT}%{helm_folder}
|
install -d -m 755 ${RPM_BUILD_ROOT}%{helm_folder}
|
||||||
install -p -D -m 755 *.tgz ${RPM_BUILD_ROOT}%{helm_folder}
|
install -p -D -m 755 *.tgz ${RPM_BUILD_ROOT}%{helm_folder}
|
||||||
|
|
|
@ -0,0 +1,12 @@
|
||||||
|
---
|
||||||
|
apiVersion: v1
|
||||||
|
generated: 2019-01-02T15:19:36.215111369-06:00
|
||||||
|
repositories:
|
||||||
|
- caFile: ""
|
||||||
|
cache: /builddir/.helm/repository/cache/local-index.yaml
|
||||||
|
certFile: ""
|
||||||
|
keyFile: ""
|
||||||
|
name: local
|
||||||
|
password: ""
|
||||||
|
url: http://127.0.0.1:8879/charts
|
||||||
|
username: ""
|
|
@ -5,4 +5,4 @@ TAR="$TAR_NAME-$SHA.tar.gz"
|
||||||
|
|
||||||
COPY_LIST="${CGCS_BASE}/downloads/$TAR $PKG_BASE/files/* "
|
COPY_LIST="${CGCS_BASE}/downloads/$TAR $PKG_BASE/files/* "
|
||||||
|
|
||||||
TIS_PATCH_VER=6
|
TIS_PATCH_VER=7
|
||||||
|
|
|
@ -13,6 +13,8 @@ Packager: Wind River <info@windriver.com>
|
||||||
URL: https://github.com/openstack/openstack-helm
|
URL: https://github.com/openstack/openstack-helm
|
||||||
|
|
||||||
Source0: %{name}-%{sha}.tar.gz
|
Source0: %{name}-%{sha}.tar.gz
|
||||||
|
Source1: repositories.yaml
|
||||||
|
Source2: index.yaml
|
||||||
|
|
||||||
BuildArch: noarch
|
BuildArch: noarch
|
||||||
|
|
||||||
|
@ -38,10 +40,29 @@ Openstack Helm charts
|
||||||
%patch05 -p1
|
%patch05 -p1
|
||||||
|
|
||||||
%build
|
%build
|
||||||
# initialize helm and stage the toolkit
|
# initialize helm and build the toolkit
|
||||||
helm init --client-only
|
# helm init --client-only does not work if there is no networking
|
||||||
|
# The following commands do essentially the same as: helm init
|
||||||
|
%define helm_home %{getenv:HOME}/.helm
|
||||||
|
mkdir %{helm_home}
|
||||||
|
mkdir %{helm_home}/repository
|
||||||
|
mkdir %{helm_home}/repository/cache
|
||||||
|
mkdir %{helm_home}/repository/local
|
||||||
|
mkdir %{helm_home}/plugins
|
||||||
|
mkdir %{helm_home}/starters
|
||||||
|
mkdir %{helm_home}/cache
|
||||||
|
mkdir %{helm_home}/cache/archive
|
||||||
|
|
||||||
|
# Stage a repository file that only has a local repo
|
||||||
|
cp %{SOURCE1} %{helm_home}/repository/repositories.yaml
|
||||||
|
|
||||||
|
# Stage a local repo index that can be updated by the build
|
||||||
|
cp %{SOURCE2} %{helm_home}/repository/local/index.yaml
|
||||||
|
|
||||||
|
# Stage helm-toolkit in the local repo
|
||||||
|
cp %{helm_folder}/helm-toolkit-%{toolkit_version}.tgz .
|
||||||
|
|
||||||
# Host a server for the charts
|
# Host a server for the charts
|
||||||
cp %{helm_folder}/helm-toolkit-%{toolkit_version}.tgz .
|
|
||||||
helm serve --repo-path . &
|
helm serve --repo-path . &
|
||||||
helm repo rm local
|
helm repo rm local
|
||||||
helm repo add local http://localhost:8879/charts
|
helm repo add local http://localhost:8879/charts
|
||||||
|
@ -61,8 +82,11 @@ make neutron
|
||||||
make nova
|
make nova
|
||||||
make panko
|
make panko
|
||||||
|
|
||||||
|
# terminate helm server (the last backgrounded task)
|
||||||
|
kill %1
|
||||||
|
|
||||||
# Remove the helm-toolkit tarball
|
# Remove the helm-toolkit tarball
|
||||||
rm helm-toolkit-%{toolkit_version}.tgz
|
rm helm-toolkit-%{toolkit_version}.tgz
|
||||||
|
|
||||||
%install
|
%install
|
||||||
# helm_folder is created by openstack-helm-infra
|
# helm_folder is created by openstack-helm-infra
|
||||||
|
|
|
@ -56,8 +56,8 @@ index 217d942..a5950a4 100644
|
||||||
source /etc/apache2/envvars
|
source /etc/apache2/envvars
|
||||||
fi
|
fi
|
||||||
|
|
||||||
+ # Get rid of stale pid file if present.
|
+ # Get rid of stale pid, shared memory segment and wsgi sock files if present.
|
||||||
+ rm -f /var/run/apache2/*.pid
|
+ rm -f /var/run/apache2/*
|
||||||
+
|
+
|
||||||
# Start Apache2
|
# Start Apache2
|
||||||
exec apache2 -DFOREGROUND
|
exec apache2 -DFOREGROUND
|
||||||
|
|
|
@ -0,0 +1,4 @@
|
||||||
|
---
|
||||||
|
apiVersion: v1
|
||||||
|
entries: {}
|
||||||
|
generated: 2019-01-07T12:33:46.098166523-06:00
|
|
@ -0,0 +1,12 @@
|
||||||
|
---
|
||||||
|
apiVersion: v1
|
||||||
|
generated: 2019-01-02T15:19:36.215111369-06:00
|
||||||
|
repositories:
|
||||||
|
- caFile: ""
|
||||||
|
cache: /builddir/.helm/repository/cache/local-index.yaml
|
||||||
|
certFile: ""
|
||||||
|
keyFile: ""
|
||||||
|
name: local
|
||||||
|
password: ""
|
||||||
|
url: http://127.0.0.1:8879/charts
|
||||||
|
username: ""
|
|
@ -1,8 +1,14 @@
|
||||||
BUILDER=loci
|
BUILDER=loci
|
||||||
LABEL=stx-gnocchi
|
LABEL=stx-gnocchi
|
||||||
PROJECT=gnocchi
|
PROJECT=gnocchi
|
||||||
PROJECT_REPO=https://github.com/gnocchixyz/gnocchi.git
|
# Temporarily pointing to forked gnocchi repo
|
||||||
|
# This is necessary to revert a specific commit that does
|
||||||
|
# not support the older CEPH currently in starlingx.
|
||||||
|
# Once the CEPH upgrade is complete, we can go back
|
||||||
|
# to using the main repo
|
||||||
|
PROJECT_REPO=https://github.com/donpenney/gnocchi.git
|
||||||
PIP_PACKAGES="pylint SQLAlchemy SQLAlchemy-Utils oslo.db keystonemiddleware gnocchiclient pymemcache psycopg2"
|
PIP_PACKAGES="pylint SQLAlchemy SQLAlchemy-Utils oslo.db keystonemiddleware gnocchiclient pymemcache psycopg2"
|
||||||
DIST_PACKAGES="python-rados"
|
# python-rados is provided by ceph, so specify an older version to install
|
||||||
|
DIST_PACKAGES="python-rados-10.2.5"
|
||||||
PROFILES="gnocchi apache"
|
PROFILES="gnocchi apache"
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue