Merge pull request #664 from vitessio/arthur/fixups

More fixups

Author: arthurschreiber

Dockerfile

@@ -46,6 +46,7 @@ COPY requirements.txt .
 RUN pip3 install -r requirements.txt
 
 # Install ansible add-ons
+COPY ansible/requirements.yml ansible/requirements.yml
 RUN ansible-galaxy install -r ansible/requirements.yml
 
 # Copy the source code to the working directory

ansible/create_cluster.yml

@@ -68,7 +68,7 @@
 
     - name: Apply VSchema
       shell: |
-        vtctldclient --server {{ groups['vtctld'][0] }}:15999 ApplyVSchema -- --vschema="$(cat /tmp/vschema_sysbench.json)" main
+        vtctlclient --server {{ groups['vtctld'][0] }}:15999 ApplyVSchema -- --vschema="$(cat /tmp/vschema_sysbench.json)" main
 
     - name: Print go version
       debug: msg="VSchema is applied."

ansible/roles/vtctld/tasks/ensure.yml

@@ -13,17 +13,17 @@
 - name: Ensure Primary
   register: ensure_latest
   shell: |
-    alias vc="vtctldclient --server {{ groups['vtctld'][0] }}:15999"
+    alias vc="vtctlclient --server {{ groups['vtctld'][0] }}:15999"
     for keyspace in $(vc GetKeyspaces); do
         echo "working on ${keyspace}"
         for shard in $(vc FindAllShardsInKeyspace -- ${keyspace} | jq -r 'keys[]'); do
             echo "working on ${shard}"
-            primary=$(vc GetTablets --keyspace "${keyspace}" --shard "${shard}" --tablet-type primary | awk '{ print $1 }' | head -n1)
-            if [ -z "${primary}" ]; then
+            master=$(vc ListShardTablets -- ${keyspace}/${shard} | grep primary)
+            if [ -z "${master}" ]; then
               echo "setting primary for ${keyspace}/${shard}"
-              vc InitShardPrimary -- --force ${keyspace}/${shard} $(vc GetTablets --keyspace "${keyspace}" --shard "${shard}" --tablet-type replica | awk '{ print $1 }' | head -n1)
+              vc InitShardPrimary -- --force ${keyspace}/${shard} $(vc ListShardTablets ${keyspace}/${shard} | awk '{ print $1 }' | head -n1)
             else
-              vc SetReadWrite -- ${primary}
+              vc SetReadWrite -- $(echo ${master} | awk '{ print $1 }' | head -n1)
             fi
         done
     done

ansible/setup.yml

@@ -135,10 +135,6 @@
           - files:
               - "{{ prometheus_config_dir }}/file_sd/gateways.yml"
     prometheus_remote_write:
-      - url: "http://{{ stats_remote_db_host }}/prom/api/v1/write"
-        basic_auth:
-          username: "{{ stats_remote_db_user }}"
-          password: "{{ stats_remote_db_password }}"
       - url: "http://{{ stats_remote_db_host }}:{{ stats_remote_db_port }}/api/v1/prom/write?db={{ stats_remote_db_database }}&u={{ stats_remote_db_user }}&p={{ stats_remote_db_password }}"
     prometheus_external_labels:
       exec_uuid: "exec_uuid"