diff --git a/ansible/group_vars/nodepool.yaml b/ansible/group_vars/nodepool.yaml index 7f0195f..a51a13a 100644 --- a/ansible/group_vars/nodepool.yaml +++ b/ansible/group_vars/nodepool.yaml @@ -47,4 +47,14 @@ openstacksdk_user_home: /var/lib/nodepool openstacksdk_pip_virtualenv_python: python3 openstacksdk_pip_virtualenv: /opt/venv/nodepool-untagged -openstacksdk_file_clouds_yaml_src: "{{ windmill_config_git_dest }}/nodepool/clouds.yaml.j2" +openstacksdk_file_clouds_yaml_src: "{{ windmill_config_git_dest }}/nodepool/openstack/clouds.yaml.j2" + +# windmill.goto3 +boto3_user_name: nodepool +boto3_user_group: nodepool +boto3_user_home: /var/lib/nodepool + +boto3_pip_virtualenv_python: python3 +boto3_pip_virtualenv: /opt/venv/nodepool-untagged + +boto3_file_credentials_src: "{{ windmill_config_git_dest }}/nodepool/aws/credentials.j2" diff --git a/nodepool/aws/credentials.j2 b/nodepool/aws/credentials.j2 new file mode 100644 index 0000000..232fcbd --- /dev/null +++ b/nodepool/aws/credentials.j2 @@ -0,0 +1 @@ +# Default template for ~/.aws/credentials diff --git a/nodepool/nodepool.yaml b/nodepool/nodepool.yaml index 420a585..79563b0 100644 --- a/nodepool/nodepool.yaml +++ b/nodepool/nodepool.yaml @@ -23,6 +23,23 @@ providers: diskimage: ubuntu-bionic min-ram: 8192 console-log: true + - name: ec2-us-east-2 + driver: aws + region-name: us-east-2 + cloud-images: + - name: ubuntu-bionic + image-id: ami-07c1207a9d40bc3bd + username: ec2-user + pools: + - name: main + max-servers: 5 + subnet-id: subnet-0eb42065e8c196f38 + security-group-id: sg-0dea0b7beee7f8b88 + labels: + - name: ubuntu-bionic + cloud-image: ubuntu-bionic + instance-type: t2.small + key-name: zuul diskimages: - name: ubuntu-bionic diff --git a/nodepool/clouds.yaml.j2 b/nodepool/openstack/clouds.yaml.j2 similarity index 100% rename from nodepool/clouds.yaml.j2 rename to nodepool/openstack/clouds.yaml.j2