From 74c078df0428c5a6f0f9fadbf45b84b6229aaf67 Mon Sep 17 00:00:00 2001 From: John Trowbridge Date: Wed, 8 Feb 2017 11:21:01 -0500 Subject: [PATCH] [undercloud-deploy] Add ability to override ironic httpd ipxe port This is needed for tripleo-ci and is the quickstart equivalent of: https://git.openstack.org/cgit/openstack-infra/tripleo-ci/commit/?id=2c9257747261d3ac5b0741187e84a724176536b0 Change-Id: I6a4dae61fa5c750499aac4bc4ededf0803600759 --- roles/undercloud-deploy/README.md | 2 ++ roles/undercloud-deploy/defaults/main.yml | 4 ++++ .../templates/quickstart-hieradata-overrides.yaml.j2 | 4 ++++ 3 files changed, 10 insertions(+) diff --git a/roles/undercloud-deploy/README.md b/roles/undercloud-deploy/README.md index b4d0a276a..a7c5880bf 100644 --- a/roles/undercloud-deploy/README.md +++ b/roles/undercloud-deploy/README.md @@ -21,6 +21,8 @@ to the undercloud install log file. used as the base for the network-environment for tripleo. - `undercloud_hieradata_override_file`: <'quickstart-hieradata-overrides.yaml.j2'> -- the name of jinja template used to override the undercloud's install hieradata +- `undercloud_ironic_ipxe_port`: <'3816'> -- port to use for httpd ipxe server +for ironic deploy - `step_introspect`: <'false'> -- boolean value to enable/disable ironic introspection - `bash_deploy_ramdisk`: <'false'> -- the variable allows older versions of tripleo to upload images properly with the option --old-deploy-image diff --git a/roles/undercloud-deploy/defaults/main.yml b/roles/undercloud-deploy/defaults/main.yml index b3b068d2e..47554c787 100644 --- a/roles/undercloud-deploy/defaults/main.yml +++ b/roles/undercloud-deploy/defaults/main.yml @@ -27,5 +27,9 @@ network_environment_args: # not require privileged access (but does require the setup performed by the # `environment/setup` role). libvirt_uri: qemu:///session + +# port to use for httpd ipxe server for ironic deploy +undercloud_ironic_ipxe_port: 3816 + enable_vbmc: true undercloud_conf_extra: "" diff --git a/roles/undercloud-deploy/templates/quickstart-hieradata-overrides.yaml.j2 b/roles/undercloud-deploy/templates/quickstart-hieradata-overrides.yaml.j2 index 08a68ff08..6fcd38561 100644 --- a/roles/undercloud-deploy/templates/quickstart-hieradata-overrides.yaml.j2 +++ b/roles/undercloud-deploy/templates/quickstart-hieradata-overrides.yaml.j2 @@ -3,6 +3,10 @@ # the value of libvirt_uri into /etc/ironic/ironic.conf. ironic::drivers::ssh::libvirt_uri: '{{libvirt_uri}}' +# The default httpd ipxe port is 8080, but this conflicts with the telnet +# server which streams the console log in CI. So we allow override here. +ironic::drivers::deploy::http_port: '{{undercloud_ironic_ipxe_port}}' + # The following are configurations for the different workers for the undercloud # services. {% if undercloud_workers is defined %}