From 88fea8355bd60a9c39e4e9ab2742e09a585572e4 Mon Sep 17 00:00:00 2001 From: Jonathan Rosser Date: Wed, 23 May 2018 20:38:00 +0100 Subject: [PATCH] Ensure rndc tool is available when rndc keys are used Closes-Bug: 1721014 Change-Id: Ie9b039a9e4550bf11e2843e4ff886eacc46a4866 --- vars/distro_install.yml | 9 ++++++++- vars/redhat-7.yml | 3 +++ vars/source_install.yml | 8 +++++++- vars/suse-42.yml | 3 +++ vars/ubuntu-16.04.yml | 3 +++ 5 files changed, 24 insertions(+), 2 deletions(-) diff --git a/vars/distro_install.yml b/vars/distro_install.yml index 577d0ab..c4291e8 100644 --- a/vars/distro_install.yml +++ b/vars/distro_install.yml @@ -14,6 +14,13 @@ # limitations under the License. # -designate_package_list: "{{ designate_distro_packages + designate_service_distro_packages }}" +designate_package_list: |- + {% set packages = designate_distro_packages %} + {% set _ = packages.extend(designate_service_distro_packages) %} + {% if designate_rndc_keys is defined %} + {% set _ = packages.extend(designate_rndc_packages) %} + {% endif %} + {{ packages }} + _designate_bin: "/usr/bin" _designate_etc: "/etc" diff --git a/vars/redhat-7.yml b/vars/redhat-7.yml index dac0bb9..b0474e5 100644 --- a/vars/redhat-7.yml +++ b/vars/redhat-7.yml @@ -27,3 +27,6 @@ designate_service_distro_packages: - openstack-designate-sink - openstack-designate-worker - openstack-designate-zone-manager + +designate_rndc_packages: + - bind-utils diff --git a/vars/source_install.yml b/vars/source_install.yml index cc3d065..0243a50 100644 --- a/vars/source_install.yml +++ b/vars/source_install.yml @@ -14,6 +14,12 @@ # limitations under the License. # -designate_package_list: "{{ designate_distro_packages }}" +designate_package_list: |- + {% set packages = designate_distro_packages %} + {% if designate_rndc_keys is defined %} + {% set _ = packages.extend(designate_rndc_packages) %} + {% endif %} + {{ packages }} + _designate_bin: "/openstack/venvs/designate-{{ designate_venv_tag }}/bin" _designate_etc: "{{ _designate_bin | dirname + '/etc' }}" diff --git a/vars/suse-42.yml b/vars/suse-42.yml index a40129d..4983121 100644 --- a/vars/suse-42.yml +++ b/vars/suse-42.yml @@ -25,3 +25,6 @@ designate_service_distro_packages: - openstack-designate-producer - openstack-designate-sink - openstack-designate-worker + +designate_rndc_packages: + - bind-utils diff --git a/vars/ubuntu-16.04.yml b/vars/ubuntu-16.04.yml index a2a7f2a..d62057e 100644 --- a/vars/ubuntu-16.04.yml +++ b/vars/ubuntu-16.04.yml @@ -29,3 +29,6 @@ designate_service_distro_packages: - designate-sink - designate-worker - designate-zone-manager + +designate_rndc_packages: + - bind9utils