From dd2049f0c98c49b670aea34b9fd5dfc15fa9dbee Mon Sep 17 00:00:00 2001 From: Paul Belanger Date: Fri, 22 Sep 2017 19:47:46 -0400 Subject: [PATCH] Next round of updates for legacy-install-afs-with-puppet We need to quote "false" for SETUP_PIP, other wise yaml will convert it to False. Run puppet as root and clean up a puppet warning. Change-Id: Ibb1d67bb8c95b99af7e9b5d1b28cd51cd9ba5089 Signed-off-by: Paul Belanger --- roles/legacy-install-afs-with-puppet/files/manifest.pp | 2 +- roles/legacy-install-afs-with-puppet/tasks/main.yaml | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/roles/legacy-install-afs-with-puppet/files/manifest.pp b/roles/legacy-install-afs-with-puppet/files/manifest.pp index e02c2452ac..38fdd1a9d5 100644 --- a/roles/legacy-install-afs-with-puppet/files/manifest.pp +++ b/roles/legacy-install-afs-with-puppet/files/manifest.pp @@ -1,4 +1,4 @@ -class { 'openafs::client': +class { '::openafs::client': cell => 'openstack.org', realm => 'OPENSTACK.ORG', admin_server => 'kdc.openstack.org', diff --git a/roles/legacy-install-afs-with-puppet/tasks/main.yaml b/roles/legacy-install-afs-with-puppet/tasks/main.yaml index b0fafa01cd..7aa6cb0a54 100644 --- a/roles/legacy-install-afs-with-puppet/tasks/main.yaml +++ b/roles/legacy-install-afs-with-puppet/tasks/main.yaml @@ -4,7 +4,7 @@ chdir: "{{ ansible_user_dir }}/src/git.openstack.org/openstack-infra/system-config" environment: # Skip setting up pip, our images have already done this. - SETUP_PIP: false + SETUP_PIP: "false" become: yes - name: Copy reduced scope modules.env into place @@ -26,3 +26,4 @@ - name: Run puppet puppet: manifest: "{{ ansible_user_dir }}/manifest.pp" + become: yes