Catch up commit to installer...

.gitignore

@@ -23,6 +23,7 @@ var/
 *.egg-info/
 .installed.cfg
 *.egg
+*.db
 
 # PyInstaller
 #  Usually these files are written by a python script from a template

defaults/main.yml

@@ -1,23 +1,27 @@
 ---
 # defaults file for role-install-gcloud
 
-gcloud_archive_name: ''                # Example: google-cloud-sdk-114.0.0-darwin-x86_64.tar.gz. If present, the archive will be downloaded. 
-                                       # See https://cloud.google.com/sdk/ to find the archive name you need. 
+gcloud_archive_name: 'google-cloud-sdk-529.0.0-linux-x86_64.tar.gz'                # Example: google-cloud-sdk-114.0.0-darwin-x86_64.tar.gz. If present, the archive will be downloaded.
+                                       # See https://cloud.google.com/sdk/ to find the archive name you need.
 gcloud_tmp_path: /tmp/install_gcloud   # Path where the downloaded archive can be temporarily placed
 gcloud_force_download: yes             # When downloading the archive, always download the archive, even if it already exists in the temp path.
 
-gcloud_archive_path: ''                        # Path to the gcloud archive file on the Ansible controller. 
+gcloud_archive_path: ''                        # Path to the gcloud archive file on the Ansible controller.
                                                # If present archive will be copied, not downloaded.
 
-gcloud_install_path: "{{ ansible_env.HOME }}"  # Path on target node where the unarchived files should land.
+gcloud_install_path: "/home/njl/"  # Path on target node where the unarchived files should land.
 
 gcloud_usage_reporting: no        # Enable usage reporting?
 gcloud_profile_path: ''           # Path to the user profile login script. Optional.
 gcloud_command_completion: yes    # Enable bash style command completion in the login script?
 gcloud_update_path: yes           # Update the PATH when when modifying user's login script.
-gcloud_override_components: []    # Override the components that would be installed by default, and install these instead. 
+gcloud_override_components: []    # Override the components that would be installed by default, and install these instead.
 
-gcloud_additional_components: [kubectl]  # Additional components to install by default. Will either be added to the default install
-                                         # list, or to the override-components (if provided) 
-gcloud_debug: yes 
+gcloud_additional_components: []  # Additional components to install by default. Will either be added to the default install
+                                         # list, or to the override-components (if provided)
+gcloud_debug: yes
 
+
+gcloud_keyring_file: /usr/share/keyrings/cloud.google.gpg
+gcloud_keyring_url: https://packages.cloud.google.com/apt/doc/apt-key.gpg
+gcloud_keyring_tmp_file: /tmp/cloud.google.gpg

files

@@ -0,0 +1 @@
+../../mkrasberry_config/roles/role-install-gcloud/files/

tasks/authenticate.yml

@@ -0,0 +1,18 @@
+---
+    - name: Copy the archive from the Ansible controller
+      copy:
+        src: "{{ gcloud_credentials }}"
+        dest: "/home/njl/.config/gcloud/{{ gcloud_credentials }}"
+        mode: 0600
+    - name: Authenticate with Google Cloud
+      ansible.builtin.shell: 
+        cmd: "gcloud auth login --creds-file=/home/njl/.config/gcloud/{{ gcloud_credentials }}"
+      register: gcloud_auth_status
+    - name: Check the authentication status
+      ansible.builtin.debug:
+        msg: "{{ gcloud_auth_status.stdout }}"
+    - name: Set the default project
+      ansible.builtin.shell:
+        cmd: "gcloud config set project {{ gcloud_project }}"
+      register: gcloud_project_status
+

tasks/main.yml

@@ -1,65 +1,59 @@
 ---
-- name: Insure temp path exists
-  file:
-    path: "{{ gcloud_tmp_path }}"
-    state: directory
-
-#
-# download
-#
-- name: Download the archive
-  get_url:
-    url: "{{ gcloud_archive_url }}/{{ gcloud_archive_name }}"
-    dest: "{{ gcloud_tmp_path }}/{{ gcloud_archive_name }}"
-    force: "{{ gcloud_force_download }}" 
-  when: gcloud_archive_name 
-
-#
-# copy from Ansible controller
-#
-- name: Copy the archive from the Ansible controller
-  copy:
-    src: "{{ gcloud_archive_path }}"
-    dest: "{{ gcloud_tmp_path }}"
-  when: gcloud_archive_path
-
-- name: Remove existing google-cloud-sdk dir, it if exists
-  file:
-      path: "{{ gcloud_install_path }}/google-cloud-sdk"
-      state: absent
-  when: gcloud_archive_name
-
-- set_fact:
-    archive_path: "{{ gcloud_tmp_path + '/' +  gcloud_archive_name }}" 
-  when: gcloud_archive_name
-
-- set_fact:
-    archive_path: "{{ gcloud_tmp_path + '/' + gcloud_archive_path | basename }}"
-  when: gcloud_archive_path
-
-- name: Unarchive
-  shell: cd "{{ gcloud_install_path }}" && tar xvzf "{{ archive_path }}"
-  when: gcloud_archive_name
-
-- name: Build run script
-  template:
-    src: "{{ role_path }}/templates/run.j2"  
-    dest: "{{ gcloud_tmp_path }}/run_install.sh"
-    mode: 0755
-  tags:
-    - copy
-    - download
-
-- name: Install
-  command: "{{ gcloud_tmp_path }}/run_install.sh"
-
-- name: Remove the archive
-  file:
-    path: "{{ archive_path }}"
-    state: absent
-
-- name: Remove the script
-  file:
-    path: "{{ gcloud_tmp_path }}/run_install.sh"
-    state: absent
-  when: not gcloud_debug 
+- name: "Install GCloud Main"
+  become: true
+  become_user: root
+  block:
+  #
+  # download
+  #
+
+    - name: "Remove old key"
+      ansible.builtin.file:
+        name: "{{ gcloud_keyring_file }}"
+        state: absent
+    - name: Download the Keyring
+      ansible.builtin.get_url:
+        url: "{{ gcloud_keyring_url }}"
+        dest: "{{ gcloud_keyring_tmp_file }}"
+        force: true
+        mode: "0644"
+    - name: DeArmor the Keyring
+      ansible.builtin.shell: "gpg --yes --batch --dearmor -o {{ gcloud_keyring_file }} {{ gcloud_keyring_tmp_file }}"
+    - name: Somerepo | apt source
+      ansible.builtin.apt_repository:
+        repo: "deb [signed-by=/usr/share/keyrings/cloud.google.gpg] https://packages.cloud.google.com/apt cloud-sdk main"
+        filename: "google-cloud-sdk"
+        state: present
+    - name: Install the Google Cloud SDK
+      ansible.builtin.apt:
+        name: google-cloud-cli
+        state: present
+        update_cache: true
+        cache_valid_time: 84600
+        force_apt_get: true
+- name: "config cloud auth "
+  become: true
+  become_user: "{{ local_ssh_user }}"
+  block:
+    - name: "Add gcloud config"
+      ansible.builtin.file:
+        name: "/home/njl/.config/gcloud/"
+        state: directory
+        mode: "0700"
+    - name: Copy the archive from the Ansible controller
+      ansible.builtin.copy:
+        src: "{{ gcloud_credentials }}"
+        dest: "/home/njl/.config/gcloud/{{ gcloud_credentials }}"
+        mode: "0600"
+    - name: Authenticate with Google Cloud
+      ansible.builtin.shell:
+        cmd: "gcloud auth login --cred-file=/home/njl/.config/gcloud/{{ gcloud_credentials }}"
+      register: gcloud_auth_status
+    - name: Check the authentication status
+      ansible.builtin.debug:
+        msg: "{{ gcloud_auth_status.stdout }}"
+    - name: Set the default project
+      ansible.builtin.shell:
+        cmd: "gcloud config set project {{ gcloud_project }}"
+      register: gcloud_project_status
+

tasks/raw_install.yml

@@ -0,0 +1,86 @@
+---
+  - block:
+    - name: Insure temp path exists
+      file:
+        path: "{{ gcloud_tmp_path }}"
+        state: directory
+
+    #
+    # download
+    #
+    - name: Download the archive
+      get_url:
+        url: "{{ gcloud_archive_url }}/{{ gcloud_archive_name }}"
+        dest: "{{ gcloud_tmp_path }}/{{ gcloud_archive_name }}"
+        force: "{{ gcloud_force_download }}"
+    - set_fact:
+        gcloud_archive_path: "{{ gcloud_tmp_path }}/{{ gcloud_archive_name }}"
+
+    #
+    # copy from Ansible controller
+    #
+    - name: Copy the archive from the Ansible controller
+      copy:
+        src: "{{ gcloud_archive_path }}"
+        dest: "{{ gcloud_tmp_path }}"
+        remote_src: yes
+
+    - name: Remove existing google-cloud-sdk dir, it if exists
+      file:
+          path: "{{ gcloud_install_path }}/google-cloud-sdk"
+          state: absent
+
+    - set_fact:
+        archive_path: "{{ gcloud_tmp_path + '/' +  gcloud_archive_name }}"
+
+    - set_fact:
+        archive_path: "{{ gcloud_tmp_path + '/' + gcloud_archive_path | basename }}"
+
+    - name: Unarchive
+      shell: cd "{{ gcloud_install_path }}" && tar xvzf "{{ archive_path }}"
+
+    - name: Build run script
+      template:
+        src: "{{ role_path }}/templates/run.j2"
+        dest: "{{ gcloud_tmp_path }}/run_install.sh"
+        mode: 0755
+      tags:
+        - copy
+        - download
+
+    - name: Install
+      command: "{{ gcloud_tmp_path }}/run_install.sh"
+
+    - name: Add configuration directory
+      file:
+          path: "{{ gcloud_install_path }}/.config"
+          state: directory
+          mode: 0755
+    - name: Add configuration directory
+      file:
+          path: "{{ gcloud_install_path }}/.config/gcloud"
+          state: directory
+          mode: 0755
+    - name: Add configuration directory
+      file:
+          path: "{{ gcloud_install_path }}/.config/gcloud/configurations"
+          state: directory
+          mode: 0755
+    - name: Put in default config (not sure we can do the auth...)
+      template:
+        src: "default_config.j2"
+        dest: "{{ gcloud_install_path }}/.config/gcloud/configurations/config_default"
+        mode: 0644
+
+    - name: Remove the archive
+      file:
+        path: "{{ archive_path }}"
+        state: absent
+
+    - name: Remove the script
+      file:
+        path: "{{ gcloud_tmp_path }}/run_install.sh"
+        state: absent
+      when: not gcloud_debug
+
+    when: gcloud_archive_name is defined

templates/default_config.j2

@@ -0,0 +1,3 @@
+[core]
+account = nick.lange@gmail.com
+project = zeta-environs-173316

vars/main.yml

@@ -2,3 +2,4 @@
 # vars file for role-install-gcloud
 
 gcloud_archive_url: "https://dl.google.com/dl/cloudsdk/channels/rapid/downloads"
+gcloud_credentials: "our_creds.json"