diff --git a/ansible/Makefile b/ansible/Makefile index b15f3f0..794f9cc 100644 --- a/ansible/Makefile +++ b/ansible/Makefile @@ -97,11 +97,6 @@ ocs: hosts local-defaults.yaml -v -i hosts -e @local-defaults.yaml \ ocs.yaml -openstackclient: hosts local-defaults.yaml - ANSIBLE_FORCE_COLOR=true ansible-playbook \ - -v -i hosts -e @local-defaults.yaml \ - install_openstackclient.yaml \ - olm_cleanup: hosts local-defaults.yaml ANSIBLE_FORCE_COLOR=true ansible-playbook \ -v -i hosts -e @local-defaults.yaml \ diff --git a/ansible/files/ocp/openstackclientrc b/ansible/files/ocp/openstackclientrc deleted file mode 100644 index 519671b..0000000 --- a/ansible/files/ocp/openstackclientrc +++ /dev/null @@ -1,11 +0,0 @@ -alias openstack-server-list="openstack server list -c Name -c Status -c Host --long" - -alias openstack-compute-service-list="openstack compute service list -c Binary -c Host -c Status -c State -c 'Updated At'" - -alias openstack-server-create="openstack server create \ ---flavor m1.small --image cirros --network private \ -demo-scale" - -alias openstack-hypervisor-stats="openstack hypervisor stats show" - -alias openstack-network-agent-list="openstack network agent list -c 'Agent Type' -c Host -c Alive -c UP" diff --git a/ansible/install_openstackclient.yaml b/ansible/install_openstackclient.yaml deleted file mode 100644 index 9c25f5f..0000000 --- a/ansible/install_openstackclient.yaml +++ /dev/null @@ -1,31 +0,0 @@ ---- -- hosts: localhost - vars_files: "vars/default.yaml" - roles: - - oc_local - - tasks: - - - name: create openstackclient yamls dir - file: - path: "{{ working_dir }}/yamls/openstackclient" - state: directory - - - name: create openstackclient-pod.yaml from template - vars: - os_password: foobar123 - os_auth_url: http://keystone-openstack.apps.ostest.test.metalkube.org/ - template: - src: "openstackclient-pod.yaml.j2" - dest: "{{ working_dir }}/yamls/openstackclient/openstackclient-pod.yaml" - mode: 0644 - - - name: create openstackclient pod - become_user: ocp - shell: | - oc project openstack - oc delete --ignore-not-found pod openstackclient - oc apply -f {{ working_dir }}/yamls/openstackclient/openstackclient-pod.yaml - environment: - PATH: "{{ oc_env_path }}" - KUBECONFIG: "{{ kubeconfig }}" diff --git a/ansible/templates/openstackclient-pod.yaml.j2 b/ansible/templates/openstackclient-pod.yaml.j2 deleted file mode 100644 index 8a94ccc..0000000 --- a/ansible/templates/openstackclient-pod.yaml.j2 +++ /dev/null @@ -1,60 +0,0 @@ -apiVersion: v1 -kind: Pod -metadata: - name: openstackclient-osp - namespace: openstack -spec: - metadata: - labels: - app: openstackclient - nodeSelector: - node-role.kubernetes.io/worker-osp: "" - tolerations: - - effect: NoSchedule - key: dedicated - operator: Equal - value: worker-osp - containers: - - name: openstackclient - image: quay.io/openstack-k8s-operators/tripleo-deploy - command: - - sleep - - infinity - user: root - env: - - name: OS_USERNAME - value: admin - - name: NOVA_VERSION - value: "1.1" - - name: COMPUTE_API_VERSION - value: "1.1" - - name: OS_USERNAME - value: admin - - name: OS_PROJECT_NAME - value: admin - - name: OS_USER_DOMAIN_NAME - value: Default - - name: OS_PROJECT_DOMAIN_NAME - value: Default - - name: OS_NO_CACHE - value: "True" - - name: OS_CLOUDNAME - value: cnv - - name: PYTHONWARNINGS - value: 'ignore:Certificate has no, ignore:A true SSLContext object is not available' - - name: OS_AUTH_TYPE - value: password - - name: OS_PASSWORD - value: {{ os_password }} - - name: OS_AUTH_URL - value: {{ os_auth_url }} - - name: OS_IDENTITY_API_VERSION - value: "3" - - name: OS_COMPUTE_API_VERSION - value: "2.latest" - - name: OS_IMAGE_API_VERSION - value: "2" - - name: OS_VOLUME_API_VERSION - value: "3" - - name: OS_REGION_NAME - value: regionOne