mcornea

- name: deploy ocata repos
  hosts: undercloud-0
  gather_facts: false
  tasks:
    - name: detect python2-tripleo-repos
      shell: |
        curl -L --silent https://trunk.rdoproject.org/centos7/current/ | grep python2-tripleo-repos | awk -F "href" {'print $2'} | awk -F '"' {'print $2'}
      register: tripleo_repos

    - yum:

mcornea

- name: Undercloud Upgrade
  hosts: undercloud
  gather_facts: yes
  any_errors_fatal: true
  tags: upgrade
  vars:
      rhos_release_rpm: "https://url.corp.redhat.com/rhos-release-latest-rpm"
      version_map:
          - nova_version: '15'
            rhos_version: '11'

mcornea

- name: Auto generate instackenv.json for virt
  include: "{{ overcloud_virt | default('hypervisor.yml') }}"
  tags:
      - hypervisor
      - ironic
      - instack
  when: "'hypervisor' in groups"

- name: Auto generate instackenv.json for ovb
  include: "{{ overcloud_ovb | default('ovb.yml') }}"

mcornea

---
pre_ffu_undercloud_upgrade_2nd_release: []

pre_ffu_undercloud_upgrade_3rd_release:  []

pre_ffu_undercloud_upgrade_workarounds: []

post_ffu_undercloud_upgrade_workarounds:

  - BZ#1561255:

mcornea

resource_registry:
  OS::TripleO::Compute::Net::SoftwareConfig: network/nic-configs/compute.yaml
  OS::TripleO::Controller::Net::SoftwareConfig: network/nic-configs/controller.yaml

  OS::TripleO::Network::Tenant: OS::Heat::None
  OS::TripleO::Network::InternalApi: OS::Heat::None
  OS::TripleO::Network::Storage: OS::Heat::None
  OS::TripleO::Network::StorageMgmt: OS::Heat::None

  OS::TripleO::Network::Ports::StorageMgmtVipPort: /usr/share/openstack-tripleo-heat-templates/network/ports/noop.yaml

mcornea

diff --git a/puppet/services/tripleo-packages.yaml b/puppet/services/tripleo-packages.yaml
index d523f3f7..9ecbe5ed 100644
--- a/puppet/services/tripleo-packages.yaml
+++ b/puppet/services/tripleo-packages.yaml
@@ -38,7 +38,7 @@ parameters:
     default: 'tripleo-repos'
     type: string
   FastForwardRepoArgs:
-    default: {'tripleo_repos': {'ocata': '-b ocata current', 'pike': '-b pike current'}}
+    default: {'tripleo_repos': [{'release': 'ocata', 'args': '-b ocata current'}, {'release': 'pike', 'args': '-b pike current'}]}

mcornea

- name: inject undercloud cert to overcloud trust ca
  gather_facts: false
  hosts: localhost
  vars:
    working_dir: './'
    undercloud_rc: '/home/stack/stackrc'
  tasks:
    - name: register ssl certificate location
      shell: |
        grep 13000 /etc/haproxy/haproxy.cfg  | awk {'print $6'}

mcornea

#!/bin/bash
#
# Script that spawns an instance

OVERCLOUD_RC="/home/stack/overcloudrc"
IMAGE_URL='http://download.cirros-cloud.net/0.3.5/cirros-0.3.5-x86_64-disk.img'
IMAGE_NAME='upgrade_workload'
IMAGE_FILE=~/upgrade_workload.qcow2
KEYPAIR_NAME=userkey
FLAVOR_NAME='v1-1G-5G'

mcornea

name: infra
prefix: null
cpu: "2"
cpumodel: "host-passthrough"
memory: "8192"
swap: "0"
deploy_os: true
os:
    type: "linux"
    variant: "rhel7"

mcornea

- name: register overcloud certificates environment file
  shell: "cat /home/stack/virt/inject-trust-anchor.yaml"
  register: oc_certs

- name: extract SSLRootCertificate
  copy:
    content: "{{ (oc_certs.stdout | from_yaml).parameter_defaults.SSLRootCertificate }}"
    dest: /home/stack/rootca.pem
    remote_src: yes