diff options
author | Tim Rozet <trozet@redhat.com> | 2018-05-02 12:34:38 -0400 |
---|---|---|
committer | Tim Rozet <trozet@redhat.com> | 2018-05-21 10:36:05 -0400 |
commit | d2913d4bcc0fcd25dc3d01f6604049dfd0a9217d (patch) | |
tree | 5cf7a0d04cbf8b30488bb18ba7ee79e215f08e47 /build/kvm4nfv-1st-boot.yaml | |
parent | 22bc385f5b2e25694699a614268aaad2fdacbb12 (diff) |
Migrates master to use direct upstream
We now move master to deploy from upstream. That means we do not need
to build undercloud/overcloud images anymore.
Changes-Include:
- Remove bash build scripts as we do not need to build anything
other than the python package anymore
- Remove building images or iso from build.py
- Remove building of images and iso from Makefile
- Rename/refactor deploy settings files for nosdn and odl. The new
convention is that the typical scenario names we use will deploy
master. We also support n-1 OS, so in that case we use the branch
name for the "feature" in the scenario name: os-odl-queens-noha.
- Tacker/Congress are disabled in settings files until we fix that with
upstream. Containers are now enabled by default.
- Disable TLS for undercloud (was changed upstream to default enabled)
- Fix environments docker directory for master THT (was changed upstream)
- Includes fix for LP#1768901
- Includes workaround for LP#1770692
- Moves to docker.io for container images as it is more stable and
should contain the same images
- Removes the term 'common' from apex packaging for referencing the
Python Apex package
Change-Id: If6b433860b3ff882686c78d0f24a2f0c52b9b57a
Signed-off-by: Tim Rozet <trozet@redhat.com>
Diffstat (limited to 'build/kvm4nfv-1st-boot.yaml')
-rw-r--r-- | build/kvm4nfv-1st-boot.yaml | 61 |
1 files changed, 0 insertions, 61 deletions
diff --git a/build/kvm4nfv-1st-boot.yaml b/build/kvm4nfv-1st-boot.yaml deleted file mode 100644 index 4c1aefc0..00000000 --- a/build/kvm4nfv-1st-boot.yaml +++ /dev/null @@ -1,61 +0,0 @@ ---- -heat_template_version: 2014-10-16 - -description: > - This is the firstboot configuration for kvmfornfv kernel of the compute nodes - via cloud-init. To enable this, replace the default - mapping of OS::TripleO::NodeUserData in ../overcloud_resource_registry* - -parameters: - ComputeKernelArgs: - description: > - Name of the kvmfornfv kernel rpm. - Example: "kvmfornfv_kernel.rpm" - type: string - default: "" - ComputeHostnameFormat: - type: string - default: "" - -resources: - userdata: - type: OS::Heat::MultipartMime - properties: - parts: - - config: {get_resource: compute_kernel_args} - - # Verify the logs on /var/log/cloud-init.log on the overcloud node - compute_kernel_args: - type: OS::Heat::SoftwareConfig - properties: - config: - str_replace: - template: | - #!/bin/bash - set -x - FORMAT=$COMPUTE_HOSTNAME_FORMAT - if [[ -z $FORMAT ]] ; then - FORMAT="compute" ; - else - # Assumption: only %index% and %stackname% are - # the variables in Host name format - FORMAT=$(echo $FORMAT | sed 's/\%index\%//g'); - FORMAT=$(echo $FORMAT | sed 's/\%stackname\%//g'); - fi - if [[ $(hostname) == *$FORMAT* ]] ; then - yum install -y /root/$KVMFORNFV_KERNEL_RPM - grub2-mkconfig -o /etc/grub2.cfg - sleep 5 - reboot - fi - params: - $KVMFORNFV_KERNEL_RPM: {get_param: ComputeKernelArgs} - $COMPUTE_HOSTNAME_FORMAT: {get_param: ComputeHostnameFormat} - -outputs: - # This means get_resource from the parent template will get the userdata, see: - # http://docs.openstack.org/developer/heat/template_guide/composition.html#making-your-template-resource-more-transparent - # Note this is new-for-kilo, an alternative is returning a value then using - # get_attr in the parent template instead. - OS::stack_id: - value: {get_resource: userdata} |