From f4e26d7b4823d45335665de2ff899c558040e6a9 Mon Sep 17 00:00:00 2001 From: Tee Ngo Date: Tue, 9 Jul 2019 16:29:14 -0400 Subject: [PATCH] Fix remote bootstrap from Windows control host This commit addresses the failure due to encoding error which occurs during the apply of puppet bootstrap manifest if the playbook is run from a Windows control host. In addition: - readme is updated to specify netaddr package dependency. This package is not included by default as part of Cygwin. - ansible related packages are removed from centos_iso_image.inc as they will be automatically pulled in per playbookconfig spec. Closes-Bug: 1835950 Change-Id: I113a99c8f149681e01f99f6a4953999af44ea7da Signed-off-by: Tee Ngo --- README.rst | 3 ++- centos_iso_image.inc | 6 ------ playbookconfig/centos/playbookconfig.spec | 2 +- .../bootstrap/roles/apply-bootstrap-manifest/tasks/main.yml | 1 + 4 files changed, 4 insertions(+), 8 deletions(-) diff --git a/README.rst b/README.rst index a95d7c18d..86b6b7bc9 100644 --- a/README.rst +++ b/README.rst @@ -7,7 +7,7 @@ StarlingX Bootstrap and Deployment Playbooks Execution environment ===================== -- Linux like OS (recent Linux based distributions, MacOS, Cygwin) +- Unix like OS (recent Linux based distributions, MacOS, Cygwin) - Python 2.7 Additional Required Packages @@ -18,6 +18,7 @@ and StarlingX playbooks dependencies: - sshpass 1.06 - python2-ptyprocess 0.5 - python2-pexpect 4.6 +- python2-netaddr 0.7 - ``ansible`` 2.7.5 Supported StarlingX Releases diff --git a/centos_iso_image.inc b/centos_iso_image.inc index c6b373b96..1378b0f78 100644 --- a/centos_iso_image.inc +++ b/centos_iso_image.inc @@ -2,11 +2,5 @@ # If these have dependencies, they will be pulled in automatically # -# ansible -sshpass -python2-ptyprocess -python2-pexpect -ansible - # playbookconfig playbookconfig diff --git a/playbookconfig/centos/playbookconfig.spec b/playbookconfig/centos/playbookconfig.spec index 1235cec10..38527bbc5 100644 --- a/playbookconfig/centos/playbookconfig.spec +++ b/playbookconfig/centos/playbookconfig.spec @@ -10,7 +10,7 @@ Source0: %{name}-%{version}.tar.gz Requires: ansible Requires: python -Requires: python-netaddr +Requires: python2-netaddr Requires: python2-ptyprocess Requires: python2-pexpect Requires: sshpass diff --git a/playbookconfig/src/playbooks/bootstrap/roles/apply-bootstrap-manifest/tasks/main.yml b/playbookconfig/src/playbooks/bootstrap/roles/apply-bootstrap-manifest/tasks/main.yml index 65f10faf9..bdde74011 100644 --- a/playbookconfig/src/playbooks/bootstrap/roles/apply-bootstrap-manifest/tasks/main.yml +++ b/playbookconfig/src/playbooks/bootstrap/roles/apply-bootstrap-manifest/tasks/main.yml @@ -35,6 +35,7 @@ register: bootstrap_manifest environment: INITIAL_CONFIG_PRIMARY: "true" + LC_ALL: "en_US.UTF-8" - name: Fail if puppet manifest apply script returns an error fail: