openstack/tripleo-quickstart-extras
Code Issues Proposed changes

Fix devmode run of quickstart

Browse Source 
Set undercloud inventory before it's used in next playbook.
Fix images update issues and set centos images to newest.
Set 'libguestfs_mode: false' to avoid running virt-customize
on initramfs.

Closes-bug: #1730997

Change-Id: I46dce77166ecb828d4186b3f2ffa56cf9aa9d31e
This commit is contained in:
Ronelle Landy 2017-11-08 14:18:39 -05:00 committed by Sagi Shnaidman
parent 4aff970c23
commit a05e1f7622
4 changed files with 28 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
config/environments/rdocloud-ci.yml
View File

@ -6,9 +6,9 @@ os_region_name: "{{ lookup('env','OS_REGION_NAME') }}"
cloud_name: rdocloud cloud_name: rdocloud
latest_guest_image: latest_guest_image:
newton: CentOS-7-x86_64-GenericCloud-1701 ocata: CentOS-7-x86_64-GenericCloud-1708
ocata: CentOS-7-x86_64-GenericCloud-1701 pike: CentOS-7-x86_64-GenericCloud-1708
master: CentOS-7-x86_64-GenericCloud-1701 master: CentOS-7-x86_64-GenericCloud-1708
bmc_flavor: ci.m1.small bmc_flavor: ci.m1.small
baremetal_flavor: ci.m1.large baremetal_flavor: ci.m1.large
@ -24,3 +24,8 @@ external_net: '38.145.32.0/22'
overcloud_dns_servers: "{{ custom_nameserver }}" overcloud_dns_servers: "{{ custom_nameserver }}"
ntp_server: 'pool.ntp.org' ntp_server: 'pool.ntp.org'
overcloud_image_url: http://images.rdoproject.org/{{ release }}/rdo_trunk/{{ dlrn_hash|default(dlrn_hash_tag) }}/overcloud-full.tar
ipa_image_url: http://images.rdoproject.org/{{ release }}/rdo_trunk/{{ dlrn_hash|default(dlrn_hash_tag) }}/ironic-python-agent.tar
docker_registry_host: trunk.registry.rdoproject.org
docker_registry_namespace: "{{ release }}"

11
config/environments/rdocloud.yml
View File

@ -6,9 +6,9 @@ os_region_name: "{{ lookup('env', 'OS_REGION_NAME') }}"
cloud_name: rdocloud cloud_name: rdocloud
latest_guest_image: latest_guest_image:
newton: CentOS-7-x86_64-GenericCloud-1701 ocata: CentOS-7-x86_64-GenericCloud-1708
ocata: CentOS-7-x86_64-GenericCloud-1701 pike: CentOS-7-x86_64-GenericCloud-1708
master: CentOS-7-x86_64-GenericCloud-1701 master: CentOS-7-x86_64-GenericCloud-1708
bmc_flavor: m1.small bmc_flavor: m1.small
baremetal_flavor: m1.large baremetal_flavor: m1.large
@ -24,3 +24,8 @@ external_net: '38.145.32.0/22'
overcloud_dns_servers: "{{ custom_nameserver }}" overcloud_dns_servers: "{{ custom_nameserver }}"
ntp_server: 'pool.ntp.org' ntp_server: 'pool.ntp.org'
boot_from_volume: true boot_from_volume: true
overcloud_image_url: http://images.rdoproject.org/{{ release }}/rdo_trunk/{{ dlrn_hash|default(dlrn_hash_tag) }}/overcloud-full.tar
ipa_image_url: http://images.rdoproject.org/{{ release }}/rdo_trunk/{{ dlrn_hash|default(dlrn_hash_tag) }}/ironic-python-agent.tar
docker_registry_host: trunk.registry.rdoproject.org
docker_registry_namespace: "{{ release }}"

15
playbooks/ovb-setup.yml
View File

@ -19,18 +19,17 @@
- network_isolation|bool - network_isolation|bool
- use_testenv_broker|default(false)|bool - use_testenv_broker|default(false)|bool
# Small playbook with logic for when to build images or not.
# The logic there can be completely overridden by setting the
# to_build variable.
- include: to-build-or-not-to-build.yml
- name: Inventory the undercloud instance - name: Inventory the undercloud instance
hosts: localhost hosts: localhost
gather_facts: yes gather_facts: yes
roles: roles:
- tripleo-inventory - tripleo-inventory
# Small playbook with logic for when to build images or not.
# The logic there can be completely overridden by setting the
# to_build variable.
- include: to-build-or-not-to-build.yml
- name: Run DLRN gate role and install repo - name: Run DLRN gate role and install repo
hosts: undercloud hosts: undercloud
vars: vars:
@ -55,7 +54,7 @@
roles: roles:
- { role: fetch-images, when: not to_build|bool } - { role: fetch-images, when: not to_build|bool }
- { role: repo-setup, repo_inject_image_path: "$HOME/overcloud-full.qcow2", repo_run_live: false, when: not to_build|bool } - { role: repo-setup, repo_inject_image_path: "$HOME/overcloud-full.qcow2", repo_run_live: false, when: not to_build|bool }
- { role: repo-setup, repo_inject_image_path: "$HOME/ironic-python-agent.initramfs", repo_run_live: false, initramfs_image: true, when: not to_build|bool } - { role: repo-setup, repo_inject_image_path: "$HOME/ironic-python-agent.initramfs", repo_run_live: false, initramfs_image: true, libguestfs_mode: false, when: not to_build|bool }
- { role: install-built-repo, ib_repo_image_path: "$HOME/overcloud-full.qcow2", when: compressed_gating_repo is defined and not to_build|bool } - { role: install-built-repo, ib_repo_image_path: "$HOME/overcloud-full.qcow2", when: compressed_gating_repo is defined and not to_build|bool }
- { role: install-built-repo, ib_repo_image_path: "$HOME/ironic-python-agent.initramfs", initramfs_image: true, when: compressed_gating_repo is defined and not to_build|bool } - { role: install-built-repo, ib_repo_image_path: "$HOME/ironic-python-agent.initramfs", initramfs_image: true, libguestfs_mode: false, when: compressed_gating_repo is defined and not to_build|bool }

6
roles/modify-image/tasks/manual.yml
View File

@ -3,9 +3,13 @@
shell: echo "{{ image_to_modify }}" shell: echo "{{ image_to_modify }}"
register: image_to_modify_abs_path register: image_to_modify_abs_path
- name: Create a temp dir for extracting images
command: mktemp -d
register: mktemp_command
- name: Set names for images and temp dir - name: Set names for images and temp dir
set_fact: set_fact:
mount_tempdir: "{{ lookup('pipe', 'mktemp -d') }}" mount_tempdir: "{{ mktemp_command.stdout }}"
- when: not initramfs_image|bool - when: not initramfs_image|bool
block: block: